From e2eb26008eaaf928b43f8a421412743bcf077a68 Mon Sep 17 00:00:00 2001 From: blakeli Date: Tue, 2 Dec 2025 18:29:21 -0500 Subject: [PATCH 1/9] chore: test protobuf 3.0 gen code. --- .cloudbuild/library_generation/library_generation.Dockerfile | 2 +- .../library_generation/library_generation_airlock.Dockerfile | 2 +- gapic-generator-java-pom-parent/pom.xml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.cloudbuild/library_generation/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile index a58b377071..3690d39b63 100644 --- a/.cloudbuild/library_generation/library_generation.Dockerfile +++ b/.cloudbuild/library_generation/library_generation.Dockerfile @@ -37,7 +37,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_ FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad316909c39813dee3ee9395204940500792b740 as final ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5 -ARG PROTOC_VERSION=25.8 +ARG PROTOC_VERSION=3.0.0 ARG GRPC_VERSION=1.76.1 ENV HOME=/home ENV OS_ARCHITECTURE="linux-x86_64" diff --git a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile index 9a80c87ee8..ca2ad663e7 100644 --- a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile +++ b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile @@ -38,7 +38,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_ FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc139a0a640942491ec481ad8dda10f2c5b753f5c969393b12480155fe15a63 as final ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5 -ARG PROTOC_VERSION=25.8 +ARG PROTOC_VERSION=3.0.0 ARG GRPC_VERSION=1.76.1 ENV HOME=/home ENV OS_ARCHITECTURE="linux-x86_64" diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index ca393e34ed..cfc167df10 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -40,6 +40,7 @@ 5.11.4 4.11.0 2.0.16 + true From 1b985a4cf86017c194249a211d4f0f22c661eb70 Mon Sep 17 00:00:00 2001 From: blakeli Date: Tue, 2 Dec 2025 18:42:32 -0500 Subject: [PATCH 2/9] chore: use 21.7 --- .cloudbuild/library_generation/library_generation.Dockerfile | 2 +- .../library_generation/library_generation_airlock.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cloudbuild/library_generation/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile index 3690d39b63..ca1786c4bc 100644 --- a/.cloudbuild/library_generation/library_generation.Dockerfile +++ b/.cloudbuild/library_generation/library_generation.Dockerfile @@ -37,7 +37,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_ FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad316909c39813dee3ee9395204940500792b740 as final ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5 -ARG PROTOC_VERSION=3.0.0 +ARG PROTOC_VERSION=21.7 ARG GRPC_VERSION=1.76.1 ENV HOME=/home ENV OS_ARCHITECTURE="linux-x86_64" diff --git a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile index ca2ad663e7..f2eaba5ead 100644 --- a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile +++ b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile @@ -38,7 +38,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_ FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc139a0a640942491ec481ad8dda10f2c5b753f5c969393b12480155fe15a63 as final ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5 -ARG PROTOC_VERSION=3.0.0 +ARG PROTOC_VERSION=21.7 ARG GRPC_VERSION=1.76.1 ENV HOME=/home ENV OS_ARCHITECTURE="linux-x86_64" From d5457611179ee7b0134ad9fcdb33305facb72bf2 Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Tue, 2 Dec 2025 23:50:40 +0000 Subject: [PATCH 3/9] chore: generate libraries at Tue Dec 2 23:48:41 UTC 2025 --- .../src/main/java/com/google/api/Advice.java | 34 +- .../java/com/google/api/AdviceOrBuilder.java | 1 - .../java/com/google/api/AnnotationsProto.java | 1 - .../main/java/com/google/api/AuthProto.java | 1 - .../java/com/google/api/AuthProvider.java | 237 +- .../com/google/api/AuthProviderOrBuilder.java | 26 - .../java/com/google/api/AuthRequirement.java | 87 +- .../google/api/AuthRequirementOrBuilder.java | 11 - .../java/com/google/api/Authentication.java | 54 +- .../google/api/AuthenticationOrBuilder.java | 6 - .../com/google/api/AuthenticationRule.java | 159 +- .../api/AuthenticationRuleOrBuilder.java | 3 - .../src/main/java/com/google/api/Backend.java | 48 +- .../java/com/google/api/BackendOrBuilder.java | 6 - .../java/com/google/api/BackendProto.java | 1 - .../main/java/com/google/api/BackendRule.java | 392 +--- .../com/google/api/BackendRuleOrBuilder.java | 26 +- .../src/main/java/com/google/api/Billing.java | 102 +- .../java/com/google/api/BillingOrBuilder.java | 1 - .../java/com/google/api/BillingProto.java | 1 - .../main/java/com/google/api/ChangeType.java | 1 - .../google/api/ClientLibraryDestination.java | 1 - .../google/api/ClientLibraryOrganization.java | 1 - .../com/google/api/ClientLibrarySettings.java | 587 +++-- .../api/ClientLibrarySettingsOrBuilder.java | 1 - .../main/java/com/google/api/ClientProto.java | 18 - .../google/api/CommonLanguageSettings.java | 143 +- .../api/CommonLanguageSettingsOrBuilder.java | 1 - .../java/com/google/api/ConfigChange.java | 120 +- .../com/google/api/ConfigChangeOrBuilder.java | 1 - .../com/google/api/ConfigChangeProto.java | 1 - .../java/com/google/api/ConsumerProto.java | 1 - .../src/main/java/com/google/api/Context.java | 64 +- .../java/com/google/api/ContextOrBuilder.java | 6 - .../java/com/google/api/ContextProto.java | 1 - .../main/java/com/google/api/ContextRule.java | 198 +- .../com/google/api/ContextRuleOrBuilder.java | 3 - .../src/main/java/com/google/api/Control.java | 65 +- .../java/com/google/api/ControlOrBuilder.java | 1 - .../java/com/google/api/ControlProto.java | 1 - .../main/java/com/google/api/CppSettings.java | 92 +- .../com/google/api/CppSettingsOrBuilder.java | 1 - .../com/google/api/CustomHttpPattern.java | 52 +- .../api/CustomHttpPatternOrBuilder.java | 1 - .../java/com/google/api/Distribution.java | 809 +++---- .../com/google/api/DistributionOrBuilder.java | 10 - .../com/google/api/DistributionProto.java | 1 - .../java/com/google/api/Documentation.java | 168 +- .../google/api/DocumentationOrBuilder.java | 6 - .../com/google/api/DocumentationProto.java | 1 - .../com/google/api/DocumentationRule.java | 70 +- .../api/DocumentationRuleOrBuilder.java | 1 - .../java/com/google/api/DotnetSettings.java | 279 +-- .../google/api/DotnetSettingsOrBuilder.java | 3 +- .../main/java/com/google/api/Endpoint.java | 106 +- .../com/google/api/EndpointOrBuilder.java | 1 - .../java/com/google/api/EndpointProto.java | 1 - .../main/java/com/google/api/ErrorReason.java | 157 -- .../java/com/google/api/ErrorReasonProto.java | 1 - .../java/com/google/api/FieldBehavior.java | 6 - .../com/google/api/FieldBehaviorProto.java | 3 - .../main/java/com/google/api/FieldInfo.java | 87 +- .../com/google/api/FieldInfoOrBuilder.java | 6 - .../java/com/google/api/FieldInfoProto.java | 3 - .../main/java/com/google/api/FieldPolicy.java | 86 +- .../com/google/api/FieldPolicyOrBuilder.java | 5 - .../main/java/com/google/api/GoSettings.java | 141 +- .../com/google/api/GoSettingsOrBuilder.java | 7 +- .../src/main/java/com/google/api/Http.java | 64 +- .../main/java/com/google/api/HttpBody.java | 100 +- .../com/google/api/HttpBodyOrBuilder.java | 1 - .../java/com/google/api/HttpBodyProto.java | 1 - .../java/com/google/api/HttpOrBuilder.java | 7 - .../main/java/com/google/api/HttpProto.java | 1 - .../main/java/com/google/api/HttpRule.java | 245 +- .../com/google/api/HttpRuleOrBuilder.java | 9 +- .../java/com/google/api/JavaSettings.java | 184 +- .../com/google/api/JavaSettingsOrBuilder.java | 16 +- .../main/java/com/google/api/JwtLocation.java | 57 +- .../com/google/api/JwtLocationOrBuilder.java | 5 +- .../java/com/google/api/LabelDescriptor.java | 73 +- .../google/api/LabelDescriptorOrBuilder.java | 1 - .../main/java/com/google/api/LabelProto.java | 1 - .../main/java/com/google/api/LaunchStage.java | 1 - .../java/com/google/api/LaunchStageProto.java | 1 - .../java/com/google/api/LogDescriptor.java | 99 +- .../google/api/LogDescriptorOrBuilder.java | 1 - .../main/java/com/google/api/LogProto.java | 1 - .../src/main/java/com/google/api/Logging.java | 102 +- .../java/com/google/api/LoggingOrBuilder.java | 1 - .../java/com/google/api/LoggingProto.java | 1 - .../java/com/google/api/MethodPolicy.java | 75 +- .../com/google/api/MethodPolicyOrBuilder.java | 5 - .../java/com/google/api/MethodSettings.java | 463 ++-- .../google/api/MethodSettingsOrBuilder.java | 19 - .../src/main/java/com/google/api/Metric.java | 71 +- .../java/com/google/api/MetricDescriptor.java | 666 ++---- .../google/api/MetricDescriptorOrBuilder.java | 41 - .../java/com/google/api/MetricOrBuilder.java | 2 +- .../main/java/com/google/api/MetricProto.java | 1 - .../main/java/com/google/api/MetricRule.java | 77 +- .../com/google/api/MetricRuleOrBuilder.java | 8 - .../com/google/api/MonitoredResource.java | 73 +- .../api/MonitoredResourceDescriptor.java | 138 +- .../MonitoredResourceDescriptorOrBuilder.java | 1 - .../google/api/MonitoredResourceMetadata.java | 141 +- .../MonitoredResourceMetadataOrBuilder.java | 5 +- .../api/MonitoredResourceOrBuilder.java | 2 +- .../google/api/MonitoredResourceProto.java | 1 - .../main/java/com/google/api/Monitoring.java | 102 +- .../com/google/api/MonitoringOrBuilder.java | 1 - .../java/com/google/api/MonitoringProto.java | 1 - .../java/com/google/api/NodeSettings.java | 92 +- .../com/google/api/NodeSettingsOrBuilder.java | 1 - .../com/google/api/OAuthRequirements.java | 56 +- .../api/OAuthRequirementsOrBuilder.java | 5 - .../src/main/java/com/google/api/Page.java | 79 +- .../java/com/google/api/PageOrBuilder.java | 1 - .../main/java/com/google/api/PhpSettings.java | 92 +- .../com/google/api/PhpSettingsOrBuilder.java | 1 - .../main/java/com/google/api/PolicyProto.java | 1 - .../com/google/api/ProjectProperties.java | 29 +- .../api/ProjectPropertiesOrBuilder.java | 1 - .../main/java/com/google/api/Property.java | 77 +- .../com/google/api/PropertyOrBuilder.java | 1 - .../main/java/com/google/api/Publishing.java | 233 +- .../com/google/api/PublishingOrBuilder.java | 1 - .../java/com/google/api/PythonSettings.java | 214 +- .../google/api/PythonSettingsOrBuilder.java | 1 - .../src/main/java/com/google/api/Quota.java | 45 +- .../main/java/com/google/api/QuotaLimit.java | 240 +- .../com/google/api/QuotaLimitOrBuilder.java | 16 - .../java/com/google/api/QuotaOrBuilder.java | 1 - .../main/java/com/google/api/QuotaProto.java | 1 - .../com/google/api/ResourceDescriptor.java | 306 +-- .../api/ResourceDescriptorOrBuilder.java | 33 - .../java/com/google/api/ResourceProto.java | 1 - .../com/google/api/ResourceReference.java | 101 +- .../api/ResourceReferenceOrBuilder.java | 15 - .../java/com/google/api/RoutingParameter.java | 108 +- .../google/api/RoutingParameterOrBuilder.java | 17 - .../java/com/google/api/RoutingProto.java | 1 - .../main/java/com/google/api/RoutingRule.java | 209 +- .../com/google/api/RoutingRuleOrBuilder.java | 1 - .../java/com/google/api/RubySettings.java | 92 +- .../com/google/api/RubySettingsOrBuilder.java | 1 - .../google/api/SelectiveGapicGeneration.java | 64 +- .../SelectiveGapicGenerationOrBuilder.java | 1 - .../src/main/java/com/google/api/Service.java | 1264 +++++----- .../java/com/google/api/ServiceOrBuilder.java | 14 - .../java/com/google/api/ServiceProto.java | 1 - .../main/java/com/google/api/SourceInfo.java | 25 +- .../com/google/api/SourceInfoOrBuilder.java | 1 - .../java/com/google/api/SourceInfoProto.java | 1 - .../java/com/google/api/SystemParameter.java | 70 +- .../google/api/SystemParameterOrBuilder.java | 1 - .../com/google/api/SystemParameterProto.java | 1 - .../com/google/api/SystemParameterRule.java | 68 +- .../api/SystemParameterRuleOrBuilder.java | 3 - .../java/com/google/api/SystemParameters.java | 188 +- .../google/api/SystemParametersOrBuilder.java | 36 - .../java/com/google/api/TypeReference.java | 48 +- .../google/api/TypeReferenceOrBuilder.java | 5 - .../src/main/java/com/google/api/Usage.java | 123 +- .../java/com/google/api/UsageOrBuilder.java | 12 - .../main/java/com/google/api/UsageProto.java | 1 - .../main/java/com/google/api/UsageRule.java | 79 +- .../com/google/api/UsageRuleOrBuilder.java | 3 - .../main/java/com/google/api/Visibility.java | 58 +- .../com/google/api/VisibilityOrBuilder.java | 6 - .../java/com/google/api/VisibilityProto.java | 1 - .../java/com/google/api/VisibilityRule.java | 87 +- .../google/api/VisibilityRuleOrBuilder.java | 11 - .../java/com/google/apps/card/v1/Action.java | 306 +-- .../google/apps/card/v1/ActionOrBuilder.java | 22 - .../com/google/apps/card/v1/BorderStyle.java | 175 +- .../apps/card/v1/BorderStyleOrBuilder.java | 13 - .../java/com/google/apps/card/v1/Button.java | 344 +-- .../com/google/apps/card/v1/ButtonList.java | 27 +- .../apps/card/v1/ButtonListOrBuilder.java | 1 - .../google/apps/card/v1/ButtonOrBuilder.java | 15 - .../java/com/google/apps/card/v1/Card.java | 1108 ++++----- .../google/apps/card/v1/CardOrBuilder.java | 29 - .../com/google/apps/card/v1/CardProto.java | 10 +- .../com/google/apps/card/v1/Carousel.java | 58 +- .../apps/card/v1/CarouselOrBuilder.java | 1 - .../java/com/google/apps/card/v1/Chip.java | 221 +- .../com/google/apps/card/v1/ChipList.java | 66 +- .../apps/card/v1/ChipListOrBuilder.java | 1 - .../google/apps/card/v1/ChipOrBuilder.java | 3 - .../google/apps/card/v1/CollapseControl.java | 186 +- .../card/v1/CollapseControlOrBuilder.java | 1 - .../java/com/google/apps/card/v1/Columns.java | 251 +- .../google/apps/card/v1/ColumnsOrBuilder.java | 1 - .../google/apps/card/v1/DateTimePicker.java | 202 +- .../apps/card/v1/DateTimePickerOrBuilder.java | 7 - .../google/apps/card/v1/DecoratedText.java | 797 +++---- .../apps/card/v1/DecoratedTextOrBuilder.java | 20 +- .../java/com/google/apps/card/v1/Divider.java | 12 +- .../google/apps/card/v1/DividerOrBuilder.java | 1 - .../java/com/google/apps/card/v1/Grid.java | 391 ++-- .../google/apps/card/v1/GridOrBuilder.java | 1 - .../java/com/google/apps/card/v1/Icon.java | 157 +- .../google/apps/card/v1/IconOrBuilder.java | 26 +- .../java/com/google/apps/card/v1/Image.java | 142 +- .../google/apps/card/v1/ImageComponent.java | 200 +- .../apps/card/v1/ImageComponentOrBuilder.java | 1 - .../google/apps/card/v1/ImageCropStyle.java | 64 +- .../apps/card/v1/ImageCropStyleOrBuilder.java | 3 - .../google/apps/card/v1/ImageOrBuilder.java | 5 - .../com/google/apps/card/v1/MaterialIcon.java | 88 +- .../apps/card/v1/MaterialIconOrBuilder.java | 4 - .../java/com/google/apps/card/v1/OnClick.java | 100 +- .../google/apps/card/v1/OnClickOrBuilder.java | 9 +- .../com/google/apps/card/v1/OpenLink.java | 98 +- .../apps/card/v1/OpenLinkOrBuilder.java | 5 - .../com/google/apps/card/v1/OverflowMenu.java | 213 +- .../apps/card/v1/OverflowMenuOrBuilder.java | 1 - .../google/apps/card/v1/SelectionInput.java | 430 ++-- .../apps/card/v1/SelectionInputOrBuilder.java | 13 +- .../com/google/apps/card/v1/Suggestions.java | 62 +- .../apps/card/v1/SuggestionsOrBuilder.java | 1 - .../com/google/apps/card/v1/TextInput.java | 568 ++--- .../apps/card/v1/TextInputOrBuilder.java | 40 - .../google/apps/card/v1/TextParagraph.java | 81 +- .../apps/card/v1/TextParagraphOrBuilder.java | 4 - .../com/google/apps/card/v1/Validation.java | 62 +- .../apps/card/v1/ValidationOrBuilder.java | 4 - .../java/com/google/apps/card/v1/Widget.java | 438 +--- .../google/apps/card/v1/WidgetOrBuilder.java | 72 +- .../google/cloud/ExtendedOperationsProto.java | 1 - .../cloud/OperationResponseMapping.java | 1 - .../java/com/google/cloud/audit/AuditLog.java | 798 +++---- .../google/cloud/audit/AuditLogOrBuilder.java | 5 - .../com/google/cloud/audit/AuditLogProto.java | 1 - .../cloud/audit/AuthenticationInfo.java | 204 +- .../audit/AuthenticationInfoOrBuilder.java | 3 - .../google/cloud/audit/AuthorizationInfo.java | 186 +- .../audit/AuthorizationInfoOrBuilder.java | 6 - .../cloud/audit/OrgPolicyViolationInfo.java | 186 +- .../OrgPolicyViolationInfoOrBuilder.java | 7 +- .../cloud/audit/PolicyViolationInfo.java | 98 +- .../audit/PolicyViolationInfoOrBuilder.java | 1 - .../google/cloud/audit/RequestMetadata.java | 261 +-- .../cloud/audit/RequestMetadataOrBuilder.java | 11 - .../google/cloud/audit/ResourceLocation.java | 117 +- .../audit/ResourceLocationOrBuilder.java | 9 - .../audit/ServiceAccountDelegationInfo.java | 273 +-- ...ServiceAccountDelegationInfoOrBuilder.java | 3 +- .../com/google/cloud/audit/ViolationInfo.java | 91 +- .../cloud/audit/ViolationInfoOrBuilder.java | 1 - .../cloud/location/GetLocationRequest.java | 34 +- .../location/GetLocationRequestOrBuilder.java | 1 - .../cloud/location/ListLocationsRequest.java | 82 +- .../ListLocationsRequestOrBuilder.java | 1 - .../cloud/location/ListLocationsResponse.java | 44 +- .../ListLocationsResponseOrBuilder.java | 1 - .../com/google/cloud/location/Location.java | 191 +- .../cloud/location/LocationOrBuilder.java | 7 +- .../google/cloud/location/LocationsProto.java | 1 - .../java/com/google/geo/type/Viewport.java | 167 +- .../google/geo/type/ViewportOrBuilder.java | 1 - .../com/google/geo/type/ViewportProto.java | 1 - .../com/google/logging/type/HttpRequest.java | 300 +-- .../logging/type/HttpRequestOrBuilder.java | 1 - .../google/logging/type/HttpRequestProto.java | 1 - .../com/google/logging/type/LogSeverity.java | 4 - .../google/logging/type/LogSeverityProto.java | 1 - .../longrunning/CancelOperationRequest.java | 34 +- .../CancelOperationRequestOrBuilder.java | 1 - .../longrunning/DeleteOperationRequest.java | 34 +- .../DeleteOperationRequestOrBuilder.java | 1 - .../longrunning/GetOperationRequest.java | 34 +- .../GetOperationRequestOrBuilder.java | 1 - .../longrunning/ListOperationsRequest.java | 102 +- .../ListOperationsRequestOrBuilder.java | 3 - .../longrunning/ListOperationsResponse.java | 82 +- .../ListOperationsResponseOrBuilder.java | 1 - .../com/google/longrunning/Operation.java | 148 +- .../com/google/longrunning/OperationInfo.java | 84 +- .../longrunning/OperationInfoOrBuilder.java | 9 - .../longrunning/OperationOrBuilder.java | 3 +- .../google/longrunning/OperationsProto.java | 10 +- .../longrunning/WaitOperationRequest.java | 108 +- .../WaitOperationRequestOrBuilder.java | 1 - .../main/java/com/google/rpc/BadRequest.java | 247 +- .../com/google/rpc/BadRequestOrBuilder.java | 1 - .../src/main/java/com/google/rpc/Code.java | 49 - .../main/java/com/google/rpc/CodeProto.java | 1 - .../main/java/com/google/rpc/DebugInfo.java | 70 +- .../com/google/rpc/DebugInfoOrBuilder.java | 1 - .../com/google/rpc/ErrorDetailsProto.java | 2 +- .../main/java/com/google/rpc/ErrorInfo.java | 111 +- .../com/google/rpc/ErrorInfoOrBuilder.java | 7 +- .../src/main/java/com/google/rpc/Help.java | 78 +- .../java/com/google/rpc/HelpOrBuilder.java | 1 - .../java/com/google/rpc/LocalizedMessage.java | 52 +- .../google/rpc/LocalizedMessageOrBuilder.java | 1 - .../com/google/rpc/PreconditionFailure.java | 105 +- .../rpc/PreconditionFailureOrBuilder.java | 1 - .../java/com/google/rpc/QuotaFailure.java | 300 +-- .../com/google/rpc/QuotaFailureOrBuilder.java | 1 - .../main/java/com/google/rpc/RequestInfo.java | 52 +- .../com/google/rpc/RequestInfoOrBuilder.java | 1 - .../java/com/google/rpc/ResourceInfo.java | 88 +- .../com/google/rpc/ResourceInfoOrBuilder.java | 1 - .../main/java/com/google/rpc/RetryInfo.java | 94 +- .../com/google/rpc/RetryInfoOrBuilder.java | 1 - .../src/main/java/com/google/rpc/Status.java | 75 +- .../java/com/google/rpc/StatusOrBuilder.java | 1 - .../main/java/com/google/rpc/StatusProto.java | 1 - .../google/rpc/context/AttributeContext.java | 2060 +++++++---------- .../context/AttributeContextOrBuilder.java | 1 - .../rpc/context/AttributeContextProto.java | 1 - .../com/google/rpc/context/AuditContext.java | 206 +- .../rpc/context/AuditContextOrBuilder.java | 1 - .../google/rpc/context/AuditContextProto.java | 1 - .../com/google/shopping/type/Channel.java | 8 +- .../shopping/type/ChannelOrBuilder.java | 1 - .../google/shopping/type/CustomAttribute.java | 69 +- .../type/CustomAttributeOrBuilder.java | 1 - .../com/google/shopping/type/Destination.java | 8 +- .../shopping/type/DestinationOrBuilder.java | 1 - .../java/com/google/shopping/type/Price.java | 40 +- .../google/shopping/type/PriceOrBuilder.java | 1 - .../shopping/type/ReportingContext.java | 8 +- .../type/ReportingContextOrBuilder.java | 1 - .../com/google/shopping/type/TypesProto.java | 7 +- .../java/com/google/shopping/type/Weight.java | 46 +- .../google/shopping/type/WeightOrBuilder.java | 1 - .../java/com/google/type/CalendarPeriod.java | 1 - .../com/google/type/CalendarPeriodProto.java | 1 - .../src/main/java/com/google/type/Color.java | 184 +- .../java/com/google/type/ColorOrBuilder.java | 7 - .../main/java/com/google/type/ColorProto.java | 1 - .../src/main/java/com/google/type/Date.java | 56 +- .../java/com/google/type/DateOrBuilder.java | 1 - .../main/java/com/google/type/DateProto.java | 1 - .../main/java/com/google/type/DateTime.java | 141 +- .../com/google/type/DateTimeOrBuilder.java | 3 +- .../java/com/google/type/DateTimeProto.java | 1 - .../main/java/com/google/type/DayOfWeek.java | 1 - .../java/com/google/type/DayOfWeekProto.java | 1 - .../main/java/com/google/type/Decimal.java | 148 +- .../com/google/type/DecimalOrBuilder.java | 33 - .../java/com/google/type/DecimalProto.java | 1 - .../src/main/java/com/google/type/Expr.java | 106 +- .../java/com/google/type/ExprOrBuilder.java | 1 - .../main/java/com/google/type/ExprProto.java | 1 - .../main/java/com/google/type/Fraction.java | 40 +- .../com/google/type/FractionOrBuilder.java | 1 - .../java/com/google/type/FractionProto.java | 1 - .../main/java/com/google/type/Interval.java | 179 +- .../com/google/type/IntervalOrBuilder.java | 7 - .../java/com/google/type/IntervalProto.java | 1 - .../src/main/java/com/google/type/LatLng.java | 40 +- .../java/com/google/type/LatLngOrBuilder.java | 1 - .../java/com/google/type/LatLngProto.java | 1 - .../java/com/google/type/LocalizedText.java | 59 +- .../google/type/LocalizedTextOrBuilder.java | 3 - .../com/google/type/LocalizedTextProto.java | 1 - .../src/main/java/com/google/type/Money.java | 58 +- .../java/com/google/type/MoneyOrBuilder.java | 1 - .../main/java/com/google/type/MoneyProto.java | 1 - .../src/main/java/com/google/type/Month.java | 1 - .../main/java/com/google/type/MonthProto.java | 1 - .../java/com/google/type/PhoneNumber.java | 168 +- .../com/google/type/PhoneNumberOrBuilder.java | 14 +- .../com/google/type/PhoneNumberProto.java | 1 - .../java/com/google/type/PostalAddress.java | 316 +-- .../google/type/PostalAddressOrBuilder.java | 18 - .../com/google/type/PostalAddressProto.java | 1 - .../main/java/com/google/type/Quaternion.java | 88 +- .../com/google/type/QuaternionOrBuilder.java | 1 - .../java/com/google/type/QuaternionProto.java | 1 - .../main/java/com/google/type/TimeOfDay.java | 64 +- .../com/google/type/TimeOfDayOrBuilder.java | 1 - .../java/com/google/type/TimeOfDayProto.java | 1 - .../main/java/com/google/type/TimeZone.java | 52 +- .../com/google/type/TimeZoneOrBuilder.java | 1 - .../java/com/google/iam/v1/AuditConfig.java | 69 +- .../com/google/iam/v1/AuditConfigDelta.java | 91 +- .../iam/v1/AuditConfigDeltaOrBuilder.java | 1 - .../google/iam/v1/AuditConfigOrBuilder.java | 1 - .../com/google/iam/v1/AuditLogConfig.java | 79 +- .../iam/v1/AuditLogConfigOrBuilder.java | 1 - .../main/java/com/google/iam/v1/Binding.java | 326 +-- .../java/com/google/iam/v1/BindingDelta.java | 146 +- .../google/iam/v1/BindingDeltaOrBuilder.java | 1 - .../com/google/iam/v1/BindingOrBuilder.java | 54 - .../google/iam/v1/GetIamPolicyRequest.java | 110 +- .../iam/v1/GetIamPolicyRequestOrBuilder.java | 1 - .../com/google/iam/v1/GetPolicyOptions.java | 44 +- .../iam/v1/GetPolicyOptionsOrBuilder.java | 5 - .../com/google/iam/v1/IamPolicyProto.java | 1 - .../java/com/google/iam/v1/OptionsProto.java | 1 - .../main/java/com/google/iam/v1/Policy.java | 155 +- .../java/com/google/iam/v1/PolicyDelta.java | 27 +- .../google/iam/v1/PolicyDeltaOrBuilder.java | 1 - .../com/google/iam/v1/PolicyOrBuilder.java | 13 - .../java/com/google/iam/v1/PolicyProto.java | 1 - .../google/iam/v1/ResourcePolicyMember.java | 66 +- .../iam/v1/ResourcePolicyMemberOrBuilder.java | 5 - .../iam/v1/ResourcePolicyMemberProto.java | 1 - .../google/iam/v1/SetIamPolicyRequest.java | 182 +- .../iam/v1/SetIamPolicyRequestOrBuilder.java | 4 - .../iam/v1/TestIamPermissionsRequest.java | 72 +- .../TestIamPermissionsRequestOrBuilder.java | 1 - .../iam/v1/TestIamPermissionsResponse.java | 52 +- .../TestIamPermissionsResponseOrBuilder.java | 1 - .../com/google/iam/v1/logging/AuditData.java | 93 +- .../iam/v1/logging/AuditDataOrBuilder.java | 1 - .../google/iam/v1/logging/AuditDataProto.java | 1 - .../google/iam/v2/CreatePolicyRequest.java | 146 +- .../iam/v2/CreatePolicyRequestOrBuilder.java | 7 - .../google/iam/v2/DeletePolicyRequest.java | 80 +- .../iam/v2/DeletePolicyRequestOrBuilder.java | 9 - .../main/java/com/google/iam/v2/DenyRule.java | 394 +--- .../com/google/iam/v2/DenyRuleOrBuilder.java | 47 - .../java/com/google/iam/v2/DenyRuleProto.java | 1 - .../com/google/iam/v2/GetPolicyRequest.java | 55 +- .../iam/v2/GetPolicyRequestOrBuilder.java | 7 - .../google/iam/v2/ListPoliciesRequest.java | 85 +- .../iam/v2/ListPoliciesRequestOrBuilder.java | 7 - .../google/iam/v2/ListPoliciesResponse.java | 43 +- .../iam/v2/ListPoliciesResponseOrBuilder.java | 1 - .../main/java/com/google/iam/v2/Policy.java | 419 ++-- .../iam/v2/PolicyOperationMetadata.java | 90 +- .../v2/PolicyOperationMetadataOrBuilder.java | 1 - .../com/google/iam/v2/PolicyOrBuilder.java | 10 +- .../java/com/google/iam/v2/PolicyProto.java | 28 +- .../java/com/google/iam/v2/PolicyRule.java | 52 +- .../google/iam/v2/PolicyRuleOrBuilder.java | 3 +- .../google/iam/v2/UpdatePolicyRequest.java | 101 +- .../iam/v2/UpdatePolicyRequestOrBuilder.java | 4 - .../iam/v2beta/CreatePolicyRequest.java | 147 +- .../v2beta/CreatePolicyRequestOrBuilder.java | 7 - .../iam/v2beta/DeletePolicyRequest.java | 80 +- .../v2beta/DeletePolicyRequestOrBuilder.java | 9 - .../java/com/google/iam/v2beta/DenyRule.java | 394 +--- .../google/iam/v2beta/DenyRuleOrBuilder.java | 47 - .../com/google/iam/v2beta/DenyRuleProto.java | 1 - .../google/iam/v2beta/GetPolicyRequest.java | 55 +- .../iam/v2beta/GetPolicyRequestOrBuilder.java | 7 - .../iam/v2beta/ListPoliciesRequest.java | 85 +- .../v2beta/ListPoliciesRequestOrBuilder.java | 7 - .../iam/v2beta/ListPoliciesResponse.java | 43 +- .../v2beta/ListPoliciesResponseOrBuilder.java | 1 - .../java/com/google/iam/v2beta/Policy.java | 401 ++-- .../iam/v2beta/PolicyOperationMetadata.java | 90 +- .../PolicyOperationMetadataOrBuilder.java | 1 - .../google/iam/v2beta/PolicyOrBuilder.java | 10 +- .../com/google/iam/v2beta/PolicyProto.java | 28 +- .../com/google/iam/v2beta/PolicyRule.java | 52 +- .../iam/v2beta/PolicyRuleOrBuilder.java | 3 +- .../iam/v2beta/UpdatePolicyRequest.java | 102 +- .../v2beta/UpdatePolicyRequestOrBuilder.java | 4 - .../iam/v3/CreatePolicyBindingRequest.java | 164 +- .../CreatePolicyBindingRequestOrBuilder.java | 7 - ...ePrincipalAccessBoundaryPolicyRequest.java | 163 +- ...lAccessBoundaryPolicyRequestOrBuilder.java | 5 - .../iam/v3/DeletePolicyBindingRequest.java | 78 +- .../DeletePolicyBindingRequestOrBuilder.java | 5 - ...ePrincipalAccessBoundaryPolicyRequest.java | 84 +- ...lAccessBoundaryPolicyRequestOrBuilder.java | 3 - .../iam/v3/GetPolicyBindingRequest.java | 48 +- .../v3/GetPolicyBindingRequestOrBuilder.java | 5 - ...tPrincipalAccessBoundaryPolicyRequest.java | 41 +- ...lAccessBoundaryPolicyRequestOrBuilder.java | 3 - .../iam/v3/ListPolicyBindingsRequest.java | 128 +- .../ListPolicyBindingsRequestOrBuilder.java | 14 - .../iam/v3/ListPolicyBindingsResponse.java | 43 +- .../ListPolicyBindingsResponseOrBuilder.java | 1 - ...rincipalAccessBoundaryPoliciesRequest.java | 83 +- ...ccessBoundaryPoliciesRequestOrBuilder.java | 6 - ...incipalAccessBoundaryPoliciesResponse.java | 45 +- ...cessBoundaryPoliciesResponseOrBuilder.java | 1 - .../com/google/iam/v3/OperationMetadata.java | 237 +- .../iam/v3/OperationMetadataOrBuilder.java | 1 - .../google/iam/v3/OperationMetadataProto.java | 1 - .../java/com/google/iam/v3/PolicyBinding.java | 599 ++--- .../google/iam/v3/PolicyBindingOrBuilder.java | 32 +- .../iam/v3/PolicyBindingResourcesProto.java | 3 +- .../iam/v3/PolicyBindingsServiceProto.java | 70 +- ...palAccessBoundaryPoliciesServiceProto.java | 50 +- .../iam/v3/PrincipalAccessBoundaryPolicy.java | 336 ++- .../PrincipalAccessBoundaryPolicyDetails.java | 44 +- ...lAccessBoundaryPolicyDetailsOrBuilder.java | 1 - ...rincipalAccessBoundaryPolicyOrBuilder.java | 4 +- ...palAccessBoundaryPolicyResourcesProto.java | 3 +- .../v3/PrincipalAccessBoundaryPolicyRule.java | 119 +- ...ipalAccessBoundaryPolicyRuleOrBuilder.java | 9 - ...alAccessBoundaryPolicyBindingsRequest.java | 76 +- ...oundaryPolicyBindingsRequestOrBuilder.java | 4 - ...lAccessBoundaryPolicyBindingsResponse.java | 45 +- ...undaryPolicyBindingsResponseOrBuilder.java | 1 - .../v3/SearchTargetPolicyBindingsRequest.java | 121 +- ...hTargetPolicyBindingsRequestOrBuilder.java | 12 - .../SearchTargetPolicyBindingsResponse.java | 44 +- ...TargetPolicyBindingsResponseOrBuilder.java | 1 - .../iam/v3/UpdatePolicyBindingRequest.java | 182 +- .../UpdatePolicyBindingRequestOrBuilder.java | 4 - ...ePrincipalAccessBoundaryPolicyRequest.java | 188 +- ...lAccessBoundaryPolicyRequestOrBuilder.java | 4 - .../v3beta/CreatePolicyBindingRequest.java | 164 +- .../CreatePolicyBindingRequestOrBuilder.java | 7 - ...ePrincipalAccessBoundaryPolicyRequest.java | 163 +- ...lAccessBoundaryPolicyRequestOrBuilder.java | 5 - .../v3beta/DeletePolicyBindingRequest.java | 78 +- .../DeletePolicyBindingRequestOrBuilder.java | 5 - ...ePrincipalAccessBoundaryPolicyRequest.java | 84 +- ...lAccessBoundaryPolicyRequestOrBuilder.java | 3 - .../iam/v3beta/GetPolicyBindingRequest.java | 48 +- .../GetPolicyBindingRequestOrBuilder.java | 5 - ...tPrincipalAccessBoundaryPolicyRequest.java | 42 +- ...lAccessBoundaryPolicyRequestOrBuilder.java | 3 - .../iam/v3beta/ListPolicyBindingsRequest.java | 128 +- .../ListPolicyBindingsRequestOrBuilder.java | 14 - .../v3beta/ListPolicyBindingsResponse.java | 44 +- .../ListPolicyBindingsResponseOrBuilder.java | 1 - ...rincipalAccessBoundaryPoliciesRequest.java | 83 +- ...ccessBoundaryPoliciesRequestOrBuilder.java | 6 - ...incipalAccessBoundaryPoliciesResponse.java | 45 +- ...cessBoundaryPoliciesResponseOrBuilder.java | 1 - .../google/iam/v3beta/OperationMetadata.java | 237 +- .../v3beta/OperationMetadataOrBuilder.java | 1 - .../iam/v3beta/OperationMetadataProto.java | 1 - .../com/google/iam/v3beta/PolicyBinding.java | 601 ++--- .../iam/v3beta/PolicyBindingOrBuilder.java | 32 +- .../v3beta/PolicyBindingResourcesProto.java | 3 +- .../v3beta/PolicyBindingsServiceProto.java | 70 +- ...palAccessBoundaryPoliciesServiceProto.java | 59 +- .../v3beta/PrincipalAccessBoundaryPolicy.java | 337 ++- .../PrincipalAccessBoundaryPolicyDetails.java | 44 +- ...lAccessBoundaryPolicyDetailsOrBuilder.java | 1 - ...rincipalAccessBoundaryPolicyOrBuilder.java | 4 +- ...palAccessBoundaryPolicyResourcesProto.java | 3 +- .../PrincipalAccessBoundaryPolicyRule.java | 119 +- ...ipalAccessBoundaryPolicyRuleOrBuilder.java | 9 - ...alAccessBoundaryPolicyBindingsRequest.java | 76 +- ...oundaryPolicyBindingsRequestOrBuilder.java | 4 - ...lAccessBoundaryPolicyBindingsResponse.java | 45 +- ...undaryPolicyBindingsResponseOrBuilder.java | 1 - .../SearchTargetPolicyBindingsRequest.java | 121 +- ...hTargetPolicyBindingsRequestOrBuilder.java | 12 - .../SearchTargetPolicyBindingsResponse.java | 44 +- ...TargetPolicyBindingsResponseOrBuilder.java | 1 - .../v3beta/UpdatePolicyBindingRequest.java | 182 +- .../UpdatePolicyBindingRequestOrBuilder.java | 4 - ...ePrincipalAccessBoundaryPolicyRequest.java | 188 +- ...lAccessBoundaryPolicyRequestOrBuilder.java | 4 - .../reflect-config.json | 189 -- .../v1beta1/AttemptSequenceRequest.java | 34 +- .../AttemptSequenceRequestOrBuilder.java | 1 - .../AttemptStreamingSequenceRequest.java | 46 +- ...emptStreamingSequenceRequestOrBuilder.java | 1 - .../AttemptStreamingSequenceResponse.java | 35 +- ...mptStreamingSequenceResponseOrBuilder.java | 1 - .../google/showcase/v1beta1/BlockRequest.java | 126 +- .../v1beta1/BlockRequestOrBuilder.java | 3 +- .../showcase/v1beta1/BlockResponse.java | 34 +- .../v1beta1/BlockResponseOrBuilder.java | 1 - .../com/google/showcase/v1beta1/Blurb.java | 207 +- .../showcase/v1beta1/BlurbOrBuilder.java | 5 +- .../showcase/v1beta1/ComplianceData.java | 478 ++-- .../showcase/v1beta1/ComplianceDataChild.java | 338 ++- .../v1beta1/ComplianceDataChildOrBuilder.java | 1 - .../v1beta1/ComplianceDataGrandchild.java | 58 +- .../ComplianceDataGrandchildOrBuilder.java | 1 - .../v1beta1/ComplianceDataOrBuilder.java | 1 - .../showcase/v1beta1/ComplianceGroup.java | 100 +- .../v1beta1/ComplianceGroupOrBuilder.java | 1 - .../v1beta1/ComplianceOuterClass.java | 16 +- .../showcase/v1beta1/ComplianceSuite.java | 25 +- .../v1beta1/ComplianceSuiteOrBuilder.java | 1 - .../showcase/v1beta1/ConnectRequest.java | 78 +- .../v1beta1/ConnectRequestOrBuilder.java | 3 +- .../google/showcase/v1beta1/Continent.java | 1 - .../showcase/v1beta1/CreateBlurbRequest.java | 108 +- .../v1beta1/CreateBlurbRequestOrBuilder.java | 1 - .../showcase/v1beta1/CreateRoomRequest.java | 90 +- .../v1beta1/CreateRoomRequestOrBuilder.java | 1 - .../v1beta1/CreateSequenceRequest.java | 94 +- .../CreateSequenceRequestOrBuilder.java | 1 - .../v1beta1/CreateSessionRequest.java | 92 +- .../CreateSessionRequestOrBuilder.java | 1 - .../CreateStreamingSequenceRequest.java | 98 +- ...eateStreamingSequenceRequestOrBuilder.java | 1 - .../showcase/v1beta1/CreateUserRequest.java | 90 +- .../v1beta1/CreateUserRequestOrBuilder.java | 1 - .../showcase/v1beta1/DeleteBlurbRequest.java | 34 +- .../v1beta1/DeleteBlurbRequestOrBuilder.java | 1 - .../showcase/v1beta1/DeleteRoomRequest.java | 34 +- .../v1beta1/DeleteRoomRequestOrBuilder.java | 1 - .../v1beta1/DeleteSessionRequest.java | 34 +- .../DeleteSessionRequestOrBuilder.java | 1 - .../showcase/v1beta1/DeleteTestRequest.java | 34 +- .../v1beta1/DeleteTestRequestOrBuilder.java | 1 - .../showcase/v1beta1/DeleteUserRequest.java | 34 +- .../v1beta1/DeleteUserRequestOrBuilder.java | 1 - .../v1beta1/EchoErrorDetailsRequest.java | 72 +- .../EchoErrorDetailsRequestOrBuilder.java | 1 - .../v1beta1/EchoErrorDetailsResponse.java | 358 ++- .../EchoErrorDetailsResponseOrBuilder.java | 1 - .../showcase/v1beta1/EchoOuterClass.java | 13 +- .../google/showcase/v1beta1/EchoRequest.java | 134 +- .../v1beta1/EchoRequestOrBuilder.java | 3 +- .../google/showcase/v1beta1/EchoResponse.java | 91 +- .../v1beta1/EchoResponseOrBuilder.java | 1 - .../google/showcase/v1beta1/EnumRequest.java | 28 +- .../v1beta1/EnumRequestOrBuilder.java | 1 - .../google/showcase/v1beta1/EnumResponse.java | 115 +- .../v1beta1/EnumResponseOrBuilder.java | 1 - .../v1beta1/ErrorWithMultipleDetails.java | 26 +- .../ErrorWithMultipleDetailsOrBuilder.java | 1 - .../v1beta1/ErrorWithSingleDetail.java | 89 +- .../ErrorWithSingleDetailOrBuilder.java | 1 - .../showcase/v1beta1/ExpandRequest.java | 175 +- .../v1beta1/ExpandRequestOrBuilder.java | 1 - .../v1beta1/FailEchoWithDetailsRequest.java | 34 +- .../FailEchoWithDetailsRequestOrBuilder.java | 1 - .../v1beta1/FailEchoWithDetailsResponse.java | 6 +- .../FailEchoWithDetailsResponseOrBuilder.java | 1 - .../showcase/v1beta1/GetBlurbRequest.java | 34 +- .../v1beta1/GetBlurbRequestOrBuilder.java | 1 - .../showcase/v1beta1/GetRoomRequest.java | 34 +- .../v1beta1/GetRoomRequestOrBuilder.java | 1 - .../v1beta1/GetSequenceReportRequest.java | 34 +- .../GetSequenceReportRequestOrBuilder.java | 1 - .../showcase/v1beta1/GetSessionRequest.java | 34 +- .../v1beta1/GetSessionRequestOrBuilder.java | 1 - .../GetStreamingSequenceReportRequest.java | 35 +- ...reamingSequenceReportRequestOrBuilder.java | 1 - .../showcase/v1beta1/GetUserRequest.java | 34 +- .../v1beta1/GetUserRequestOrBuilder.java | 1 - .../showcase/v1beta1/IdentityOuterClass.java | 24 +- .../com/google/showcase/v1beta1/Issue.java | 76 +- .../showcase/v1beta1/IssueOrBuilder.java | 1 - .../showcase/v1beta1/ListBlurbsRequest.java | 64 +- .../v1beta1/ListBlurbsRequestOrBuilder.java | 1 - .../showcase/v1beta1/ListBlurbsResponse.java | 43 +- .../v1beta1/ListBlurbsResponseOrBuilder.java | 1 - .../showcase/v1beta1/ListRoomsRequest.java | 46 +- .../v1beta1/ListRoomsRequestOrBuilder.java | 1 - .../showcase/v1beta1/ListRoomsResponse.java | 43 +- .../v1beta1/ListRoomsResponseOrBuilder.java | 1 - .../showcase/v1beta1/ListSessionsRequest.java | 46 +- .../v1beta1/ListSessionsRequestOrBuilder.java | 1 - .../v1beta1/ListSessionsResponse.java | 44 +- .../ListSessionsResponseOrBuilder.java | 1 - .../showcase/v1beta1/ListTestsRequest.java | 64 +- .../v1beta1/ListTestsRequestOrBuilder.java | 1 - .../showcase/v1beta1/ListTestsResponse.java | 43 +- .../v1beta1/ListTestsResponseOrBuilder.java | 1 - .../showcase/v1beta1/ListUsersRequest.java | 46 +- .../v1beta1/ListUsersRequestOrBuilder.java | 1 - .../showcase/v1beta1/ListUsersResponse.java | 43 +- .../v1beta1/ListUsersResponseOrBuilder.java | 1 - .../showcase/v1beta1/MessagingOuterClass.java | 79 +- .../PagedExpandLegacyMappedResponse.java | 194 +- ...edExpandLegacyMappedResponseOrBuilder.java | 2 +- .../v1beta1/PagedExpandLegacyRequest.java | 64 +- .../PagedExpandLegacyRequestOrBuilder.java | 1 - .../showcase/v1beta1/PagedExpandRequest.java | 64 +- .../v1beta1/PagedExpandRequestOrBuilder.java | 1 - .../showcase/v1beta1/PagedExpandResponse.java | 44 +- .../v1beta1/PagedExpandResponseList.java | 52 +- .../PagedExpandResponseListOrBuilder.java | 1 - .../v1beta1/PagedExpandResponseOrBuilder.java | 1 - .../google/showcase/v1beta1/PoetryError.java | 34 +- .../v1beta1/PoetryErrorOrBuilder.java | 1 - .../showcase/v1beta1/RepeatRequest.java | 253 +- .../v1beta1/RepeatRequestOrBuilder.java | 1 - .../showcase/v1beta1/RepeatResponse.java | 112 +- .../v1beta1/RepeatResponseOrBuilder.java | 1 - .../v1beta1/ReportSessionRequest.java | 34 +- .../ReportSessionRequestOrBuilder.java | 1 - .../v1beta1/ReportSessionResponse.java | 65 +- .../ReportSessionResponseOrBuilder.java | 1 - .../google/showcase/v1beta1/RestError.java | 187 +- .../showcase/v1beta1/RestErrorOrBuilder.java | 1 - .../showcase/v1beta1/RestErrorOuterClass.java | 1 - .../com/google/showcase/v1beta1/Room.java | 207 +- .../showcase/v1beta1/RoomOrBuilder.java | 1 - .../v1beta1/SearchBlurbsMetadata.java | 90 +- .../SearchBlurbsMetadataOrBuilder.java | 1 - .../showcase/v1beta1/SearchBlurbsRequest.java | 82 +- .../v1beta1/SearchBlurbsRequestOrBuilder.java | 1 - .../v1beta1/SearchBlurbsResponse.java | 44 +- .../SearchBlurbsResponseOrBuilder.java | 1 - .../showcase/v1beta1/SendBlurbsResponse.java | 52 +- .../v1beta1/SendBlurbsResponseOrBuilder.java | 1 - .../com/google/showcase/v1beta1/Sequence.java | 212 +- .../showcase/v1beta1/SequenceOrBuilder.java | 1 - .../showcase/v1beta1/SequenceOuterClass.java | 49 +- .../showcase/v1beta1/SequenceReport.java | 363 ++- .../v1beta1/SequenceReportOrBuilder.java | 1 - .../com/google/showcase/v1beta1/Session.java | 57 +- .../showcase/v1beta1/SessionOrBuilder.java | 1 - .../com/google/showcase/v1beta1/Severity.java | 1 - .../showcase/v1beta1/StreamBlurbsRequest.java | 108 +- .../v1beta1/StreamBlurbsRequestOrBuilder.java | 1 - .../v1beta1/StreamBlurbsResponse.java | 111 +- .../StreamBlurbsResponseOrBuilder.java | 1 - .../showcase/v1beta1/StreamingSequence.java | 242 +- .../v1beta1/StreamingSequenceOrBuilder.java | 1 - .../v1beta1/StreamingSequenceReport.java | 365 ++- .../StreamingSequenceReportOrBuilder.java | 1 - .../com/google/showcase/v1beta1/Test.java | 313 +-- .../showcase/v1beta1/TestOrBuilder.java | 1 - .../com/google/showcase/v1beta1/TestRun.java | 108 +- .../showcase/v1beta1/TestRunOrBuilder.java | 1 - .../showcase/v1beta1/TestingOuterClass.java | 1 - .../showcase/v1beta1/UpdateBlurbRequest.java | 153 +- .../v1beta1/UpdateBlurbRequestOrBuilder.java | 1 - .../showcase/v1beta1/UpdateRoomRequest.java | 153 +- .../v1beta1/UpdateRoomRequestOrBuilder.java | 1 - .../showcase/v1beta1/UpdateUserRequest.java | 153 +- .../v1beta1/UpdateUserRequestOrBuilder.java | 1 - .../com/google/showcase/v1beta1/User.java | 315 ++- .../showcase/v1beta1/UserOrBuilder.java | 6 - .../showcase/v1beta1/VerifyTestRequest.java | 88 +- .../v1beta1/VerifyTestRequestOrBuilder.java | 1 - .../showcase/v1beta1/VerifyTestResponse.java | 90 +- .../v1beta1/VerifyTestResponseOrBuilder.java | 1 - .../google/showcase/v1beta1/WaitMetadata.java | 90 +- .../v1beta1/WaitMetadataOrBuilder.java | 1 - .../google/showcase/v1beta1/WaitRequest.java | 70 +- .../v1beta1/WaitRequestOrBuilder.java | 5 +- .../google/showcase/v1beta1/WaitResponse.java | 34 +- .../v1beta1/WaitResponseOrBuilder.java | 1 - 731 files changed, 16909 insertions(+), 31546 deletions(-) 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 4eed0bf660..f34ddc105e 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 @@ -16,7 +16,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/api/config_change.proto -// Protobuf Java Version: 3.25.8 package com.google.api; /** @@ -50,6 +49,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; } @@ -63,9 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int DESCRIPTION_FIELD_NUMBER = 2; - - @SuppressWarnings("serial") - private volatile java.lang.Object description_ = ""; + private volatile java.lang.Object description_; /** * @@ -311,8 +313,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - bitField0_ = 0; description_ = ""; + return this; } @@ -338,20 +340,11 @@ public com.google.api.Advice build() { @java.lang.Override public com.google.api.Advice buildPartial() { com.google.api.Advice result = new com.google.api.Advice(this); - if (bitField0_ != 0) { - buildPartial0(result); - } + result.description_ = description_; onBuilt(); return result; } - private void buildPartial0(com.google.api.Advice result) { - int from_bitField0_ = bitField0_; - if (((from_bitField0_ & 0x00000001) != 0)) { - result.description_ = description_; - } - } - @java.lang.Override public Builder clone() { return super.clone(); @@ -399,7 +392,6 @@ public Builder mergeFrom(com.google.api.Advice other) { if (other == com.google.api.Advice.getDefaultInstance()) return this; if (!other.getDescription().isEmpty()) { description_ = other.description_; - bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -431,7 +423,7 @@ public Builder mergeFrom( case 18: { description_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000001; + break; } // case 18 default: @@ -451,8 +443,6 @@ public Builder mergeFrom( return this; } - private int bitField0_; - private java.lang.Object description_ = ""; /** @@ -520,8 +510,8 @@ public Builder setDescription(java.lang.String value) { if (value == null) { throw new NullPointerException(); } + description_ = value; - bitField0_ |= 0x00000001; onChanged(); return this; } @@ -539,8 +529,8 @@ public Builder setDescription(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDescription() { + description_ = getDefaultInstance().getDescription(); - bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -563,8 +553,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); + description_ = value; - bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AdviceOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AdviceOrBuilder.java index f53543e76a..4e10e3407c 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AdviceOrBuilder.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AdviceOrBuilder.java @@ -16,7 +16,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/api/config_change.proto -// Protobuf Java Version: 3.25.8 package com.google.api; public interface AdviceOrBuilder diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AnnotationsProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AnnotationsProto.java index 8c94d22ffd..3edaac8bed 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AnnotationsProto.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AnnotationsProto.java @@ -16,7 +16,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/api/annotations.proto -// Protobuf Java Version: 3.25.8 package com.google.api; public final class AnnotationsProto { diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProto.java index f5ea6662a2..e7528dfc3e 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProto.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProto.java @@ -16,7 +16,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/api/auth.proto -// Protobuf Java Version: 3.25.8 package com.google.api; public final class AuthProto { 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 96b3425326..e81ffe0342 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 @@ -16,7 +16,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/api/auth.proto -// Protobuf Java Version: 3.25.8 package com.google.api; /** @@ -56,6 +55,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; } @@ -69,9 +73,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int ID_FIELD_NUMBER = 1; - - @SuppressWarnings("serial") - private volatile java.lang.Object id_ = ""; + private volatile java.lang.Object id_; /** * @@ -79,7 +81,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * 
    * The unique identifier of the auth provider. It will be referred to by
    * `AuthRequirement.provider_id`.
-   *
    * Example: "bookstore_auth".
    *
* @@ -106,7 +107,6 @@ public java.lang.String getId() { * 
    * The unique identifier of the auth provider. It will be referred to by
    * `AuthRequirement.provider_id`.
-   *
    * Example: "bookstore_auth".
    *
* @@ -128,9 +128,7 @@ public com.google.protobuf.ByteString getIdBytes() { } public static final int ISSUER_FIELD_NUMBER = 2; - - @SuppressWarnings("serial") - private volatile java.lang.Object issuer_ = ""; + private volatile java.lang.Object issuer_; /** * @@ -139,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@developer.gserviceaccount.com * @@ -168,7 +165,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@developer.gserviceaccount.com * @@ -191,9 +187,7 @@ public com.google.protobuf.ByteString getIssuerBytes() { } public static final int JWKS_URI_FIELD_NUMBER = 3; - - @SuppressWarnings("serial") - private volatile java.lang.Object jwksUri_ = ""; + private volatile java.lang.Object jwksUri_; /** * @@ -209,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 * * @@ -244,7 +237,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 * * @@ -266,9 +258,7 @@ public com.google.protobuf.ByteString getJwksUriBytes() { } public static final int AUDIENCES_FIELD_NUMBER = 4; - - @SuppressWarnings("serial") - private volatile java.lang.Object audiences_ = ""; + private volatile java.lang.Object audiences_; /** * @@ -286,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 * @@ -326,9 +314,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 * @@ -351,9 +337,7 @@ public com.google.protobuf.ByteString getAudiencesBytes() { } public static final int AUTHORIZATION_URL_FIELD_NUMBER = 5; - - @SuppressWarnings("serial") - private volatile java.lang.Object authorizationUrl_ = ""; + private volatile java.lang.Object authorizationUrl_; /** * @@ -406,8 +390,6 @@ public com.google.protobuf.ByteString getAuthorizationUrlBytes() { } public static final int JWT_LOCATIONS_FIELD_NUMBER = 6; - - @SuppressWarnings("serial") private java.util.List jwtLocations_; /** @@ -417,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 @@ -448,15 +427,12 @@ public java.util.List 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 @@ -480,15 +456,12 @@ public java.util.List 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 @@ -511,15 +484,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 @@ -542,15 +512,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 @@ -808,19 +775,23 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - bitField0_ = 0; id_ = ""; + issuer_ = ""; + jwksUri_ = ""; + audiences_ = ""; + authorizationUrl_ = ""; + if (jwtLocationsBuilder_ == null) { jwtLocations_ = java.util.Collections.emptyList(); } else { jwtLocations_ = null; jwtLocationsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -846,43 +817,23 @@ public com.google.api.AuthProvider build() { @java.lang.Override public com.google.api.AuthProvider buildPartial() { com.google.api.AuthProvider result = new com.google.api.AuthProvider(this); - buildPartialRepeatedFields(result); - if (bitField0_ != 0) { - buildPartial0(result); - } - onBuilt(); - return result; - } - - private void buildPartialRepeatedFields(com.google.api.AuthProvider result) { + int from_bitField0_ = bitField0_; + result.id_ = id_; + result.issuer_ = issuer_; + result.jwksUri_ = jwksUri_; + result.audiences_ = audiences_; + result.authorizationUrl_ = authorizationUrl_; if (jwtLocationsBuilder_ == null) { - if (((bitField0_ & 0x00000020) != 0)) { + if (((bitField0_ & 0x00000001) != 0)) { jwtLocations_ = java.util.Collections.unmodifiableList(jwtLocations_); - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000001); } result.jwtLocations_ = jwtLocations_; } else { result.jwtLocations_ = jwtLocationsBuilder_.build(); } - } - - private void buildPartial0(com.google.api.AuthProvider result) { - int from_bitField0_ = bitField0_; - if (((from_bitField0_ & 0x00000001) != 0)) { - result.id_ = id_; - } - if (((from_bitField0_ & 0x00000002) != 0)) { - result.issuer_ = issuer_; - } - if (((from_bitField0_ & 0x00000004) != 0)) { - result.jwksUri_ = jwksUri_; - } - if (((from_bitField0_ & 0x00000008) != 0)) { - result.audiences_ = audiences_; - } - if (((from_bitField0_ & 0x00000010) != 0)) { - result.authorizationUrl_ = authorizationUrl_; - } + onBuilt(); + return result; } @java.lang.Override @@ -932,34 +883,29 @@ public Builder mergeFrom(com.google.api.AuthProvider other) { if (other == com.google.api.AuthProvider.getDefaultInstance()) return this; if (!other.getId().isEmpty()) { id_ = other.id_; - bitField0_ |= 0x00000001; onChanged(); } if (!other.getIssuer().isEmpty()) { issuer_ = other.issuer_; - bitField0_ |= 0x00000002; onChanged(); } if (!other.getJwksUri().isEmpty()) { jwksUri_ = other.jwksUri_; - bitField0_ |= 0x00000004; onChanged(); } if (!other.getAudiences().isEmpty()) { audiences_ = other.audiences_; - bitField0_ |= 0x00000008; onChanged(); } if (!other.getAuthorizationUrl().isEmpty()) { authorizationUrl_ = other.authorizationUrl_; - bitField0_ |= 0x00000010; onChanged(); } if (jwtLocationsBuilder_ == null) { if (!other.jwtLocations_.isEmpty()) { if (jwtLocations_.isEmpty()) { jwtLocations_ = other.jwtLocations_; - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000001); } else { ensureJwtLocationsIsMutable(); jwtLocations_.addAll(other.jwtLocations_); @@ -972,7 +918,7 @@ public Builder mergeFrom(com.google.api.AuthProvider other) { jwtLocationsBuilder_.dispose(); jwtLocationsBuilder_ = null; jwtLocations_ = other.jwtLocations_; - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000001); jwtLocationsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getJwtLocationsFieldBuilder() @@ -1011,31 +957,31 @@ public Builder mergeFrom( case 10: { id_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000001; + break; } // case 10 case 18: { issuer_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000002; + break; } // case 18 case 26: { jwksUri_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000004; + break; } // case 26 case 34: { audiences_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000008; + break; } // case 34 case 42: { authorizationUrl_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000010; + break; } // case 42 case 50: @@ -1077,7 +1023,6 @@ public Builder mergeFrom( * 
      * The unique identifier of the auth provider. It will be referred to by
      * `AuthRequirement.provider_id`.
-     *
      * Example: "bookstore_auth".
      *
* @@ -1103,7 +1048,6 @@ public java.lang.String getId() { * 
      * The unique identifier of the auth provider. It will be referred to by
      * `AuthRequirement.provider_id`.
-     *
      * Example: "bookstore_auth".
      *
* @@ -1129,7 +1073,6 @@ public com.google.protobuf.ByteString getIdBytes() { * 
      * The unique identifier of the auth provider. It will be referred to by
      * `AuthRequirement.provider_id`.
-     *
      * Example: "bookstore_auth".
      *
* @@ -1142,8 +1085,8 @@ public Builder setId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } + id_ = value; - bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1154,7 +1097,6 @@ public Builder setId(java.lang.String value) { * 
      * The unique identifier of the auth provider. It will be referred to by
      * `AuthRequirement.provider_id`.
-     *
      * Example: "bookstore_auth".
      *
* @@ -1163,8 +1105,8 @@ public Builder setId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearId() { + id_ = getDefaultInstance().getId(); - bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1175,7 +1117,6 @@ public Builder clearId() { * 
      * The unique identifier of the auth provider. It will be referred to by
      * `AuthRequirement.provider_id`.
-     *
      * Example: "bookstore_auth".
      *
* @@ -1189,8 +1130,8 @@ public Builder setIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); + id_ = value; - bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1204,7 +1145,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@developer.gserviceaccount.com * @@ -1232,7 +1172,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@developer.gserviceaccount.com * @@ -1260,7 +1199,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@developer.gserviceaccount.com * @@ -1274,8 +1212,8 @@ public Builder setIssuer(java.lang.String value) { if (value == null) { throw new NullPointerException(); } + issuer_ = value; - bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1287,7 +1225,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@developer.gserviceaccount.com * @@ -1297,8 +1234,8 @@ public Builder setIssuer(java.lang.String value) { * @return This builder for chaining. */ public Builder clearIssuer() { + issuer_ = getDefaultInstance().getIssuer(); - bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1310,7 +1247,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@developer.gserviceaccount.com * @@ -1325,8 +1261,8 @@ public Builder setIssuerBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); + issuer_ = value; - bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1347,7 +1283,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 * * @@ -1381,7 +1316,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 * * @@ -1415,7 +1349,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 * * @@ -1428,8 +1361,8 @@ public Builder setJwksUri(java.lang.String value) { if (value == null) { throw new NullPointerException(); } + jwksUri_ = value; - bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1448,7 +1381,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 * * @@ -1457,8 +1389,8 @@ public Builder setJwksUri(java.lang.String value) { * @return This builder for chaining. */ public Builder clearJwksUri() { + jwksUri_ = getDefaultInstance().getJwksUri(); - bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1477,7 +1409,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 * * @@ -1491,8 +1422,8 @@ public Builder setJwksUriBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); + jwksUri_ = value; - bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1515,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 * @@ -1554,9 +1483,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 * @@ -1593,9 +1520,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 * @@ -1609,8 +1534,8 @@ public Builder setAudiences(java.lang.String value) { if (value == null) { throw new NullPointerException(); } + audiences_ = value; - bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1631,9 +1556,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 * @@ -1643,8 +1566,8 @@ public Builder setAudiences(java.lang.String value) { * @return This builder for chaining. */ public Builder clearAudiences() { + audiences_ = getDefaultInstance().getAudiences(); - bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } @@ -1665,9 +1588,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 * @@ -1682,8 +1603,8 @@ public Builder setAudiencesBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); + audiences_ = value; - bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1755,8 +1676,8 @@ public Builder setAuthorizationUrl(java.lang.String value) { if (value == null) { throw new NullPointerException(); } + authorizationUrl_ = value; - bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1774,8 +1695,8 @@ public Builder setAuthorizationUrl(java.lang.String value) { * @return This builder for chaining. */ public Builder clearAuthorizationUrl() { + authorizationUrl_ = getDefaultInstance().getAuthorizationUrl(); - bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; } @@ -1798,8 +1719,8 @@ public Builder setAuthorizationUrlBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); + authorizationUrl_ = value; - bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1808,9 +1729,9 @@ public Builder setAuthorizationUrlBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureJwtLocationsIsMutable() { - if (!((bitField0_ & 0x00000020) != 0)) { + if (!((bitField0_ & 0x00000001) != 0)) { jwtLocations_ = new java.util.ArrayList(jwtLocations_); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000001; } } @@ -1827,15 +1748,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 @@ -1861,15 +1779,12 @@ public java.util.List 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 @@ -1895,15 +1810,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 @@ -1929,15 +1841,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 @@ -1969,15 +1878,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 @@ -2006,15 +1912,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 @@ -2046,15 +1949,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 @@ -2086,15 +1986,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 @@ -2123,15 +2020,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 @@ -2160,15 +2054,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 @@ -2198,15 +2089,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 @@ -2220,7 +2108,7 @@ public Builder addAllJwtLocations( public Builder clearJwtLocations() { if (jwtLocationsBuilder_ == null) { jwtLocations_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { jwtLocationsBuilder_.clear(); @@ -2235,15 +2123,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 @@ -2272,15 +2157,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 @@ -2302,15 +2184,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 @@ -2336,15 +2215,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 @@ -2371,15 +2247,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 @@ -2402,15 +2275,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 @@ -2433,15 +2303,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 @@ -2467,7 +2334,7 @@ public java.util.List getJwtLocationsBuilder com.google.api.JwtLocation, com.google.api.JwtLocation.Builder, com.google.api.JwtLocationOrBuilder>( - jwtLocations_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean()); + jwtLocations_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); jwtLocations_ = null; } return jwtLocationsBuilder_; 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 491a168630..0ae96e7016 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 @@ -16,7 +16,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/api/auth.proto -// Protobuf Java Version: 3.25.8 package com.google.api; public interface AuthProviderOrBuilder @@ -30,7 +29,6 @@ public interface AuthProviderOrBuilder * 
    * The unique identifier of the auth provider. It will be referred to by
    * `AuthRequirement.provider_id`.
-   *
    * Example: "bookstore_auth".
    *
* @@ -46,7 +44,6 @@ public interface AuthProviderOrBuilder * 
    * The unique identifier of the auth provider. It will be referred to by
    * `AuthRequirement.provider_id`.
-   *
    * Example: "bookstore_auth".
    *
* @@ -63,7 +60,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@developer.gserviceaccount.com * @@ -81,7 +77,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@developer.gserviceaccount.com * @@ -106,7 +101,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 * * @@ -130,7 +124,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 * * @@ -156,9 +149,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 * @@ -185,9 +176,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 * @@ -233,15 +222,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 @@ -261,15 +247,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 @@ -289,15 +272,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 @@ -317,15 +297,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 @@ -345,15 +322,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 479a5378e5..876b3d20a2 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 @@ -16,7 +16,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/api/auth.proto -// Protobuf Java Version: 3.25.8 package com.google.api; /** @@ -52,6 +51,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; } @@ -65,18 +69,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PROVIDER_ID_FIELD_NUMBER = 1; - - @SuppressWarnings("serial") - private volatile java.lang.Object providerId_ = ""; + private volatile java.lang.Object providerId_; /** * * * 
    * [id][google.api.AuthProvider.id] from authentication provider.
-   *
    * Example:
-   *
    *     provider_id: bookstore_auth
    *
* @@ -102,9 +102,7 @@ public java.lang.String getProviderId() { * * 
    * [id][google.api.AuthProvider.id] from authentication provider.
-   *
    * Example:
-   *
    *     provider_id: bookstore_auth
    *
* @@ -126,9 +124,7 @@ public com.google.protobuf.ByteString getProviderIdBytes() { } public static final int AUDIENCES_FIELD_NUMBER = 2; - - @SuppressWarnings("serial") - private volatile java.lang.Object audiences_ = ""; + private volatile java.lang.Object audiences_; /** * @@ -136,7 +132,6 @@ public com.google.protobuf.ByteString getProviderIdBytes() { * 
    * 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
@@ -145,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
    *
@@ -175,7 +168,6 @@ public java.lang.String getAudiences() { * 
    * 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
@@ -184,9 +176,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
    *
@@ -412,9 +402,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - bitField0_ = 0; providerId_ = ""; + audiences_ = ""; + return this; } @@ -440,23 +431,12 @@ public com.google.api.AuthRequirement build() { @java.lang.Override public com.google.api.AuthRequirement buildPartial() { com.google.api.AuthRequirement result = new com.google.api.AuthRequirement(this); - if (bitField0_ != 0) { - buildPartial0(result); - } + result.providerId_ = providerId_; + result.audiences_ = audiences_; onBuilt(); return result; } - private void buildPartial0(com.google.api.AuthRequirement result) { - int from_bitField0_ = bitField0_; - if (((from_bitField0_ & 0x00000001) != 0)) { - result.providerId_ = providerId_; - } - if (((from_bitField0_ & 0x00000002) != 0)) { - result.audiences_ = audiences_; - } - } - @java.lang.Override public Builder clone() { return super.clone(); @@ -504,12 +484,10 @@ public Builder mergeFrom(com.google.api.AuthRequirement other) { if (other == com.google.api.AuthRequirement.getDefaultInstance()) return this; if (!other.getProviderId().isEmpty()) { providerId_ = other.providerId_; - bitField0_ |= 0x00000001; onChanged(); } if (!other.getAudiences().isEmpty()) { audiences_ = other.audiences_; - bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -541,13 +519,13 @@ public Builder mergeFrom( case 10: { providerId_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000001; + break; } // case 10 case 18: { audiences_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000002; + break; } // case 18 default: @@ -567,8 +545,6 @@ public Builder mergeFrom( return this; } - private int bitField0_; - private java.lang.Object providerId_ = ""; /** @@ -576,9 +552,7 @@ public Builder mergeFrom( * * 
      * [id][google.api.AuthProvider.id] from authentication provider.
-     *
      * Example:
-     *
      *     provider_id: bookstore_auth
      *
* @@ -603,9 +577,7 @@ public java.lang.String getProviderId() { * * 
      * [id][google.api.AuthProvider.id] from authentication provider.
-     *
      * Example:
-     *
      *     provider_id: bookstore_auth
      *
* @@ -630,9 +602,7 @@ public com.google.protobuf.ByteString getProviderIdBytes() { * * 
      * [id][google.api.AuthProvider.id] from authentication provider.
-     *
      * Example:
-     *
      *     provider_id: bookstore_auth
      *
* @@ -645,8 +615,8 @@ public Builder setProviderId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } + providerId_ = value; - bitField0_ |= 0x00000001; onChanged(); return this; } @@ -656,9 +626,7 @@ public Builder setProviderId(java.lang.String value) { * * 
      * [id][google.api.AuthProvider.id] from authentication provider.
-     *
      * Example:
-     *
      *     provider_id: bookstore_auth
      *
* @@ -667,8 +635,8 @@ public Builder setProviderId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearProviderId() { + providerId_ = getDefaultInstance().getProviderId(); - bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -678,9 +646,7 @@ public Builder clearProviderId() { * * 
      * [id][google.api.AuthProvider.id] from authentication provider.
-     *
      * Example:
-     *
      *     provider_id: bookstore_auth
      *
* @@ -694,8 +660,8 @@ public Builder setProviderIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); + providerId_ = value; - bitField0_ |= 0x00000001; onChanged(); return this; } @@ -708,7 +674,6 @@ public Builder setProviderIdBytes(com.google.protobuf.ByteString value) { * 
      * 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
@@ -717,9 +682,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
      *
@@ -746,7 +709,6 @@ public java.lang.String getAudiences() { * 
      * 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
@@ -755,9 +717,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
      *
@@ -784,7 +744,6 @@ public com.google.protobuf.ByteString getAudiencesBytes() { * 
      * 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
@@ -793,9 +752,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
      *
@@ -809,8 +766,8 @@ public Builder setAudiences(java.lang.String value) { if (value == null) { throw new NullPointerException(); } + audiences_ = value; - bitField0_ |= 0x00000002; onChanged(); return this; } @@ -821,7 +778,6 @@ public Builder setAudiences(java.lang.String value) { * 
      * 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
@@ -830,9 +786,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
      *
@@ -842,8 +796,8 @@ public Builder setAudiences(java.lang.String value) { * @return This builder for chaining. */ public Builder clearAudiences() { + audiences_ = getDefaultInstance().getAudiences(); - bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -854,7 +808,6 @@ public Builder clearAudiences() { * 
      * 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
@@ -863,9 +816,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
      *
@@ -880,8 +831,8 @@ public Builder setAudiencesBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); + audiences_ = value; - bitField0_ |= 0x00000002; onChanged(); return this; } 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 6a7f44f9e5..9401bcb812 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 @@ -16,7 +16,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/api/auth.proto -// Protobuf Java Version: 3.25.8 package com.google.api; public interface AuthRequirementOrBuilder @@ -29,9 +28,7 @@ public interface AuthRequirementOrBuilder * * 
    * [id][google.api.AuthProvider.id] from authentication provider.
-   *
    * Example:
-   *
    *     provider_id: bookstore_auth
    *
* @@ -46,9 +43,7 @@ public interface AuthRequirementOrBuilder * * 
    * [id][google.api.AuthProvider.id] from authentication provider.
-   *
    * Example:
-   *
    *     provider_id: bookstore_auth
    *
* @@ -64,7 +59,6 @@ public interface AuthRequirementOrBuilder * 
    * 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
@@ -73,9 +67,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
    *
@@ -92,7 +84,6 @@ public interface AuthRequirementOrBuilder * 
    * 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
@@ -101,9 +92,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
    *
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 5e35db3bb7..bbed0fc947 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 @@ -16,7 +16,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/api/auth.proto -// Protobuf Java Version: 3.25.8 package com.google.api; /** @@ -25,9 +24,7 @@ * 
  * `Authentication` defines the authentication configuration for API methods
  * provided by an API service.
- *
  * Example:
- *
  *     name: calendar.googleapis.com
  *     authentication:
  *       providers:
@@ -67,6 +64,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;
   }
@@ -80,8 +82,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RULES_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
   private java.util.List rules_;
 
   /**
@@ -89,7 +89,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -105,7 +104,6 @@ public java.util.List getRulesList() {
    *
    * 
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -122,7 +120,6 @@ public java.util.List getRulesList() {
    *
    * 
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -138,7 +135,6 @@ public int getRulesCount() {
    *
    * 
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -154,7 +150,6 @@ public com.google.api.AuthenticationRule getRules(int index) {
    *
    * 
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -166,8 +161,6 @@ public com.google.api.AuthenticationRuleOrBuilder getRulesOrBuilder(int index) {
   }
 
   public static final int PROVIDERS_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
   private java.util.List providers_;
 
   /**
@@ -418,9 +411,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * 
    * `Authentication` defines the authentication configuration for API methods
    * provided by an API service.
-   *
    * Example:
-   *
    *     name: calendar.googleapis.com
    *     authentication:
    *       providers:
@@ -464,7 +455,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
       } else {
@@ -504,15 +494,7 @@ public com.google.api.Authentication build() {
     @java.lang.Override
     public com.google.api.Authentication buildPartial() {
       com.google.api.Authentication result = new com.google.api.Authentication(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.Authentication result) {
+      int from_bitField0_ = bitField0_;
       if (rulesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
@@ -531,10 +513,8 @@ private void buildPartialRepeatedFields(com.google.api.Authentication result) {
       } else {
         result.providers_ = providersBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.Authentication result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -727,7 +707,6 @@ private void ensureRulesIsMutable() {
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -746,7 +725,6 @@ public java.util.List getRulesList() {
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -765,7 +743,6 @@ public int getRulesCount() {
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -784,7 +761,6 @@ public com.google.api.AuthenticationRule getRules(int index) {
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -809,7 +785,6 @@ public Builder setRules(int index, com.google.api.AuthenticationRule value) {
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -831,7 +806,6 @@ public Builder setRules(int index, com.google.api.AuthenticationRule.Builder bui
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -856,7 +830,6 @@ public Builder addRules(com.google.api.AuthenticationRule value) {
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -881,7 +854,6 @@ public Builder addRules(int index, com.google.api.AuthenticationRule value) {
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -903,7 +875,6 @@ public Builder addRules(com.google.api.AuthenticationRule.Builder builderForValu
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -925,7 +896,6 @@ public Builder addRules(int index, com.google.api.AuthenticationRule.Builder bui
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -948,7 +918,6 @@ public Builder addAllRules(
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -970,7 +939,6 @@ public Builder clearRules() {
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -992,7 +960,6 @@ public Builder removeRules(int index) {
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1007,7 +974,6 @@ public com.google.api.AuthenticationRule.Builder getRulesBuilder(int index) {
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1026,7 +992,6 @@ public com.google.api.AuthenticationRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1046,7 +1011,6 @@ public com.google.api.AuthenticationRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1062,7 +1026,6 @@ public com.google.api.AuthenticationRule.Builder addRulesBuilder() {
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1078,7 +1041,6 @@ public com.google.api.AuthenticationRule.Builder addRulesBuilder(int index) {
      *
      * 
      * A list of authentication rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
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 b34415f5eb..8012e9f600 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/auth.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface AuthenticationOrBuilder
@@ -29,7 +28,6 @@ public interface AuthenticationOrBuilder
    *
    * 
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -42,7 +40,6 @@ public interface AuthenticationOrBuilder
    *
    * 
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -55,7 +52,6 @@ public interface AuthenticationOrBuilder
    *
    * 
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -68,7 +64,6 @@ public interface AuthenticationOrBuilder
    *
    * 
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -81,7 +76,6 @@ public interface AuthenticationOrBuilder
    *
    * 
    * A list of authentication rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
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 c0d9e8c8a9..f9aa1e3bcd 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/auth.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -24,12 +23,10 @@
  *
  * 
  * 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.
  * 

@@ -58,6 +55,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;
   }
@@ -71,18 +73,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.api.AuthenticationRule.Builder.class);
   }
 
-  private int bitField0_;
   public static final int SELECTOR_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object selector_ = "";
+  private volatile java.lang.Object selector_;
 
   /**
    *
    *
    * 
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -109,7 +107,6 @@ public java.lang.String getSelector() {
    *
    * 
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -147,7 +144,7 @@ public com.google.protobuf.ByteString getSelectorBytes() {
    */
   @java.lang.Override
   public boolean hasOauth() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return oauth_ != null;
   }
 
   /**
@@ -177,11 +174,11 @@ public com.google.api.OAuthRequirements getOauth() {
    */
   @java.lang.Override
   public com.google.api.OAuthRequirementsOrBuilder getOauthOrBuilder() {
-    return oauth_ == null ? com.google.api.OAuthRequirements.getDefaultInstance() : oauth_;
+    return getOauth();
   }
 
   public static final int ALLOW_WITHOUT_CREDENTIAL_FIELD_NUMBER = 5;
-  private boolean allowWithoutCredential_ = false;
+  private boolean allowWithoutCredential_;
 
   /**
    *
@@ -201,8 +198,6 @@ public boolean getAllowWithoutCredential() {
   }
 
   public static final int REQUIREMENTS_FIELD_NUMBER = 7;
-
-  @SuppressWarnings("serial")
   private java.util.List requirements_;
 
   /**
@@ -293,7 +288,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(selector_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, selector_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (oauth_ != null) {
       output.writeMessage(2, getOauth());
     }
     if (allowWithoutCredential_ != false) {
@@ -314,7 +309,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(selector_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, selector_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (oauth_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getOauth());
     }
     if (allowWithoutCredential_ != false) {
@@ -473,12 +468,10 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * 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.
    * 

@@ -504,40 +497,32 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.AuthenticationRule.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getOauthFieldBuilder();
-        getRequirementsFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       selector_ = "";
-      oauth_ = null;
-      if (oauthBuilder_ != null) {
-        oauthBuilder_.dispose();
+
+      if (oauthBuilder_ == null) {
+        oauth_ = null;
+      } else {
+        oauth_ = null;
         oauthBuilder_ = null;
       }
       allowWithoutCredential_ = false;
+
       if (requirementsBuilder_ == null) {
         requirements_ = java.util.Collections.emptyList();
       } else {
         requirements_ = null;
         requirementsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000008);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -563,40 +548,25 @@ public com.google.api.AuthenticationRule build() {
     @java.lang.Override
     public com.google.api.AuthenticationRule buildPartial() {
       com.google.api.AuthenticationRule result = new com.google.api.AuthenticationRule(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      result.selector_ = selector_;
+      if (oauthBuilder_ == null) {
+        result.oauth_ = oauth_;
+      } else {
+        result.oauth_ = oauthBuilder_.build();
       }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.AuthenticationRule result) {
+      result.allowWithoutCredential_ = allowWithoutCredential_;
       if (requirementsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           requirements_ = java.util.Collections.unmodifiableList(requirements_);
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.requirements_ = requirements_;
       } else {
         result.requirements_ = requirementsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.AuthenticationRule result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.selector_ = selector_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.oauth_ = oauthBuilder_ == null ? oauth_ : oauthBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.allowWithoutCredential_ = allowWithoutCredential_;
-      }
-      result.bitField0_ |= to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -646,7 +616,6 @@ public Builder mergeFrom(com.google.api.AuthenticationRule other) {
       if (other == com.google.api.AuthenticationRule.getDefaultInstance()) return this;
       if (!other.getSelector().isEmpty()) {
         selector_ = other.selector_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasOauth()) {
@@ -659,7 +628,7 @@ public Builder mergeFrom(com.google.api.AuthenticationRule other) {
         if (!other.requirements_.isEmpty()) {
           if (requirements_.isEmpty()) {
             requirements_ = other.requirements_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureRequirementsIsMutable();
             requirements_.addAll(other.requirements_);
@@ -672,7 +641,7 @@ public Builder mergeFrom(com.google.api.AuthenticationRule other) {
             requirementsBuilder_.dispose();
             requirementsBuilder_ = null;
             requirements_ = other.requirements_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000001);
             requirementsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getRequirementsFieldBuilder()
@@ -711,19 +680,19 @@ public Builder mergeFrom(
             case 10:
               {
                 selector_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getOauthFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 40:
               {
                 allowWithoutCredential_ = input.readBool();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 40
             case 58:
@@ -764,7 +733,6 @@ public Builder mergeFrom(
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -790,7 +758,6 @@ public java.lang.String getSelector() {
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -816,7 +783,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -830,8 +796,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -841,7 +807,6 @@ public Builder setSelector(java.lang.String value) {
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -851,8 +816,8 @@ public Builder setSelector(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSelector() {
+
       selector_ = getDefaultInstance().getSelector();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -862,7 +827,6 @@ public Builder clearSelector() {
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -877,8 +841,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -902,7 +866,7 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
      * @return Whether the oauth field is set.
      */
     public boolean hasOauth() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return oauthBuilder_ != null || oauth_ != null;
     }
 
     /**
@@ -939,11 +903,11 @@ public Builder setOauth(com.google.api.OAuthRequirements value) {
           throw new NullPointerException();
         }
         oauth_ = value;
+        onChanged();
       } else {
         oauthBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -959,11 +923,11 @@ public Builder setOauth(com.google.api.OAuthRequirements value) {
     public Builder setOauth(com.google.api.OAuthRequirements.Builder builderForValue) {
       if (oauthBuilder_ == null) {
         oauth_ = builderForValue.build();
+        onChanged();
       } else {
         oauthBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -978,20 +942,17 @@ public Builder setOauth(com.google.api.OAuthRequirements.Builder builderForValue
      */
     public Builder mergeOauth(com.google.api.OAuthRequirements value) {
       if (oauthBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && oauth_ != null
-            && oauth_ != com.google.api.OAuthRequirements.getDefaultInstance()) {
-          getOauthBuilder().mergeFrom(value);
+        if (oauth_ != null) {
+          oauth_ =
+              com.google.api.OAuthRequirements.newBuilder(oauth_).mergeFrom(value).buildPartial();
         } else {
           oauth_ = value;
         }
+        onChanged();
       } else {
         oauthBuilder_.mergeFrom(value);
       }
-      if (oauth_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1005,13 +966,14 @@ public Builder mergeOauth(com.google.api.OAuthRequirements value) {
      * .google.api.OAuthRequirements oauth = 2;
      */
     public Builder clearOauth() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      oauth_ = null;
-      if (oauthBuilder_ != null) {
-        oauthBuilder_.dispose();
+      if (oauthBuilder_ == null) {
+        oauth_ = null;
+        onChanged();
+      } else {
+        oauth_ = null;
         oauthBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1025,7 +987,7 @@ public Builder clearOauth() {
      * .google.api.OAuthRequirements oauth = 2;
      */
     public com.google.api.OAuthRequirements.Builder getOauthBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getOauthFieldBuilder().getBuilder();
     }
@@ -1108,7 +1070,6 @@ public boolean getAllowWithoutCredential() {
     public Builder setAllowWithoutCredential(boolean value) {
 
       allowWithoutCredential_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1126,7 +1087,7 @@ public Builder setAllowWithoutCredential(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearAllowWithoutCredential() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       allowWithoutCredential_ = false;
       onChanged();
       return this;
@@ -1136,9 +1097,9 @@ public Builder clearAllowWithoutCredential() {
         java.util.Collections.emptyList();
 
     private void ensureRequirementsIsMutable() {
-      if (!((bitField0_ & 0x00000008) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         requirements_ = new java.util.ArrayList(requirements_);
-        bitField0_ |= 0x00000008;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1363,7 +1324,7 @@ public Builder addAllRequirements(
     public Builder clearRequirements() {
       if (requirementsBuilder_ == null) {
         requirements_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         requirementsBuilder_.clear();
@@ -1491,7 +1452,7 @@ public java.util.List getRequirementsBui
                 com.google.api.AuthRequirement,
                 com.google.api.AuthRequirement.Builder,
                 com.google.api.AuthRequirementOrBuilder>(
-                requirements_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
+                requirements_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         requirements_ = null;
       }
       return requirementsBuilder_;
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 e43a772cc5..3ff02fdd41 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/auth.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface AuthenticationRuleOrBuilder
@@ -29,7 +28,6 @@ public interface AuthenticationRuleOrBuilder
    *
    * 
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -45,7 +43,6 @@ public interface AuthenticationRuleOrBuilder
    *
    * 
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

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 321feeba82..ebd3c2a9f6 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/backend.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -49,6 +48,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;
   }
@@ -62,8 +66,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RULES_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List rules_;
 
   /**
@@ -71,7 +73,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -87,7 +88,6 @@ public java.util.List getRulesList() {
    *
    * 
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -103,7 +103,6 @@ public java.util.List getRulesOrB
    *
    * 
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -119,7 +118,6 @@ public int getRulesCount() {
    *
    * 
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -135,7 +133,6 @@ public com.google.api.BackendRule getRules(int index) {
    *
    * 
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -341,7 +338,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
       } else {
@@ -374,15 +370,7 @@ public com.google.api.Backend build() {
     @java.lang.Override
     public com.google.api.Backend buildPartial() {
       com.google.api.Backend result = new com.google.api.Backend(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.Backend result) {
+      int from_bitField0_ = bitField0_;
       if (rulesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
@@ -392,10 +380,8 @@ private void buildPartialRepeatedFields(com.google.api.Backend result) {
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.Backend result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -547,7 +533,6 @@ private void ensureRulesIsMutable() {
      *
      * 
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -566,7 +551,6 @@ public java.util.List getRulesList() {
      *
      * 
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -585,7 +569,6 @@ public int getRulesCount() {
      *
      * 
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -604,7 +587,6 @@ public com.google.api.BackendRule getRules(int index) {
      *
      * 
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -629,7 +611,6 @@ public Builder setRules(int index, com.google.api.BackendRule value) {
      *
      * 
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -651,7 +632,6 @@ public Builder setRules(int index, com.google.api.BackendRule.Builder builderFor
      *
      * 
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -676,7 +656,6 @@ public Builder addRules(com.google.api.BackendRule value) {
      *
      * 
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -701,7 +680,6 @@ public Builder addRules(int index, com.google.api.BackendRule value) {
      *
      * 
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -723,7 +701,6 @@ public Builder addRules(com.google.api.BackendRule.Builder builderForValue) {
      *
      * 
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -745,7 +722,6 @@ public Builder addRules(int index, com.google.api.BackendRule.Builder builderFor
      *
      * 
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -767,7 +743,6 @@ public Builder addAllRules(java.lang.Iterable
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -789,7 +764,6 @@ public Builder clearRules() {
      *
      * 
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -811,7 +785,6 @@ public Builder removeRules(int index) {
      *
      * 
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -826,7 +799,6 @@ public com.google.api.BackendRule.Builder getRulesBuilder(int index) {
      *
      * 
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -845,7 +817,6 @@ public com.google.api.BackendRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * 
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -864,7 +835,6 @@ public java.util.List getRulesOrB
      *
      * 
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -879,7 +849,6 @@ public com.google.api.BackendRule.Builder addRulesBuilder() {
      *
      * 
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -895,7 +864,6 @@ public com.google.api.BackendRule.Builder addRulesBuilder(int index) {
      *
      * 
      * A list of API backend rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
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 4e5c3d5cce..523471fe3c 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/backend.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface BackendOrBuilder
@@ -29,7 +28,6 @@ public interface BackendOrBuilder
    *
    * 
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -42,7 +40,6 @@ public interface BackendOrBuilder
    *
    * 
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -55,7 +52,6 @@ public interface BackendOrBuilder
    *
    * 
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -68,7 +64,6 @@ public interface BackendOrBuilder
    *
    * 
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -81,7 +76,6 @@ public interface BackendOrBuilder
    *
    * 
    * A list of API backend rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendProto.java
index 56d05ac980..28d68febf2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/backend.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class BackendProto {
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 a3888ef96a..11f95fed8a 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/backend.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -52,14 +51,18 @@ 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;
   }
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 10:
         return internalGetOverridesByRequestProtocol();
@@ -83,7 +86,6 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
    * 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.
@@ -103,21 +105,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&uid=johndoe
-     *
      *     Request path: /api/company/widgetworks/user/johndoe?timezone=EST
      *     Translated:
      *     https://example.cloudfunctions.net/getUser?timezone=EST&cid=widgetworks&uid=johndoe
@@ -131,21 +127,15 @@ public enum PathTranslation implements com.google.protobuf.ProtocolMessageEnum {
      *
      * 
      * 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
@@ -169,21 +159,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&uid=johndoe
-     *
      *     Request path: /api/company/widgetworks/user/johndoe?timezone=EST
      *     Translated:
      *     https://example.cloudfunctions.net/getUser?timezone=EST&cid=widgetworks&uid=johndoe
@@ -198,21 +182,15 @@ public enum PathTranslation implements com.google.protobuf.ProtocolMessageEnum {
      *
      * 
      * 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
@@ -308,8 +286,6 @@ private PathTranslation(int value) {
   }
 
   private int authenticationCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object authentication_;
 
   public enum AuthenticationCase
@@ -358,16 +334,13 @@ public AuthenticationCase getAuthenticationCase() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object selector_ = "";
+  private volatile java.lang.Object selector_;
 
   /**
    *
    *
    * 
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -394,7 +367,6 @@ public java.lang.String getSelector() {
    *
    * 
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -417,32 +389,25 @@ public com.google.protobuf.ByteString getSelectorBytes() {
   }
 
   public static final int ADDRESS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object address_ = "";
+  private volatile java.lang.Object address_;
 
   /**
    *
    *
    * 
    * 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.
    * 

@@ -469,23 +434,18 @@ public java.lang.String getAddress() {
    *
    * 
    * 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.
    * 

@@ -508,7 +468,7 @@ public com.google.protobuf.ByteString getAddressBytes() {
   }
 
   public static final int DEADLINE_FIELD_NUMBER = 3;
-  private double deadline_ = 0D;
+  private double deadline_;
 
   /**
    *
@@ -528,7 +488,7 @@ public double getDeadline() {
   }
 
   public static final int MIN_DEADLINE_FIELD_NUMBER = 4;
-  private double minDeadline_ = 0D;
+  private double minDeadline_;
 
   /**
    *
@@ -550,7 +510,7 @@ public double getMinDeadline() {
   }
 
   public static final int OPERATION_DEADLINE_FIELD_NUMBER = 5;
-  private double operationDeadline_ = 0D;
+  private double operationDeadline_;
 
   /**
    *
@@ -570,7 +530,7 @@ public double getOperationDeadline() {
   }
 
   public static final int PATH_TRANSLATION_FIELD_NUMBER = 6;
-  private int pathTranslation_ = 0;
+  private int pathTranslation_;
 
   /**
    * .google.api.BackendRule.PathTranslation path_translation = 6;
@@ -589,8 +549,9 @@ public int getPathTranslationValue() {
    */
   @java.lang.Override
   public com.google.api.BackendRule.PathTranslation getPathTranslation() {
+    @SuppressWarnings("deprecation")
     com.google.api.BackendRule.PathTranslation result =
-        com.google.api.BackendRule.PathTranslation.forNumber(pathTranslation_);
+        com.google.api.BackendRule.PathTranslation.valueOf(pathTranslation_);
     return result == null ? com.google.api.BackendRule.PathTranslation.UNRECOGNIZED : result;
   }
 
@@ -717,9 +678,7 @@ public boolean getDisableAuth() {
   }
 
   public static final int PROTOCOL_FIELD_NUMBER = 9;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object protocol_ = "";
+  private volatile java.lang.Object protocol_;
 
   /**
    *
@@ -727,22 +686,17 @@ public boolean getDisableAuth() {
    * 
    * 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.
@@ -771,22 +725,17 @@ public java.lang.String getProtocol() {
    * 
    * 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.
@@ -824,7 +773,6 @@ private static final class OverridesByRequestProtocolDefaultEntryHolder {
                     com.google.api.BackendRule.getDefaultInstance());
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField
       overridesByRequestProtocol_;
 
@@ -891,10 +839,8 @@ public boolean containsOverridesByRequestProtocol(java.lang.String key) {
    * map<string, .google.api.BackendRule> overrides_by_request_protocol = 10;
    */
   @java.lang.Override
-  public /* nullable */ com.google.api.BackendRule getOverridesByRequestProtocolOrDefault(
-      java.lang.String key,
-      /* nullable */
-      com.google.api.BackendRule defaultValue) {
+  public com.google.api.BackendRule getOverridesByRequestProtocolOrDefault(
+      java.lang.String key, com.google.api.BackendRule defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -1230,8 +1176,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 10:
           return internalGetOverridesByRequestProtocol();
@@ -1241,8 +1186,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 10:
           return internalGetMutableOverridesByRequestProtocol();
@@ -1269,14 +1213,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       selector_ = "";
+
       address_ = "";
+
       deadline_ = 0D;
+
       minDeadline_ = 0D;
+
       operationDeadline_ = 0D;
+
       pathTranslation_ = 0;
+
       protocol_ = "";
+
       internalGetMutableOverridesByRequestProtocol().clear();
       authenticationCase_ = 0;
       authentication_ = null;
@@ -1305,47 +1255,25 @@ public com.google.api.BackendRule build() {
     @java.lang.Override
     public com.google.api.BackendRule buildPartial() {
       com.google.api.BackendRule result = new com.google.api.BackendRule(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      buildPartialOneofs(result);
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.api.BackendRule result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.selector_ = selector_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.address_ = address_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.deadline_ = deadline_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.minDeadline_ = minDeadline_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.operationDeadline_ = operationDeadline_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.pathTranslation_ = pathTranslation_;
-      }
-      if (((from_bitField0_ & 0x00000100) != 0)) {
-        result.protocol_ = protocol_;
+      result.selector_ = selector_;
+      result.address_ = address_;
+      result.deadline_ = deadline_;
+      result.minDeadline_ = minDeadline_;
+      result.operationDeadline_ = operationDeadline_;
+      result.pathTranslation_ = pathTranslation_;
+      if (authenticationCase_ == 7) {
+        result.authentication_ = authentication_;
       }
-      if (((from_bitField0_ & 0x00000200) != 0)) {
-        result.overridesByRequestProtocol_ =
-            internalGetOverridesByRequestProtocol()
-                .build(OverridesByRequestProtocolDefaultEntryHolder.defaultEntry);
+      if (authenticationCase_ == 8) {
+        result.authentication_ = authentication_;
       }
-    }
-
-    private void buildPartialOneofs(com.google.api.BackendRule result) {
+      result.protocol_ = protocol_;
+      result.overridesByRequestProtocol_ = internalGetOverridesByRequestProtocol();
+      result.overridesByRequestProtocol_.makeImmutable();
       result.authenticationCase_ = authenticationCase_;
-      result.authentication_ = this.authentication_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1395,12 +1323,10 @@ public Builder mergeFrom(com.google.api.BackendRule other) {
       if (other == com.google.api.BackendRule.getDefaultInstance()) return this;
       if (!other.getSelector().isEmpty()) {
         selector_ = other.selector_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getAddress().isEmpty()) {
         address_ = other.address_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getDeadline() != 0D) {
@@ -1417,12 +1343,10 @@ public Builder mergeFrom(com.google.api.BackendRule other) {
       }
       if (!other.getProtocol().isEmpty()) {
         protocol_ = other.protocol_;
-        bitField0_ |= 0x00000100;
         onChanged();
       }
       internalGetMutableOverridesByRequestProtocol()
           .mergeFrom(other.internalGetOverridesByRequestProtocol());
-      bitField0_ |= 0x00000200;
       switch (other.getAuthenticationCase()) {
         case JWT_AUDIENCE:
           {
@@ -1470,37 +1394,37 @@ public Builder mergeFrom(
             case 10:
               {
                 selector_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 address_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 25:
               {
                 deadline_ = input.readDouble();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 25
             case 33:
               {
                 minDeadline_ = input.readDouble();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 33
             case 41:
               {
                 operationDeadline_ = input.readDouble();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 41
             case 48:
               {
                 pathTranslation_ = input.readEnum();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 48
             case 58:
@@ -1519,7 +1443,7 @@ public Builder mergeFrom(
             case 74:
               {
                 protocol_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000100;
+
                 break;
               } // case 74
             case 82:
@@ -1531,11 +1455,10 @@ public Builder mergeFrom(
                                 .getParserForType(),
                             extensionRegistry);
                 internalGetMutableOverridesByRequestProtocol()
-                    .ensureBuilderMap()
+                    .getMutableMap()
                     .put(
                         overridesByRequestProtocol__.getKey(),
                         overridesByRequestProtocol__.getValue());
-                bitField0_ |= 0x00000200;
                 break;
               } // case 82
             default:
@@ -1578,7 +1501,6 @@ public Builder clearAuthentication() {
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -1604,7 +1526,6 @@ public java.lang.String getSelector() {
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -1630,7 +1551,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -1644,8 +1564,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1655,7 +1575,6 @@ public Builder setSelector(java.lang.String value) {
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -1665,8 +1584,8 @@ public Builder setSelector(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSelector() {
+
       selector_ = getDefaultInstance().getSelector();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1676,7 +1595,6 @@ public Builder clearSelector() {
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -1691,8 +1609,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1704,23 +1622,18 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
      *
      * 
      * 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.
      * 

@@ -1746,23 +1659,18 @@ public java.lang.String getAddress() {
      *
      * 
      * 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.
      * 

@@ -1788,23 +1696,18 @@ public com.google.protobuf.ByteString getAddressBytes() {
      *
      * 
      * 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.
      * 

@@ -1818,8 +1721,8 @@ public Builder setAddress(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       address_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1829,23 +1732,18 @@ public Builder setAddress(java.lang.String value) {
      *
      * 
      * 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.
      * 

@@ -1855,8 +1753,8 @@ public Builder setAddress(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAddress() {
+
       address_ = getDefaultInstance().getAddress();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1866,23 +1764,18 @@ public Builder clearAddress() {
      *
      * 
      * 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.
      * 

@@ -1897,8 +1790,8 @@ public Builder setAddressBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       address_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1938,7 +1831,6 @@ public double getDeadline() {
     public Builder setDeadline(double value) {
 
       deadline_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1956,7 +1848,7 @@ public Builder setDeadline(double value) {
      * @return This builder for chaining.
      */
     public Builder clearDeadline() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       deadline_ = 0D;
       onChanged();
       return this;
@@ -2001,7 +1893,6 @@ public double getMinDeadline() {
     public Builder setMinDeadline(double value) {
 
       minDeadline_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2021,7 +1912,7 @@ public Builder setMinDeadline(double value) {
      */
     @java.lang.Deprecated
     public Builder clearMinDeadline() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       minDeadline_ = 0D;
       onChanged();
       return this;
@@ -2062,7 +1953,6 @@ public double getOperationDeadline() {
     public Builder setOperationDeadline(double value) {
 
       operationDeadline_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2080,7 +1970,7 @@ public Builder setOperationDeadline(double value) {
      * @return This builder for chaining.
      */
     public Builder clearOperationDeadline() {
-      bitField0_ = (bitField0_ & ~0x00000010);
+
       operationDeadline_ = 0D;
       onChanged();
       return this;
@@ -2105,8 +1995,8 @@ public int getPathTranslationValue() {
      * @return This builder for chaining.
      */
     public Builder setPathTranslationValue(int value) {
+
       pathTranslation_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2118,8 +2008,9 @@ public Builder setPathTranslationValue(int value) {
      */
     @java.lang.Override
     public com.google.api.BackendRule.PathTranslation getPathTranslation() {
+      @SuppressWarnings("deprecation")
       com.google.api.BackendRule.PathTranslation result =
-          com.google.api.BackendRule.PathTranslation.forNumber(pathTranslation_);
+          com.google.api.BackendRule.PathTranslation.valueOf(pathTranslation_);
       return result == null ? com.google.api.BackendRule.PathTranslation.UNRECOGNIZED : result;
     }
 
@@ -2133,7 +2024,7 @@ public Builder setPathTranslation(com.google.api.BackendRule.PathTranslation val
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000020;
+
       pathTranslation_ = value.getNumber();
       onChanged();
       return this;
@@ -2145,7 +2036,7 @@ public Builder setPathTranslation(com.google.api.BackendRule.PathTranslation val
      * @return This builder for chaining.
      */
     public Builder clearPathTranslation() {
-      bitField0_ = (bitField0_ & ~0x00000020);
+
       pathTranslation_ = 0;
       onChanged();
       return this;
@@ -2357,7 +2248,6 @@ public boolean getDisableAuth() {
      * @return This builder for chaining.
      */
     public Builder setDisableAuth(boolean value) {
-
       authenticationCase_ = 8;
       authentication_ = value;
       onChanged();
@@ -2395,22 +2285,17 @@ public Builder clearDisableAuth() {
      * 
      * 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.
@@ -2438,22 +2323,17 @@ public java.lang.String getProtocol() {
      * 
      * 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.
@@ -2481,22 +2361,17 @@ public com.google.protobuf.ByteString getProtocolBytes() {
      * 
      * 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.
@@ -2511,8 +2386,8 @@ public Builder setProtocol(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       protocol_ = value;
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -2523,22 +2398,17 @@ public Builder setProtocol(java.lang.String value) {
      * 
      * 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.
@@ -2549,8 +2419,8 @@ public Builder setProtocol(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProtocol() {
+
       protocol_ = getDefaultInstance().getProtocol();
-      bitField0_ = (bitField0_ & ~0x00000100);
       onChanged();
       return this;
     }
@@ -2561,22 +2431,17 @@ public Builder clearProtocol() {
      * 
      * 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.
@@ -2592,70 +2457,41 @@ public Builder setProtocolBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       protocol_ = value;
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
 
-    private static final class OverridesByRequestProtocolConverter
-        implements com.google.protobuf.MapFieldBuilder.Converter<
-            java.lang.String, com.google.api.BackendRuleOrBuilder, com.google.api.BackendRule> {
-      @java.lang.Override
-      public com.google.api.BackendRule build(com.google.api.BackendRuleOrBuilder val) {
-        if (val instanceof com.google.api.BackendRule) {
-          return (com.google.api.BackendRule) val;
-        }
-        return ((com.google.api.BackendRule.Builder) val).build();
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.MapEntry
-          defaultEntry() {
-        return OverridesByRequestProtocolDefaultEntryHolder.defaultEntry;
-      }
-    }
-    ;
-
-    private static final OverridesByRequestProtocolConverter overridesByRequestProtocolConverter =
-        new OverridesByRequestProtocolConverter();
-
-    private com.google.protobuf.MapFieldBuilder<
-            java.lang.String,
-            com.google.api.BackendRuleOrBuilder,
-            com.google.api.BackendRule,
-            com.google.api.BackendRule.Builder>
+    private com.google.protobuf.MapField
         overridesByRequestProtocol_;
 
-    private com.google.protobuf.MapFieldBuilder<
-            java.lang.String,
-            com.google.api.BackendRuleOrBuilder,
-            com.google.api.BackendRule,
-            com.google.api.BackendRule.Builder>
+    private com.google.protobuf.MapField
         internalGetOverridesByRequestProtocol() {
       if (overridesByRequestProtocol_ == null) {
-        return new com.google.protobuf.MapFieldBuilder<>(overridesByRequestProtocolConverter);
+        return com.google.protobuf.MapField.emptyMapField(
+            OverridesByRequestProtocolDefaultEntryHolder.defaultEntry);
       }
       return overridesByRequestProtocol_;
     }
 
-    private com.google.protobuf.MapFieldBuilder<
-            java.lang.String,
-            com.google.api.BackendRuleOrBuilder,
-            com.google.api.BackendRule,
-            com.google.api.BackendRule.Builder>
+    private com.google.protobuf.MapField
         internalGetMutableOverridesByRequestProtocol() {
+      onChanged();
+      ;
       if (overridesByRequestProtocol_ == null) {
         overridesByRequestProtocol_ =
-            new com.google.protobuf.MapFieldBuilder<>(overridesByRequestProtocolConverter);
+            com.google.protobuf.MapField.newMapField(
+                OverridesByRequestProtocolDefaultEntryHolder.defaultEntry);
+      }
+      if (!overridesByRequestProtocol_.isMutable()) {
+        overridesByRequestProtocol_ = overridesByRequestProtocol_.copy();
       }
-      bitField0_ |= 0x00000200;
-      onChanged();
       return overridesByRequestProtocol_;
     }
 
     public int getOverridesByRequestProtocolCount() {
-      return internalGetOverridesByRequestProtocol().ensureBuilderMap().size();
+      return internalGetOverridesByRequestProtocol().getMap().size();
     }
 
     /**
@@ -2672,7 +2508,7 @@ public boolean containsOverridesByRequestProtocol(java.lang.String key) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      return internalGetOverridesByRequestProtocol().ensureBuilderMap().containsKey(key);
+      return internalGetOverridesByRequestProtocol().getMap().containsKey(key);
     }
 
     /** Use {@link #getOverridesByRequestProtocolMap()} instead. */
@@ -2695,7 +2531,7 @@ public boolean containsOverridesByRequestProtocol(java.lang.String key) {
     @java.lang.Override
     public java.util.Map
         getOverridesByRequestProtocolMap() {
-      return internalGetOverridesByRequestProtocol().getImmutableMap();
+      return internalGetOverridesByRequestProtocol().getMap();
     }
 
     /**
@@ -2708,18 +2544,14 @@ public boolean containsOverridesByRequestProtocol(java.lang.String key) {
      * map<string, .google.api.BackendRule> overrides_by_request_protocol = 10;
      */
     @java.lang.Override
-    public /* nullable */ com.google.api.BackendRule getOverridesByRequestProtocolOrDefault(
-        java.lang.String key,
-        /* nullable */
-        com.google.api.BackendRule defaultValue) {
+    public com.google.api.BackendRule getOverridesByRequestProtocolOrDefault(
+        java.lang.String key, com.google.api.BackendRule defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      java.util.Map map =
-          internalGetMutableOverridesByRequestProtocol().ensureBuilderMap();
-      return map.containsKey(key)
-          ? overridesByRequestProtocolConverter.build(map.get(key))
-          : defaultValue;
+      java.util.Map map =
+          internalGetOverridesByRequestProtocol().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
     }
 
     /**
@@ -2736,17 +2568,16 @@ public com.google.api.BackendRule getOverridesByRequestProtocolOrThrow(java.lang
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      java.util.Map map =
-          internalGetMutableOverridesByRequestProtocol().ensureBuilderMap();
+      java.util.Map map =
+          internalGetOverridesByRequestProtocol().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
-      return overridesByRequestProtocolConverter.build(map.get(key));
+      return map.get(key);
     }
 
     public Builder clearOverridesByRequestProtocol() {
-      bitField0_ = (bitField0_ & ~0x00000200);
-      internalGetMutableOverridesByRequestProtocol().clear();
+      internalGetMutableOverridesByRequestProtocol().getMutableMap().clear();
       return this;
     }
 
@@ -2763,7 +2594,7 @@ public Builder removeOverridesByRequestProtocol(java.lang.String key) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      internalGetMutableOverridesByRequestProtocol().ensureBuilderMap().remove(key);
+      internalGetMutableOverridesByRequestProtocol().getMutableMap().remove(key);
       return this;
     }
 
@@ -2771,8 +2602,7 @@ public Builder removeOverridesByRequestProtocol(java.lang.String key) {
     @java.lang.Deprecated
     public java.util.Map
         getMutableOverridesByRequestProtocol() {
-      bitField0_ |= 0x00000200;
-      return internalGetMutableOverridesByRequestProtocol().ensureMessageMap();
+      return internalGetMutableOverridesByRequestProtocol().getMutableMap();
     }
 
     /**
@@ -2792,8 +2622,8 @@ public Builder putOverridesByRequestProtocol(
       if (value == null) {
         throw new NullPointerException("map value");
       }
-      internalGetMutableOverridesByRequestProtocol().ensureBuilderMap().put(key, value);
-      bitField0_ |= 0x00000200;
+
+      internalGetMutableOverridesByRequestProtocol().getMutableMap().put(key, value);
       return this;
     }
 
@@ -2808,42 +2638,10 @@ public Builder putOverridesByRequestProtocol(
      */
     public Builder putAllOverridesByRequestProtocol(
         java.util.Map values) {
-      for (java.util.Map.Entry e :
-          values.entrySet()) {
-        if (e.getKey() == null || e.getValue() == null) {
-          throw new NullPointerException();
-        }
-      }
-      internalGetMutableOverridesByRequestProtocol().ensureBuilderMap().putAll(values);
-      bitField0_ |= 0x00000200;
+      internalGetMutableOverridesByRequestProtocol().getMutableMap().putAll(values);
       return this;
     }
 
-    /**
-     *
-     *
-     * 
-     * The map between request protocol and the backend address.
-     * 

-     *
-     * map<string, .google.api.BackendRule> overrides_by_request_protocol = 10;
-     */
-    public com.google.api.BackendRule.Builder putOverridesByRequestProtocolBuilderIfAbsent(
-        java.lang.String key) {
-      java.util.Map builderMap =
-          internalGetMutableOverridesByRequestProtocol().ensureBuilderMap();
-      com.google.api.BackendRuleOrBuilder entry = builderMap.get(key);
-      if (entry == null) {
-        entry = com.google.api.BackendRule.newBuilder();
-        builderMap.put(key, entry);
-      }
-      if (entry instanceof com.google.api.BackendRule) {
-        entry = ((com.google.api.BackendRule) entry).toBuilder();
-        builderMap.put(key, entry);
-      }
-      return (com.google.api.BackendRule.Builder) entry;
-    }
-
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
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 66e62348b4..ffe24818fd 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/backend.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface BackendRuleOrBuilder
@@ -29,7 +28,6 @@ public interface BackendRuleOrBuilder
    *
    * 
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -45,7 +43,6 @@ public interface BackendRuleOrBuilder
    *
    * 
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -61,23 +58,18 @@ public interface BackendRuleOrBuilder
    *
    * 
    * 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.
    * 

@@ -93,23 +85,18 @@ public interface BackendRuleOrBuilder
    *
    * 
    * 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.
    * 

@@ -261,22 +248,17 @@ public interface BackendRuleOrBuilder
    * 
    * 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.
@@ -294,22 +276,17 @@ public interface BackendRuleOrBuilder
    * 
    * 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.
@@ -367,6 +344,7 @@ public interface BackendRuleOrBuilder
    *
    * map<string, .google.api.BackendRule> overrides_by_request_protocol = 10;
    */
+
   /* nullable */
   com.google.api.BackendRule getOverridesByRequestProtocolOrDefault(
       java.lang.String key,
@@ -384,5 +362,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 235d18d406..8fcf26f837 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/billing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -24,15 +23,12 @@
  *
  * 
  * 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:
@@ -80,6 +76,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;
   }
@@ -213,7 +214,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
@@ -222,6 +223,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;
@@ -238,9 +244,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int MONITORED_RESOURCE_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object monitoredResource_ = "";
+    private volatile java.lang.Object monitoredResource_;
 
     /**
      *
@@ -295,10 +299,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_;
 
     /**
      *
@@ -587,9 +588,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         monitoredResource_ = "";
-        metrics_ = com.google.protobuf.LazyStringArrayList.emptyList();
+
+        metrics_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -617,24 +619,17 @@ 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);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        int from_bitField0_ = bitField0_;
+        result.monitoredResource_ = monitoredResource_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          metrics_ = metrics_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
+        result.metrics_ = metrics_;
         onBuilt();
         return result;
       }
 
-      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();
@@ -684,13 +679,12 @@ public Builder mergeFrom(com.google.api.Billing.BillingDestination other) {
         if (other == com.google.api.Billing.BillingDestination.getDefaultInstance()) return this;
         if (!other.getMonitoredResource().isEmpty()) {
           monitoredResource_ = other.monitoredResource_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.metrics_.isEmpty()) {
           if (metrics_.isEmpty()) {
             metrics_ = other.metrics_;
-            bitField0_ |= 0x00000002;
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureMetricsIsMutable();
             metrics_.addAll(other.metrics_);
@@ -726,7 +720,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   monitoredResource_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
@@ -825,8 +819,8 @@ public Builder setMonitoredResource(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         monitoredResource_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -845,8 +839,8 @@ public Builder setMonitoredResource(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearMonitoredResource() {
+
         monitoredResource_ = getDefaultInstance().getMonitoredResource();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -870,20 +864,20 @@ public Builder setMonitoredResourceBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         monitoredResource_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         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_ & 0x00000001) != 0)) {
           metrics_ = new com.google.protobuf.LazyStringArrayList(metrics_);
+          bitField0_ |= 0x00000001;
         }
-        bitField0_ |= 0x00000002;
       }
 
       /**
@@ -900,8 +894,7 @@ private void ensureMetricsIsMutable() {
        * @return A list containing the metrics.
        */
       public com.google.protobuf.ProtocolStringList getMetricsList() {
-        metrics_.makeImmutable();
-        return metrics_;
+        return metrics_.getUnmodifiableView();
       }
 
       /**
@@ -978,7 +971,6 @@ public Builder setMetrics(int index, java.lang.String value) {
         }
         ensureMetricsIsMutable();
         metrics_.set(index, value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1003,7 +995,6 @@ public Builder addMetrics(java.lang.String value) {
         }
         ensureMetricsIsMutable();
         metrics_.add(value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1025,7 +1016,6 @@ public Builder addMetrics(java.lang.String value) {
       public Builder addAllMetrics(java.lang.Iterable values) {
         ensureMetricsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, metrics_);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1044,9 +1034,8 @@ public Builder addAllMetrics(java.lang.Iterable values) {
        * @return This builder for chaining.
        */
       public Builder clearMetrics() {
-        metrics_ = com.google.protobuf.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        ;
+        metrics_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1072,7 +1061,6 @@ public Builder addMetricsBytes(com.google.protobuf.ByteString value) {
         checkByteStringIsUtf8(value);
         ensureMetricsIsMutable();
         metrics_.add(value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1142,8 +1130,6 @@ public com.google.api.Billing.BillingDestination getDefaultInstanceForType() {
   }
 
   public static final int CONSUMER_DESTINATIONS_FIELD_NUMBER = 8;
-
-  @SuppressWarnings("serial")
   private java.util.List consumerDestinations_;
 
   /**
@@ -1399,15 +1385,12 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * 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:
@@ -1460,7 +1443,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (consumerDestinationsBuilder_ == null) {
         consumerDestinations_ = java.util.Collections.emptyList();
       } else {
@@ -1493,15 +1475,7 @@ public com.google.api.Billing build() {
     @java.lang.Override
     public com.google.api.Billing buildPartial() {
       com.google.api.Billing result = new com.google.api.Billing(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.Billing result) {
+      int from_bitField0_ = bitField0_;
       if (consumerDestinationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           consumerDestinations_ = java.util.Collections.unmodifiableList(consumerDestinations_);
@@ -1511,10 +1485,8 @@ private void buildPartialRepeatedFields(com.google.api.Billing result) {
       } else {
         result.consumerDestinations_ = consumerDestinationsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.Billing result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BillingOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BillingOrBuilder.java
index bd565fe52a..48e45d60be 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BillingOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BillingOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/billing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface BillingOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BillingProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BillingProto.java
index fcaad2f6b7..c076d5af94 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BillingProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BillingProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/billing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class BillingProto {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ChangeType.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ChangeType.java
index 3d9a170b28..88f336aef6 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ChangeType.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ChangeType.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/config_change.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibraryDestination.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibraryDestination.java
index 2633473bb2..767bd0c5bc 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibraryDestination.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibraryDestination.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibraryOrganization.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibraryOrganization.java
index 00ee8b7807..8f81c3f265 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibraryOrganization.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibraryOrganization.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
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 0f75572aee..05fc6bffe1 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -50,6 +49,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;
   }
@@ -64,11 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.api.ClientLibrarySettings.Builder.class);
   }
 
-  private int bitField0_;
   public static final int VERSION_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object version_ = "";
+  private volatile java.lang.Object version_;
 
   /**
    *
@@ -123,7 +124,7 @@ public com.google.protobuf.ByteString getVersionBytes() {
   }
 
   public static final int LAUNCH_STAGE_FIELD_NUMBER = 2;
-  private int launchStage_ = 0;
+  private int launchStage_;
 
   /**
    *
@@ -154,12 +155,13 @@ public int getLaunchStageValue() {
    */
   @java.lang.Override
   public com.google.api.LaunchStage getLaunchStage() {
-    com.google.api.LaunchStage result = com.google.api.LaunchStage.forNumber(launchStage_);
+    @SuppressWarnings("deprecation")
+    com.google.api.LaunchStage result = com.google.api.LaunchStage.valueOf(launchStage_);
     return result == null ? com.google.api.LaunchStage.UNRECOGNIZED : result;
   }
 
   public static final int REST_NUMERIC_ENUMS_FIELD_NUMBER = 3;
-  private boolean restNumericEnums_ = false;
+  private boolean restNumericEnums_;
 
   /**
    *
@@ -194,7 +196,7 @@ public boolean getRestNumericEnums() {
    */
   @java.lang.Override
   public boolean hasJavaSettings() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return javaSettings_ != null;
   }
 
   /**
@@ -224,7 +226,7 @@ public com.google.api.JavaSettings getJavaSettings() {
    */
   @java.lang.Override
   public com.google.api.JavaSettingsOrBuilder getJavaSettingsOrBuilder() {
-    return javaSettings_ == null ? com.google.api.JavaSettings.getDefaultInstance() : javaSettings_;
+    return getJavaSettings();
   }
 
   public static final int CPP_SETTINGS_FIELD_NUMBER = 22;
@@ -243,7 +245,7 @@ public com.google.api.JavaSettingsOrBuilder getJavaSettingsOrBuilder() {
    */
   @java.lang.Override
   public boolean hasCppSettings() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return cppSettings_ != null;
   }
 
   /**
@@ -273,7 +275,7 @@ public com.google.api.CppSettings getCppSettings() {
    */
   @java.lang.Override
   public com.google.api.CppSettingsOrBuilder getCppSettingsOrBuilder() {
-    return cppSettings_ == null ? com.google.api.CppSettings.getDefaultInstance() : cppSettings_;
+    return getCppSettings();
   }
 
   public static final int PHP_SETTINGS_FIELD_NUMBER = 23;
@@ -292,7 +294,7 @@ public com.google.api.CppSettingsOrBuilder getCppSettingsOrBuilder() {
    */
   @java.lang.Override
   public boolean hasPhpSettings() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return phpSettings_ != null;
   }
 
   /**
@@ -322,7 +324,7 @@ public com.google.api.PhpSettings getPhpSettings() {
    */
   @java.lang.Override
   public com.google.api.PhpSettingsOrBuilder getPhpSettingsOrBuilder() {
-    return phpSettings_ == null ? com.google.api.PhpSettings.getDefaultInstance() : phpSettings_;
+    return getPhpSettings();
   }
 
   public static final int PYTHON_SETTINGS_FIELD_NUMBER = 24;
@@ -341,7 +343,7 @@ public com.google.api.PhpSettingsOrBuilder getPhpSettingsOrBuilder() {
    */
   @java.lang.Override
   public boolean hasPythonSettings() {
-    return ((bitField0_ & 0x00000008) != 0);
+    return pythonSettings_ != null;
   }
 
   /**
@@ -373,9 +375,7 @@ public com.google.api.PythonSettings getPythonSettings() {
    */
   @java.lang.Override
   public com.google.api.PythonSettingsOrBuilder getPythonSettingsOrBuilder() {
-    return pythonSettings_ == null
-        ? com.google.api.PythonSettings.getDefaultInstance()
-        : pythonSettings_;
+    return getPythonSettings();
   }
 
   public static final int NODE_SETTINGS_FIELD_NUMBER = 25;
@@ -394,7 +394,7 @@ public com.google.api.PythonSettingsOrBuilder getPythonSettingsOrBuilder() {
    */
   @java.lang.Override
   public boolean hasNodeSettings() {
-    return ((bitField0_ & 0x00000010) != 0);
+    return nodeSettings_ != null;
   }
 
   /**
@@ -424,7 +424,7 @@ public com.google.api.NodeSettings getNodeSettings() {
    */
   @java.lang.Override
   public com.google.api.NodeSettingsOrBuilder getNodeSettingsOrBuilder() {
-    return nodeSettings_ == null ? com.google.api.NodeSettings.getDefaultInstance() : nodeSettings_;
+    return getNodeSettings();
   }
 
   public static final int DOTNET_SETTINGS_FIELD_NUMBER = 26;
@@ -443,7 +443,7 @@ public com.google.api.NodeSettingsOrBuilder getNodeSettingsOrBuilder() {
    */
   @java.lang.Override
   public boolean hasDotnetSettings() {
-    return ((bitField0_ & 0x00000020) != 0);
+    return dotnetSettings_ != null;
   }
 
   /**
@@ -475,9 +475,7 @@ public com.google.api.DotnetSettings getDotnetSettings() {
    */
   @java.lang.Override
   public com.google.api.DotnetSettingsOrBuilder getDotnetSettingsOrBuilder() {
-    return dotnetSettings_ == null
-        ? com.google.api.DotnetSettings.getDefaultInstance()
-        : dotnetSettings_;
+    return getDotnetSettings();
   }
 
   public static final int RUBY_SETTINGS_FIELD_NUMBER = 27;
@@ -496,7 +494,7 @@ public com.google.api.DotnetSettingsOrBuilder getDotnetSettingsOrBuilder() {
    */
   @java.lang.Override
   public boolean hasRubySettings() {
-    return ((bitField0_ & 0x00000040) != 0);
+    return rubySettings_ != null;
   }
 
   /**
@@ -526,7 +524,7 @@ public com.google.api.RubySettings getRubySettings() {
    */
   @java.lang.Override
   public com.google.api.RubySettingsOrBuilder getRubySettingsOrBuilder() {
-    return rubySettings_ == null ? com.google.api.RubySettings.getDefaultInstance() : rubySettings_;
+    return getRubySettings();
   }
 
   public static final int GO_SETTINGS_FIELD_NUMBER = 28;
@@ -545,7 +543,7 @@ public com.google.api.RubySettingsOrBuilder getRubySettingsOrBuilder() {
    */
   @java.lang.Override
   public boolean hasGoSettings() {
-    return ((bitField0_ & 0x00000080) != 0);
+    return goSettings_ != null;
   }
 
   /**
@@ -575,7 +573,7 @@ public com.google.api.GoSettings getGoSettings() {
    */
   @java.lang.Override
   public com.google.api.GoSettingsOrBuilder getGoSettingsOrBuilder() {
-    return goSettings_ == null ? com.google.api.GoSettings.getDefaultInstance() : goSettings_;
+    return getGoSettings();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -601,28 +599,28 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (restNumericEnums_ != false) {
       output.writeBool(3, restNumericEnums_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (javaSettings_ != null) {
       output.writeMessage(21, getJavaSettings());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (cppSettings_ != null) {
       output.writeMessage(22, getCppSettings());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (phpSettings_ != null) {
       output.writeMessage(23, getPhpSettings());
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (pythonSettings_ != null) {
       output.writeMessage(24, getPythonSettings());
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (nodeSettings_ != null) {
       output.writeMessage(25, getNodeSettings());
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (dotnetSettings_ != null) {
       output.writeMessage(26, getDotnetSettings());
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
+    if (rubySettings_ != null) {
       output.writeMessage(27, getRubySettings());
     }
-    if (((bitField0_ & 0x00000080) != 0)) {
+    if (goSettings_ != null) {
       output.writeMessage(28, getGoSettings());
     }
     getUnknownFields().writeTo(output);
@@ -643,28 +641,28 @@ public int getSerializedSize() {
     if (restNumericEnums_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(3, restNumericEnums_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (javaSettings_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(21, getJavaSettings());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (cppSettings_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(22, getCppSettings());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (phpSettings_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(23, getPhpSettings());
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (pythonSettings_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(24, getPythonSettings());
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (nodeSettings_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(25, getNodeSettings());
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (dotnetSettings_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(26, getDotnetSettings());
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
+    if (rubySettings_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(27, getRubySettings());
     }
-    if (((bitField0_ & 0x00000080) != 0)) {
+    if (goSettings_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(28, getGoSettings());
     }
     size += getUnknownFields().getSerializedSize();
@@ -894,73 +892,67 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.ClientLibrarySettings.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getJavaSettingsFieldBuilder();
-        getCppSettingsFieldBuilder();
-        getPhpSettingsFieldBuilder();
-        getPythonSettingsFieldBuilder();
-        getNodeSettingsFieldBuilder();
-        getDotnetSettingsFieldBuilder();
-        getRubySettingsFieldBuilder();
-        getGoSettingsFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       version_ = "";
+
       launchStage_ = 0;
+
       restNumericEnums_ = false;
-      javaSettings_ = null;
-      if (javaSettingsBuilder_ != null) {
-        javaSettingsBuilder_.dispose();
+
+      if (javaSettingsBuilder_ == null) {
+        javaSettings_ = null;
+      } else {
+        javaSettings_ = null;
         javaSettingsBuilder_ = null;
       }
-      cppSettings_ = null;
-      if (cppSettingsBuilder_ != null) {
-        cppSettingsBuilder_.dispose();
+      if (cppSettingsBuilder_ == null) {
+        cppSettings_ = null;
+      } else {
+        cppSettings_ = null;
         cppSettingsBuilder_ = null;
       }
-      phpSettings_ = null;
-      if (phpSettingsBuilder_ != null) {
-        phpSettingsBuilder_.dispose();
+      if (phpSettingsBuilder_ == null) {
+        phpSettings_ = null;
+      } else {
+        phpSettings_ = null;
         phpSettingsBuilder_ = null;
       }
-      pythonSettings_ = null;
-      if (pythonSettingsBuilder_ != null) {
-        pythonSettingsBuilder_.dispose();
+      if (pythonSettingsBuilder_ == null) {
+        pythonSettings_ = null;
+      } else {
+        pythonSettings_ = null;
         pythonSettingsBuilder_ = null;
       }
-      nodeSettings_ = null;
-      if (nodeSettingsBuilder_ != null) {
-        nodeSettingsBuilder_.dispose();
+      if (nodeSettingsBuilder_ == null) {
+        nodeSettings_ = null;
+      } else {
+        nodeSettings_ = null;
         nodeSettingsBuilder_ = null;
       }
-      dotnetSettings_ = null;
-      if (dotnetSettingsBuilder_ != null) {
-        dotnetSettingsBuilder_.dispose();
+      if (dotnetSettingsBuilder_ == null) {
+        dotnetSettings_ = null;
+      } else {
+        dotnetSettings_ = null;
         dotnetSettingsBuilder_ = null;
       }
-      rubySettings_ = null;
-      if (rubySettingsBuilder_ != null) {
-        rubySettingsBuilder_.dispose();
+      if (rubySettingsBuilder_ == null) {
+        rubySettings_ = null;
+      } else {
+        rubySettings_ = null;
         rubySettingsBuilder_ = null;
       }
-      goSettings_ = null;
-      if (goSettingsBuilder_ != null) {
-        goSettingsBuilder_.dispose();
+      if (goSettingsBuilder_ == null) {
+        goSettings_ = null;
+      } else {
+        goSettings_ = null;
         goSettingsBuilder_ = null;
       }
       return this;
@@ -988,65 +980,51 @@ public com.google.api.ClientLibrarySettings build() {
     @java.lang.Override
     public com.google.api.ClientLibrarySettings buildPartial() {
       com.google.api.ClientLibrarySettings result = new com.google.api.ClientLibrarySettings(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.api.ClientLibrarySettings result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.version_ = version_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.launchStage_ = launchStage_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.restNumericEnums_ = restNumericEnums_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.javaSettings_ =
-            javaSettingsBuilder_ == null ? javaSettings_ : javaSettingsBuilder_.build();
-        to_bitField0_ |= 0x00000001;
+      result.version_ = version_;
+      result.launchStage_ = launchStage_;
+      result.restNumericEnums_ = restNumericEnums_;
+      if (javaSettingsBuilder_ == null) {
+        result.javaSettings_ = javaSettings_;
+      } else {
+        result.javaSettings_ = javaSettingsBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.cppSettings_ =
-            cppSettingsBuilder_ == null ? cppSettings_ : cppSettingsBuilder_.build();
-        to_bitField0_ |= 0x00000002;
+      if (cppSettingsBuilder_ == null) {
+        result.cppSettings_ = cppSettings_;
+      } else {
+        result.cppSettings_ = cppSettingsBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.phpSettings_ =
-            phpSettingsBuilder_ == null ? phpSettings_ : phpSettingsBuilder_.build();
-        to_bitField0_ |= 0x00000004;
+      if (phpSettingsBuilder_ == null) {
+        result.phpSettings_ = phpSettings_;
+      } else {
+        result.phpSettings_ = phpSettingsBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.pythonSettings_ =
-            pythonSettingsBuilder_ == null ? pythonSettings_ : pythonSettingsBuilder_.build();
-        to_bitField0_ |= 0x00000008;
+      if (pythonSettingsBuilder_ == null) {
+        result.pythonSettings_ = pythonSettings_;
+      } else {
+        result.pythonSettings_ = pythonSettingsBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.nodeSettings_ =
-            nodeSettingsBuilder_ == null ? nodeSettings_ : nodeSettingsBuilder_.build();
-        to_bitField0_ |= 0x00000010;
+      if (nodeSettingsBuilder_ == null) {
+        result.nodeSettings_ = nodeSettings_;
+      } else {
+        result.nodeSettings_ = nodeSettingsBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000100) != 0)) {
-        result.dotnetSettings_ =
-            dotnetSettingsBuilder_ == null ? dotnetSettings_ : dotnetSettingsBuilder_.build();
-        to_bitField0_ |= 0x00000020;
+      if (dotnetSettingsBuilder_ == null) {
+        result.dotnetSettings_ = dotnetSettings_;
+      } else {
+        result.dotnetSettings_ = dotnetSettingsBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000200) != 0)) {
-        result.rubySettings_ =
-            rubySettingsBuilder_ == null ? rubySettings_ : rubySettingsBuilder_.build();
-        to_bitField0_ |= 0x00000040;
+      if (rubySettingsBuilder_ == null) {
+        result.rubySettings_ = rubySettings_;
+      } else {
+        result.rubySettings_ = rubySettingsBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000400) != 0)) {
-        result.goSettings_ = goSettingsBuilder_ == null ? goSettings_ : goSettingsBuilder_.build();
-        to_bitField0_ |= 0x00000080;
+      if (goSettingsBuilder_ == null) {
+        result.goSettings_ = goSettings_;
+      } else {
+        result.goSettings_ = goSettingsBuilder_.build();
       }
-      result.bitField0_ |= to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1096,7 +1074,6 @@ public Builder mergeFrom(com.google.api.ClientLibrarySettings other) {
       if (other == com.google.api.ClientLibrarySettings.getDefaultInstance()) return this;
       if (!other.getVersion().isEmpty()) {
         version_ = other.version_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.launchStage_ != 0) {
@@ -1158,67 +1135,67 @@ public Builder mergeFrom(
             case 10:
               {
                 version_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 launchStage_ = input.readEnum();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 24:
               {
                 restNumericEnums_ = input.readBool();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 170:
               {
                 input.readMessage(getJavaSettingsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 170
             case 178:
               {
                 input.readMessage(getCppSettingsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 178
             case 186:
               {
                 input.readMessage(getPhpSettingsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 186
             case 194:
               {
                 input.readMessage(getPythonSettingsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 194
             case 202:
               {
                 input.readMessage(getNodeSettingsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 202
             case 210:
               {
                 input.readMessage(getDotnetSettingsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000100;
+
                 break;
               } // case 210
             case 218:
               {
                 input.readMessage(getRubySettingsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000200;
+
                 break;
               } // case 218
             case 226:
               {
                 input.readMessage(getGoSettingsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000400;
+
                 break;
               } // case 226
             default:
@@ -1238,8 +1215,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object version_ = "";
 
     /**
@@ -1310,8 +1285,8 @@ public Builder setVersion(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       version_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1330,8 +1305,8 @@ public Builder setVersion(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearVersion() {
+
       version_ = getDefaultInstance().getVersion();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1355,8 +1330,8 @@ public Builder setVersionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       version_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1392,8 +1367,8 @@ public int getLaunchStageValue() {
      * @return This builder for chaining.
      */
     public Builder setLaunchStageValue(int value) {
+
       launchStage_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1411,7 +1386,8 @@ public Builder setLaunchStageValue(int value) {
      */
     @java.lang.Override
     public com.google.api.LaunchStage getLaunchStage() {
-      com.google.api.LaunchStage result = com.google.api.LaunchStage.forNumber(launchStage_);
+      @SuppressWarnings("deprecation")
+      com.google.api.LaunchStage result = com.google.api.LaunchStage.valueOf(launchStage_);
       return result == null ? com.google.api.LaunchStage.UNRECOGNIZED : result;
     }
 
@@ -1431,7 +1407,7 @@ public Builder setLaunchStage(com.google.api.LaunchStage value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000002;
+
       launchStage_ = value.getNumber();
       onChanged();
       return this;
@@ -1449,7 +1425,7 @@ public Builder setLaunchStage(com.google.api.LaunchStage value) {
      * @return This builder for chaining.
      */
     public Builder clearLaunchStage() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       launchStage_ = 0;
       onChanged();
       return this;
@@ -1490,7 +1466,6 @@ public boolean getRestNumericEnums() {
     public Builder setRestNumericEnums(boolean value) {
 
       restNumericEnums_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1508,7 +1483,7 @@ public Builder setRestNumericEnums(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearRestNumericEnums() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       restNumericEnums_ = false;
       onChanged();
       return this;
@@ -1533,7 +1508,7 @@ public Builder clearRestNumericEnums() {
      * @return Whether the javaSettings field is set.
      */
     public boolean hasJavaSettings() {
-      return ((bitField0_ & 0x00000008) != 0);
+      return javaSettingsBuilder_ != null || javaSettings_ != null;
     }
 
     /**
@@ -1572,11 +1547,11 @@ public Builder setJavaSettings(com.google.api.JavaSettings value) {
           throw new NullPointerException();
         }
         javaSettings_ = value;
+        onChanged();
       } else {
         javaSettingsBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -1592,11 +1567,11 @@ public Builder setJavaSettings(com.google.api.JavaSettings value) {
     public Builder setJavaSettings(com.google.api.JavaSettings.Builder builderForValue) {
       if (javaSettingsBuilder_ == null) {
         javaSettings_ = builderForValue.build();
+        onChanged();
       } else {
         javaSettingsBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -1611,20 +1586,17 @@ public Builder setJavaSettings(com.google.api.JavaSettings.Builder builderForVal
      */
     public Builder mergeJavaSettings(com.google.api.JavaSettings value) {
       if (javaSettingsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)
-            && javaSettings_ != null
-            && javaSettings_ != com.google.api.JavaSettings.getDefaultInstance()) {
-          getJavaSettingsBuilder().mergeFrom(value);
+        if (javaSettings_ != null) {
+          javaSettings_ =
+              com.google.api.JavaSettings.newBuilder(javaSettings_).mergeFrom(value).buildPartial();
         } else {
           javaSettings_ = value;
         }
+        onChanged();
       } else {
         javaSettingsBuilder_.mergeFrom(value);
       }
-      if (javaSettings_ != null) {
-        bitField0_ |= 0x00000008;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1638,13 +1610,14 @@ public Builder mergeJavaSettings(com.google.api.JavaSettings value) {
      * .google.api.JavaSettings java_settings = 21;
      */
     public Builder clearJavaSettings() {
-      bitField0_ = (bitField0_ & ~0x00000008);
-      javaSettings_ = null;
-      if (javaSettingsBuilder_ != null) {
-        javaSettingsBuilder_.dispose();
+      if (javaSettingsBuilder_ == null) {
+        javaSettings_ = null;
+        onChanged();
+      } else {
+        javaSettings_ = null;
         javaSettingsBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1658,7 +1631,7 @@ public Builder clearJavaSettings() {
      * .google.api.JavaSettings java_settings = 21;
      */
     public com.google.api.JavaSettings.Builder getJavaSettingsBuilder() {
-      bitField0_ |= 0x00000008;
+
       onChanged();
       return getJavaSettingsFieldBuilder().getBuilder();
     }
@@ -1727,7 +1700,7 @@ public com.google.api.JavaSettingsOrBuilder getJavaSettingsOrBuilder() {
      * @return Whether the cppSettings field is set.
      */
     public boolean hasCppSettings() {
-      return ((bitField0_ & 0x00000010) != 0);
+      return cppSettingsBuilder_ != null || cppSettings_ != null;
     }
 
     /**
@@ -1766,11 +1739,11 @@ public Builder setCppSettings(com.google.api.CppSettings value) {
           throw new NullPointerException();
         }
         cppSettings_ = value;
+        onChanged();
       } else {
         cppSettingsBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -1786,11 +1759,11 @@ public Builder setCppSettings(com.google.api.CppSettings value) {
     public Builder setCppSettings(com.google.api.CppSettings.Builder builderForValue) {
       if (cppSettingsBuilder_ == null) {
         cppSettings_ = builderForValue.build();
+        onChanged();
       } else {
         cppSettingsBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -1805,20 +1778,17 @@ public Builder setCppSettings(com.google.api.CppSettings.Builder builderForValue
      */
     public Builder mergeCppSettings(com.google.api.CppSettings value) {
       if (cppSettingsBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)
-            && cppSettings_ != null
-            && cppSettings_ != com.google.api.CppSettings.getDefaultInstance()) {
-          getCppSettingsBuilder().mergeFrom(value);
+        if (cppSettings_ != null) {
+          cppSettings_ =
+              com.google.api.CppSettings.newBuilder(cppSettings_).mergeFrom(value).buildPartial();
         } else {
           cppSettings_ = value;
         }
+        onChanged();
       } else {
         cppSettingsBuilder_.mergeFrom(value);
       }
-      if (cppSettings_ != null) {
-        bitField0_ |= 0x00000010;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1832,13 +1802,14 @@ public Builder mergeCppSettings(com.google.api.CppSettings value) {
      * .google.api.CppSettings cpp_settings = 22;
      */
     public Builder clearCppSettings() {
-      bitField0_ = (bitField0_ & ~0x00000010);
-      cppSettings_ = null;
-      if (cppSettingsBuilder_ != null) {
-        cppSettingsBuilder_.dispose();
+      if (cppSettingsBuilder_ == null) {
+        cppSettings_ = null;
+        onChanged();
+      } else {
+        cppSettings_ = null;
         cppSettingsBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1852,7 +1823,7 @@ public Builder clearCppSettings() {
      * .google.api.CppSettings cpp_settings = 22;
      */
     public com.google.api.CppSettings.Builder getCppSettingsBuilder() {
-      bitField0_ |= 0x00000010;
+
       onChanged();
       return getCppSettingsFieldBuilder().getBuilder();
     }
@@ -1921,7 +1892,7 @@ public com.google.api.CppSettingsOrBuilder getCppSettingsOrBuilder() {
      * @return Whether the phpSettings field is set.
      */
     public boolean hasPhpSettings() {
-      return ((bitField0_ & 0x00000020) != 0);
+      return phpSettingsBuilder_ != null || phpSettings_ != null;
     }
 
     /**
@@ -1960,11 +1931,11 @@ public Builder setPhpSettings(com.google.api.PhpSettings value) {
           throw new NullPointerException();
         }
         phpSettings_ = value;
+        onChanged();
       } else {
         phpSettingsBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000020;
-      onChanged();
+
       return this;
     }
 
@@ -1980,11 +1951,11 @@ public Builder setPhpSettings(com.google.api.PhpSettings value) {
     public Builder setPhpSettings(com.google.api.PhpSettings.Builder builderForValue) {
       if (phpSettingsBuilder_ == null) {
         phpSettings_ = builderForValue.build();
+        onChanged();
       } else {
         phpSettingsBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000020;
-      onChanged();
+
       return this;
     }
 
@@ -1999,20 +1970,17 @@ public Builder setPhpSettings(com.google.api.PhpSettings.Builder builderForValue
      */
     public Builder mergePhpSettings(com.google.api.PhpSettings value) {
       if (phpSettingsBuilder_ == null) {
-        if (((bitField0_ & 0x00000020) != 0)
-            && phpSettings_ != null
-            && phpSettings_ != com.google.api.PhpSettings.getDefaultInstance()) {
-          getPhpSettingsBuilder().mergeFrom(value);
+        if (phpSettings_ != null) {
+          phpSettings_ =
+              com.google.api.PhpSettings.newBuilder(phpSettings_).mergeFrom(value).buildPartial();
         } else {
           phpSettings_ = value;
         }
+        onChanged();
       } else {
         phpSettingsBuilder_.mergeFrom(value);
       }
-      if (phpSettings_ != null) {
-        bitField0_ |= 0x00000020;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2026,13 +1994,14 @@ public Builder mergePhpSettings(com.google.api.PhpSettings value) {
      * .google.api.PhpSettings php_settings = 23;
      */
     public Builder clearPhpSettings() {
-      bitField0_ = (bitField0_ & ~0x00000020);
-      phpSettings_ = null;
-      if (phpSettingsBuilder_ != null) {
-        phpSettingsBuilder_.dispose();
+      if (phpSettingsBuilder_ == null) {
+        phpSettings_ = null;
+        onChanged();
+      } else {
+        phpSettings_ = null;
         phpSettingsBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2046,7 +2015,7 @@ public Builder clearPhpSettings() {
      * .google.api.PhpSettings php_settings = 23;
      */
     public com.google.api.PhpSettings.Builder getPhpSettingsBuilder() {
-      bitField0_ |= 0x00000020;
+
       onChanged();
       return getPhpSettingsFieldBuilder().getBuilder();
     }
@@ -2115,7 +2084,7 @@ public com.google.api.PhpSettingsOrBuilder getPhpSettingsOrBuilder() {
      * @return Whether the pythonSettings field is set.
      */
     public boolean hasPythonSettings() {
-      return ((bitField0_ & 0x00000040) != 0);
+      return pythonSettingsBuilder_ != null || pythonSettings_ != null;
     }
 
     /**
@@ -2154,11 +2123,11 @@ public Builder setPythonSettings(com.google.api.PythonSettings value) {
           throw new NullPointerException();
         }
         pythonSettings_ = value;
+        onChanged();
       } else {
         pythonSettingsBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -2174,11 +2143,11 @@ public Builder setPythonSettings(com.google.api.PythonSettings value) {
     public Builder setPythonSettings(com.google.api.PythonSettings.Builder builderForValue) {
       if (pythonSettingsBuilder_ == null) {
         pythonSettings_ = builderForValue.build();
+        onChanged();
       } else {
         pythonSettingsBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -2193,20 +2162,19 @@ public Builder setPythonSettings(com.google.api.PythonSettings.Builder builderFo
      */
     public Builder mergePythonSettings(com.google.api.PythonSettings value) {
       if (pythonSettingsBuilder_ == null) {
-        if (((bitField0_ & 0x00000040) != 0)
-            && pythonSettings_ != null
-            && pythonSettings_ != com.google.api.PythonSettings.getDefaultInstance()) {
-          getPythonSettingsBuilder().mergeFrom(value);
+        if (pythonSettings_ != null) {
+          pythonSettings_ =
+              com.google.api.PythonSettings.newBuilder(pythonSettings_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           pythonSettings_ = value;
         }
+        onChanged();
       } else {
         pythonSettingsBuilder_.mergeFrom(value);
       }
-      if (pythonSettings_ != null) {
-        bitField0_ |= 0x00000040;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2220,13 +2188,14 @@ public Builder mergePythonSettings(com.google.api.PythonSettings value) {
      * .google.api.PythonSettings python_settings = 24;
      */
     public Builder clearPythonSettings() {
-      bitField0_ = (bitField0_ & ~0x00000040);
-      pythonSettings_ = null;
-      if (pythonSettingsBuilder_ != null) {
-        pythonSettingsBuilder_.dispose();
+      if (pythonSettingsBuilder_ == null) {
+        pythonSettings_ = null;
+        onChanged();
+      } else {
+        pythonSettings_ = null;
         pythonSettingsBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2240,7 +2209,7 @@ public Builder clearPythonSettings() {
      * .google.api.PythonSettings python_settings = 24;
      */
     public com.google.api.PythonSettings.Builder getPythonSettingsBuilder() {
-      bitField0_ |= 0x00000040;
+
       onChanged();
       return getPythonSettingsFieldBuilder().getBuilder();
     }
@@ -2309,7 +2278,7 @@ public com.google.api.PythonSettingsOrBuilder getPythonSettingsOrBuilder() {
      * @return Whether the nodeSettings field is set.
      */
     public boolean hasNodeSettings() {
-      return ((bitField0_ & 0x00000080) != 0);
+      return nodeSettingsBuilder_ != null || nodeSettings_ != null;
     }
 
     /**
@@ -2348,11 +2317,11 @@ public Builder setNodeSettings(com.google.api.NodeSettings value) {
           throw new NullPointerException();
         }
         nodeSettings_ = value;
+        onChanged();
       } else {
         nodeSettingsBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -2368,11 +2337,11 @@ public Builder setNodeSettings(com.google.api.NodeSettings value) {
     public Builder setNodeSettings(com.google.api.NodeSettings.Builder builderForValue) {
       if (nodeSettingsBuilder_ == null) {
         nodeSettings_ = builderForValue.build();
+        onChanged();
       } else {
         nodeSettingsBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -2387,20 +2356,17 @@ public Builder setNodeSettings(com.google.api.NodeSettings.Builder builderForVal
      */
     public Builder mergeNodeSettings(com.google.api.NodeSettings value) {
       if (nodeSettingsBuilder_ == null) {
-        if (((bitField0_ & 0x00000080) != 0)
-            && nodeSettings_ != null
-            && nodeSettings_ != com.google.api.NodeSettings.getDefaultInstance()) {
-          getNodeSettingsBuilder().mergeFrom(value);
+        if (nodeSettings_ != null) {
+          nodeSettings_ =
+              com.google.api.NodeSettings.newBuilder(nodeSettings_).mergeFrom(value).buildPartial();
         } else {
           nodeSettings_ = value;
         }
+        onChanged();
       } else {
         nodeSettingsBuilder_.mergeFrom(value);
       }
-      if (nodeSettings_ != null) {
-        bitField0_ |= 0x00000080;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2414,13 +2380,14 @@ public Builder mergeNodeSettings(com.google.api.NodeSettings value) {
      * .google.api.NodeSettings node_settings = 25;
      */
     public Builder clearNodeSettings() {
-      bitField0_ = (bitField0_ & ~0x00000080);
-      nodeSettings_ = null;
-      if (nodeSettingsBuilder_ != null) {
-        nodeSettingsBuilder_.dispose();
+      if (nodeSettingsBuilder_ == null) {
+        nodeSettings_ = null;
+        onChanged();
+      } else {
+        nodeSettings_ = null;
         nodeSettingsBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2434,7 +2401,7 @@ public Builder clearNodeSettings() {
      * .google.api.NodeSettings node_settings = 25;
      */
     public com.google.api.NodeSettings.Builder getNodeSettingsBuilder() {
-      bitField0_ |= 0x00000080;
+
       onChanged();
       return getNodeSettingsFieldBuilder().getBuilder();
     }
@@ -2503,7 +2470,7 @@ public com.google.api.NodeSettingsOrBuilder getNodeSettingsOrBuilder() {
      * @return Whether the dotnetSettings field is set.
      */
     public boolean hasDotnetSettings() {
-      return ((bitField0_ & 0x00000100) != 0);
+      return dotnetSettingsBuilder_ != null || dotnetSettings_ != null;
     }
 
     /**
@@ -2542,11 +2509,11 @@ public Builder setDotnetSettings(com.google.api.DotnetSettings value) {
           throw new NullPointerException();
         }
         dotnetSettings_ = value;
+        onChanged();
       } else {
         dotnetSettingsBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000100;
-      onChanged();
+
       return this;
     }
 
@@ -2562,11 +2529,11 @@ public Builder setDotnetSettings(com.google.api.DotnetSettings value) {
     public Builder setDotnetSettings(com.google.api.DotnetSettings.Builder builderForValue) {
       if (dotnetSettingsBuilder_ == null) {
         dotnetSettings_ = builderForValue.build();
+        onChanged();
       } else {
         dotnetSettingsBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000100;
-      onChanged();
+
       return this;
     }
 
@@ -2581,20 +2548,19 @@ public Builder setDotnetSettings(com.google.api.DotnetSettings.Builder builderFo
      */
     public Builder mergeDotnetSettings(com.google.api.DotnetSettings value) {
       if (dotnetSettingsBuilder_ == null) {
-        if (((bitField0_ & 0x00000100) != 0)
-            && dotnetSettings_ != null
-            && dotnetSettings_ != com.google.api.DotnetSettings.getDefaultInstance()) {
-          getDotnetSettingsBuilder().mergeFrom(value);
+        if (dotnetSettings_ != null) {
+          dotnetSettings_ =
+              com.google.api.DotnetSettings.newBuilder(dotnetSettings_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           dotnetSettings_ = value;
         }
+        onChanged();
       } else {
         dotnetSettingsBuilder_.mergeFrom(value);
       }
-      if (dotnetSettings_ != null) {
-        bitField0_ |= 0x00000100;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2608,13 +2574,14 @@ public Builder mergeDotnetSettings(com.google.api.DotnetSettings value) {
      * .google.api.DotnetSettings dotnet_settings = 26;
      */
     public Builder clearDotnetSettings() {
-      bitField0_ = (bitField0_ & ~0x00000100);
-      dotnetSettings_ = null;
-      if (dotnetSettingsBuilder_ != null) {
-        dotnetSettingsBuilder_.dispose();
+      if (dotnetSettingsBuilder_ == null) {
+        dotnetSettings_ = null;
+        onChanged();
+      } else {
+        dotnetSettings_ = null;
         dotnetSettingsBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2628,7 +2595,7 @@ public Builder clearDotnetSettings() {
      * .google.api.DotnetSettings dotnet_settings = 26;
      */
     public com.google.api.DotnetSettings.Builder getDotnetSettingsBuilder() {
-      bitField0_ |= 0x00000100;
+
       onChanged();
       return getDotnetSettingsFieldBuilder().getBuilder();
     }
@@ -2697,7 +2664,7 @@ public com.google.api.DotnetSettingsOrBuilder getDotnetSettingsOrBuilder() {
      * @return Whether the rubySettings field is set.
      */
     public boolean hasRubySettings() {
-      return ((bitField0_ & 0x00000200) != 0);
+      return rubySettingsBuilder_ != null || rubySettings_ != null;
     }
 
     /**
@@ -2736,11 +2703,11 @@ public Builder setRubySettings(com.google.api.RubySettings value) {
           throw new NullPointerException();
         }
         rubySettings_ = value;
+        onChanged();
       } else {
         rubySettingsBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000200;
-      onChanged();
+
       return this;
     }
 
@@ -2756,11 +2723,11 @@ public Builder setRubySettings(com.google.api.RubySettings value) {
     public Builder setRubySettings(com.google.api.RubySettings.Builder builderForValue) {
       if (rubySettingsBuilder_ == null) {
         rubySettings_ = builderForValue.build();
+        onChanged();
       } else {
         rubySettingsBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000200;
-      onChanged();
+
       return this;
     }
 
@@ -2775,20 +2742,17 @@ public Builder setRubySettings(com.google.api.RubySettings.Builder builderForVal
      */
     public Builder mergeRubySettings(com.google.api.RubySettings value) {
       if (rubySettingsBuilder_ == null) {
-        if (((bitField0_ & 0x00000200) != 0)
-            && rubySettings_ != null
-            && rubySettings_ != com.google.api.RubySettings.getDefaultInstance()) {
-          getRubySettingsBuilder().mergeFrom(value);
+        if (rubySettings_ != null) {
+          rubySettings_ =
+              com.google.api.RubySettings.newBuilder(rubySettings_).mergeFrom(value).buildPartial();
         } else {
           rubySettings_ = value;
         }
+        onChanged();
       } else {
         rubySettingsBuilder_.mergeFrom(value);
       }
-      if (rubySettings_ != null) {
-        bitField0_ |= 0x00000200;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2802,13 +2766,14 @@ public Builder mergeRubySettings(com.google.api.RubySettings value) {
      * .google.api.RubySettings ruby_settings = 27;
      */
     public Builder clearRubySettings() {
-      bitField0_ = (bitField0_ & ~0x00000200);
-      rubySettings_ = null;
-      if (rubySettingsBuilder_ != null) {
-        rubySettingsBuilder_.dispose();
+      if (rubySettingsBuilder_ == null) {
+        rubySettings_ = null;
+        onChanged();
+      } else {
+        rubySettings_ = null;
         rubySettingsBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2822,7 +2787,7 @@ public Builder clearRubySettings() {
      * .google.api.RubySettings ruby_settings = 27;
      */
     public com.google.api.RubySettings.Builder getRubySettingsBuilder() {
-      bitField0_ |= 0x00000200;
+
       onChanged();
       return getRubySettingsFieldBuilder().getBuilder();
     }
@@ -2891,7 +2856,7 @@ public com.google.api.RubySettingsOrBuilder getRubySettingsOrBuilder() {
      * @return Whether the goSettings field is set.
      */
     public boolean hasGoSettings() {
-      return ((bitField0_ & 0x00000400) != 0);
+      return goSettingsBuilder_ != null || goSettings_ != null;
     }
 
     /**
@@ -2928,11 +2893,11 @@ public Builder setGoSettings(com.google.api.GoSettings value) {
           throw new NullPointerException();
         }
         goSettings_ = value;
+        onChanged();
       } else {
         goSettingsBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000400;
-      onChanged();
+
       return this;
     }
 
@@ -2948,11 +2913,11 @@ public Builder setGoSettings(com.google.api.GoSettings value) {
     public Builder setGoSettings(com.google.api.GoSettings.Builder builderForValue) {
       if (goSettingsBuilder_ == null) {
         goSettings_ = builderForValue.build();
+        onChanged();
       } else {
         goSettingsBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000400;
-      onChanged();
+
       return this;
     }
 
@@ -2967,20 +2932,17 @@ public Builder setGoSettings(com.google.api.GoSettings.Builder builderForValue)
      */
     public Builder mergeGoSettings(com.google.api.GoSettings value) {
       if (goSettingsBuilder_ == null) {
-        if (((bitField0_ & 0x00000400) != 0)
-            && goSettings_ != null
-            && goSettings_ != com.google.api.GoSettings.getDefaultInstance()) {
-          getGoSettingsBuilder().mergeFrom(value);
+        if (goSettings_ != null) {
+          goSettings_ =
+              com.google.api.GoSettings.newBuilder(goSettings_).mergeFrom(value).buildPartial();
         } else {
           goSettings_ = value;
         }
+        onChanged();
       } else {
         goSettingsBuilder_.mergeFrom(value);
       }
-      if (goSettings_ != null) {
-        bitField0_ |= 0x00000400;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2994,13 +2956,14 @@ public Builder mergeGoSettings(com.google.api.GoSettings value) {
      * .google.api.GoSettings go_settings = 28;
      */
     public Builder clearGoSettings() {
-      bitField0_ = (bitField0_ & ~0x00000400);
-      goSettings_ = null;
-      if (goSettingsBuilder_ != null) {
-        goSettingsBuilder_.dispose();
+      if (goSettingsBuilder_ == null) {
+        goSettings_ = null;
+        onChanged();
+      } else {
+        goSettings_ = null;
         goSettingsBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -3014,7 +2977,7 @@ public Builder clearGoSettings() {
      * .google.api.GoSettings go_settings = 28;
      */
     public com.google.api.GoSettings.Builder getGoSettingsBuilder() {
-      bitField0_ |= 0x00000400;
+
       onChanged();
       return getGoSettingsFieldBuilder().getBuilder();
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibrarySettingsOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibrarySettingsOrBuilder.java
index 56cad0d64f..1d0f770d71 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibrarySettingsOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibrarySettingsOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface ClientLibrarySettingsOrBuilder
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 dc4dec0b14..55767c68d7 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class ClientProto {
@@ -40,31 +39,23 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
    *
    * 
    * 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
@@ -92,9 +83,7 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
    * 
    * 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";
    *     ...
@@ -116,19 +105,14 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
    *
    * 
    * OAuth scopes needed for the client.
-   *
    * Example:
-   *
    *   service Foo {
    *     option (google.api.oauth_scopes) = \
    *       "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) = \
    *       "https://www.googleapis.com/auth/cloud-platform,"
@@ -159,9 +143,7 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
    * not rely on this to determine components within an API version, or attempt
    * to construct other valid API versions. Note that this is for upcoming
    * functionality and may not be implemented for all services.
-   *
    * Example:
-   *
    *   service Foo {
    *     option (google.api.api_version) = "v1_20230821_preview";
    *   }
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 c91fd5b6ec..a35c332f3d 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -50,6 +49,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;
   }
@@ -64,11 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.api.CommonLanguageSettings.Builder.class);
   }
 
-  private int bitField0_;
   public static final int REFERENCE_DOCS_URI_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object referenceDocsUri_ = "";
+  private volatile java.lang.Object referenceDocsUri_;
 
   /**
    *
@@ -127,18 +128,16 @@ public com.google.protobuf.ByteString getReferenceDocsUriBytes() {
   }
 
   public static final int DESTINATIONS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List destinations_;
-
   private static final com.google.protobuf.Internal.ListAdapter.Converter<
           java.lang.Integer, com.google.api.ClientLibraryDestination>
       destinations_converter_ =
           new com.google.protobuf.Internal.ListAdapter.Converter<
               java.lang.Integer, com.google.api.ClientLibraryDestination>() {
             public com.google.api.ClientLibraryDestination convert(java.lang.Integer from) {
+              @SuppressWarnings("deprecation")
               com.google.api.ClientLibraryDestination result =
-                  com.google.api.ClientLibraryDestination.forNumber(from);
+                  com.google.api.ClientLibraryDestination.valueOf(from);
               return result == null ? com.google.api.ClientLibraryDestination.UNRECOGNIZED : result;
             }
           };
@@ -245,7 +244,7 @@ public int getDestinationsValue(int index) {
    */
   @java.lang.Override
   public boolean hasSelectiveGapicGeneration() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return selectiveGapicGeneration_ != null;
   }
 
   /**
@@ -277,9 +276,7 @@ public com.google.api.SelectiveGapicGeneration getSelectiveGapicGeneration() {
    */
   @java.lang.Override
   public com.google.api.SelectiveGapicGenerationOrBuilder getSelectiveGapicGenerationOrBuilder() {
-    return selectiveGapicGeneration_ == null
-        ? com.google.api.SelectiveGapicGeneration.getDefaultInstance()
-        : selectiveGapicGeneration_;
+    return getSelectiveGapicGeneration();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -307,7 +304,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < destinations_.size(); i++) {
       output.writeEnumNoTag(destinations_.get(i));
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (selectiveGapicGeneration_ != null) {
       output.writeMessage(3, getSelectiveGapicGeneration());
     }
     getUnknownFields().writeTo(output);
@@ -335,7 +332,7 @@ public int getSerializedSize() {
       }
       destinationsMemoizedSerializedSize = dataSize;
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (selectiveGapicGeneration_ != null) {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               3, getSelectiveGapicGeneration());
@@ -511,31 +508,23 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.CommonLanguageSettings.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getSelectiveGapicGenerationFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       referenceDocsUri_ = "";
+
       destinations_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000002);
-      selectiveGapicGeneration_ = null;
-      if (selectiveGapicGenerationBuilder_ != null) {
-        selectiveGapicGenerationBuilder_.dispose();
+      bitField0_ = (bitField0_ & ~0x00000001);
+      if (selectiveGapicGenerationBuilder_ == null) {
+        selectiveGapicGeneration_ = null;
+      } else {
+        selectiveGapicGeneration_ = null;
         selectiveGapicGenerationBuilder_ = null;
       }
       return this;
@@ -565,36 +554,20 @@ public com.google.api.CommonLanguageSettings build() {
     public com.google.api.CommonLanguageSettings buildPartial() {
       com.google.api.CommonLanguageSettings result =
           new com.google.api.CommonLanguageSettings(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.CommonLanguageSettings result) {
-      if (((bitField0_ & 0x00000002) != 0)) {
+      int from_bitField0_ = bitField0_;
+      result.referenceDocsUri_ = referenceDocsUri_;
+      if (((bitField0_ & 0x00000001) != 0)) {
         destinations_ = java.util.Collections.unmodifiableList(destinations_);
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
       result.destinations_ = destinations_;
-    }
-
-    private void buildPartial0(com.google.api.CommonLanguageSettings result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.referenceDocsUri_ = referenceDocsUri_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.selectiveGapicGeneration_ =
-            selectiveGapicGenerationBuilder_ == null
-                ? selectiveGapicGeneration_
-                : selectiveGapicGenerationBuilder_.build();
-        to_bitField0_ |= 0x00000001;
+      if (selectiveGapicGenerationBuilder_ == null) {
+        result.selectiveGapicGeneration_ = selectiveGapicGeneration_;
+      } else {
+        result.selectiveGapicGeneration_ = selectiveGapicGenerationBuilder_.build();
       }
-      result.bitField0_ |= to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -644,13 +617,12 @@ public Builder mergeFrom(com.google.api.CommonLanguageSettings other) {
       if (other == com.google.api.CommonLanguageSettings.getDefaultInstance()) return this;
       if (!other.getReferenceDocsUri().isEmpty()) {
         referenceDocsUri_ = other.referenceDocsUri_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.destinations_.isEmpty()) {
         if (destinations_.isEmpty()) {
           destinations_ = other.destinations_;
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureDestinationsIsMutable();
           destinations_.addAll(other.destinations_);
@@ -689,7 +661,7 @@ public Builder mergeFrom(
             case 10:
               {
                 referenceDocsUri_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
@@ -715,7 +687,7 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getSelectiveGapicGenerationFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -813,8 +785,8 @@ public Builder setReferenceDocsUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       referenceDocsUri_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -835,8 +807,8 @@ public Builder setReferenceDocsUri(java.lang.String value) {
      */
     @java.lang.Deprecated
     public Builder clearReferenceDocsUri() {
+
       referenceDocsUri_ = getDefaultInstance().getReferenceDocsUri();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -862,8 +834,8 @@ public Builder setReferenceDocsUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       referenceDocsUri_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -871,9 +843,9 @@ public Builder setReferenceDocsUriBytes(com.google.protobuf.ByteString value) {
     private java.util.List destinations_ = java.util.Collections.emptyList();
 
     private void ensureDestinationsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         destinations_ = new java.util.ArrayList(destinations_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1005,7 +977,7 @@ public Builder addAllDestinations(
      */
     public Builder clearDestinations() {
       destinations_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1120,7 +1092,7 @@ public Builder addAllDestinationsValue(java.lang.Iterable val
      * @return Whether the selectiveGapicGeneration field is set.
      */
     public boolean hasSelectiveGapicGeneration() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return selectiveGapicGenerationBuilder_ != null || selectiveGapicGeneration_ != null;
     }
 
     /**
@@ -1159,11 +1131,11 @@ public Builder setSelectiveGapicGeneration(com.google.api.SelectiveGapicGenerati
           throw new NullPointerException();
         }
         selectiveGapicGeneration_ = value;
+        onChanged();
       } else {
         selectiveGapicGenerationBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1180,11 +1152,11 @@ public Builder setSelectiveGapicGeneration(
         com.google.api.SelectiveGapicGeneration.Builder builderForValue) {
       if (selectiveGapicGenerationBuilder_ == null) {
         selectiveGapicGeneration_ = builderForValue.build();
+        onChanged();
       } else {
         selectiveGapicGenerationBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1199,21 +1171,19 @@ public Builder setSelectiveGapicGeneration(
      */
     public Builder mergeSelectiveGapicGeneration(com.google.api.SelectiveGapicGeneration value) {
       if (selectiveGapicGenerationBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && selectiveGapicGeneration_ != null
-            && selectiveGapicGeneration_
-                != com.google.api.SelectiveGapicGeneration.getDefaultInstance()) {
-          getSelectiveGapicGenerationBuilder().mergeFrom(value);
+        if (selectiveGapicGeneration_ != null) {
+          selectiveGapicGeneration_ =
+              com.google.api.SelectiveGapicGeneration.newBuilder(selectiveGapicGeneration_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           selectiveGapicGeneration_ = value;
         }
+        onChanged();
       } else {
         selectiveGapicGenerationBuilder_.mergeFrom(value);
       }
-      if (selectiveGapicGeneration_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1227,13 +1197,14 @@ public Builder mergeSelectiveGapicGeneration(com.google.api.SelectiveGapicGenera
      * .google.api.SelectiveGapicGeneration selective_gapic_generation = 3;
      */
     public Builder clearSelectiveGapicGeneration() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      selectiveGapicGeneration_ = null;
-      if (selectiveGapicGenerationBuilder_ != null) {
-        selectiveGapicGenerationBuilder_.dispose();
+      if (selectiveGapicGenerationBuilder_ == null) {
+        selectiveGapicGeneration_ = null;
+        onChanged();
+      } else {
+        selectiveGapicGeneration_ = null;
         selectiveGapicGenerationBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1247,7 +1218,7 @@ public Builder clearSelectiveGapicGeneration() {
      * .google.api.SelectiveGapicGeneration selective_gapic_generation = 3;
      */
     public com.google.api.SelectiveGapicGeneration.Builder getSelectiveGapicGenerationBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getSelectiveGapicGenerationFieldBuilder().getBuilder();
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettingsOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettingsOrBuilder.java
index 3d1dd78dbe..06d4106347 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettingsOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettingsOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface CommonLanguageSettingsOrBuilder
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 af30d7e77b..7b30efd1ae 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/config_change.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -25,7 +24,6 @@
  * 
  * 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.
@@ -58,6 +56,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;
   }
@@ -72,9 +75,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ELEMENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object element_ = "";
+  private volatile java.lang.Object element_;
 
   /**
    *
@@ -141,9 +142,7 @@ public com.google.protobuf.ByteString getElementBytes() {
   }
 
   public static final int OLD_VALUE_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object oldValue_ = "";
+  private volatile java.lang.Object oldValue_;
 
   /**
    *
@@ -196,9 +195,7 @@ public com.google.protobuf.ByteString getOldValueBytes() {
   }
 
   public static final int NEW_VALUE_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object newValue_ = "";
+  private volatile java.lang.Object newValue_;
 
   /**
    *
@@ -251,7 +248,7 @@ public com.google.protobuf.ByteString getNewValueBytes() {
   }
 
   public static final int CHANGE_TYPE_FIELD_NUMBER = 4;
-  private int changeType_ = 0;
+  private int changeType_;
 
   /**
    *
@@ -282,13 +279,12 @@ public int getChangeTypeValue() {
    */
   @java.lang.Override
   public com.google.api.ChangeType getChangeType() {
-    com.google.api.ChangeType result = com.google.api.ChangeType.forNumber(changeType_);
+    @SuppressWarnings("deprecation")
+    com.google.api.ChangeType result = com.google.api.ChangeType.valueOf(changeType_);
     return result == null ? com.google.api.ChangeType.UNRECOGNIZED : result;
   }
 
   public static final int ADVICES_FIELD_NUMBER = 5;
-
-  @SuppressWarnings("serial")
   private java.util.List advices_;
 
   /**
@@ -568,7 +564,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * 
    * 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.
@@ -603,18 +598,21 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       element_ = "";
+
       oldValue_ = "";
+
       newValue_ = "";
+
       changeType_ = 0;
+
       if (advicesBuilder_ == null) {
         advices_ = java.util.Collections.emptyList();
       } else {
         advices_ = null;
         advicesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000010);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -640,40 +638,22 @@ public com.google.api.ConfigChange build() {
     @java.lang.Override
     public com.google.api.ConfigChange buildPartial() {
       com.google.api.ConfigChange result = new com.google.api.ConfigChange(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.ConfigChange result) {
+      int from_bitField0_ = bitField0_;
+      result.element_ = element_;
+      result.oldValue_ = oldValue_;
+      result.newValue_ = newValue_;
+      result.changeType_ = changeType_;
       if (advicesBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           advices_ = java.util.Collections.unmodifiableList(advices_);
-          bitField0_ = (bitField0_ & ~0x00000010);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.advices_ = advices_;
       } else {
         result.advices_ = advicesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.ConfigChange result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.element_ = element_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.oldValue_ = oldValue_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.newValue_ = newValue_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.changeType_ = changeType_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -723,17 +703,14 @@ public Builder mergeFrom(com.google.api.ConfigChange other) {
       if (other == com.google.api.ConfigChange.getDefaultInstance()) return this;
       if (!other.getElement().isEmpty()) {
         element_ = other.element_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getOldValue().isEmpty()) {
         oldValue_ = other.oldValue_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getNewValue().isEmpty()) {
         newValue_ = other.newValue_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.changeType_ != 0) {
@@ -743,7 +720,7 @@ public Builder mergeFrom(com.google.api.ConfigChange other) {
         if (!other.advices_.isEmpty()) {
           if (advices_.isEmpty()) {
             advices_ = other.advices_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureAdvicesIsMutable();
             advices_.addAll(other.advices_);
@@ -756,7 +733,7 @@ public Builder mergeFrom(com.google.api.ConfigChange other) {
             advicesBuilder_.dispose();
             advicesBuilder_ = null;
             advices_ = other.advices_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00000001);
             advicesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getAdvicesFieldBuilder()
@@ -795,25 +772,25 @@ public Builder mergeFrom(
             case 10:
               {
                 element_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 oldValue_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 newValue_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 32:
               {
                 changeType_ = input.readEnum();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             case 42:
@@ -935,8 +912,8 @@ public Builder setElement(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       element_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -961,8 +938,8 @@ public Builder setElement(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearElement() {
+
       element_ = getDefaultInstance().getElement();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -992,8 +969,8 @@ public Builder setElementBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       element_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1065,8 +1042,8 @@ public Builder setOldValue(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       oldValue_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1084,8 +1061,8 @@ public Builder setOldValue(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearOldValue() {
+
       oldValue_ = getDefaultInstance().getOldValue();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1108,8 +1085,8 @@ public Builder setOldValueBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       oldValue_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1181,8 +1158,8 @@ public Builder setNewValue(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       newValue_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1200,8 +1177,8 @@ public Builder setNewValue(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNewValue() {
+
       newValue_ = getDefaultInstance().getNewValue();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1224,8 +1201,8 @@ public Builder setNewValueBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       newValue_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1261,8 +1238,8 @@ public int getChangeTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setChangeTypeValue(int value) {
+
       changeType_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1280,7 +1257,8 @@ public Builder setChangeTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.api.ChangeType getChangeType() {
-      com.google.api.ChangeType result = com.google.api.ChangeType.forNumber(changeType_);
+      @SuppressWarnings("deprecation")
+      com.google.api.ChangeType result = com.google.api.ChangeType.valueOf(changeType_);
       return result == null ? com.google.api.ChangeType.UNRECOGNIZED : result;
     }
 
@@ -1300,7 +1278,7 @@ public Builder setChangeType(com.google.api.ChangeType value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000008;
+
       changeType_ = value.getNumber();
       onChanged();
       return this;
@@ -1318,7 +1296,7 @@ public Builder setChangeType(com.google.api.ChangeType value) {
      * @return This builder for chaining.
      */
     public Builder clearChangeType() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       changeType_ = 0;
       onChanged();
       return this;
@@ -1327,9 +1305,9 @@ public Builder clearChangeType() {
     private java.util.List advices_ = java.util.Collections.emptyList();
 
     private void ensureAdvicesIsMutable() {
-      if (!((bitField0_ & 0x00000010) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         advices_ = new java.util.ArrayList(advices_);
-        bitField0_ |= 0x00000010;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1560,7 +1538,7 @@ public Builder addAllAdvices(java.lang.Iterable
     public Builder clearAdvices() {
       if (advicesBuilder_ == null) {
         advices_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000010);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         advicesBuilder_.clear();
@@ -1690,7 +1668,7 @@ public java.util.List getAdvicesBuilderList() {
                 com.google.api.Advice,
                 com.google.api.Advice.Builder,
                 com.google.api.AdviceOrBuilder>(
-                advices_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
+                advices_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         advices_ = null;
       }
       return advicesBuilder_;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConfigChangeOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConfigChangeOrBuilder.java
index f7a773974c..64a182d0ca 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConfigChangeOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConfigChangeOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/config_change.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface ConfigChangeOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConfigChangeProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConfigChangeProto.java
index acc84ac985..eacbae918f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConfigChangeProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConfigChangeProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/config_change.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class ConfigChangeProto {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConsumerProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConsumerProto.java
index 7911e89e5b..21b35b58a6 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConsumerProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ConsumerProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/consumer.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class ConsumerProto {
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 50f9c3c6f1..36638679ea 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/context.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -24,31 +23,24 @@
  *
  * 
  * `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-<extension_id>-bin” and
  * “x-goog-ext-<extension_id>-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"
@@ -56,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.
  * 

@@ -84,6 +75,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;
   }
@@ -97,8 +93,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RULES_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List rules_;
 
   /**
@@ -106,7 +100,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -122,7 +115,6 @@ public java.util.List getRulesList() {
    *
    * 
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -138,7 +130,6 @@ public java.util.List getRulesOrB
    *
    * 
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -154,7 +145,6 @@ public int getRulesCount() {
    *
    * 
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -170,7 +160,6 @@ public com.google.api.ContextRule getRules(int index) {
    *
    * 
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -346,31 +335,24 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * `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-<extension_id>-bin” and
    * “x-goog-ext-<extension_id>-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"
@@ -378,7 +360,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.
    * 

@@ -411,7 +392,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
       } else {
@@ -444,15 +424,7 @@ public com.google.api.Context build() {
     @java.lang.Override
     public com.google.api.Context buildPartial() {
       com.google.api.Context result = new com.google.api.Context(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.Context result) {
+      int from_bitField0_ = bitField0_;
       if (rulesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
@@ -462,10 +434,8 @@ private void buildPartialRepeatedFields(com.google.api.Context result) {
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.Context result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -617,7 +587,6 @@ private void ensureRulesIsMutable() {
      *
      * 
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -636,7 +605,6 @@ public java.util.List getRulesList() {
      *
      * 
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -655,7 +623,6 @@ public int getRulesCount() {
      *
      * 
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -674,7 +641,6 @@ public com.google.api.ContextRule getRules(int index) {
      *
      * 
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -699,7 +665,6 @@ public Builder setRules(int index, com.google.api.ContextRule value) {
      *
      * 
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -721,7 +686,6 @@ public Builder setRules(int index, com.google.api.ContextRule.Builder builderFor
      *
      * 
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -746,7 +710,6 @@ public Builder addRules(com.google.api.ContextRule value) {
      *
      * 
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -771,7 +734,6 @@ public Builder addRules(int index, com.google.api.ContextRule value) {
      *
      * 
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -793,7 +755,6 @@ public Builder addRules(com.google.api.ContextRule.Builder builderForValue) {
      *
      * 
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -815,7 +776,6 @@ public Builder addRules(int index, com.google.api.ContextRule.Builder builderFor
      *
      * 
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -837,7 +797,6 @@ public Builder addAllRules(java.lang.Iterable
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -859,7 +818,6 @@ public Builder clearRules() {
      *
      * 
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -881,7 +839,6 @@ public Builder removeRules(int index) {
      *
      * 
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -896,7 +853,6 @@ public com.google.api.ContextRule.Builder getRulesBuilder(int index) {
      *
      * 
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -915,7 +871,6 @@ public com.google.api.ContextRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * 
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -934,7 +889,6 @@ public java.util.List getRulesOrB
      *
      * 
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -949,7 +903,6 @@ public com.google.api.ContextRule.Builder addRulesBuilder() {
      *
      * 
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -965,7 +918,6 @@ public com.google.api.ContextRule.Builder addRulesBuilder(int index) {
      *
      * 
      * A list of RPC context rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
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 cead867ec3..35ce7c59cd 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/context.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface ContextOrBuilder
@@ -29,7 +28,6 @@ public interface ContextOrBuilder
    *
    * 
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -42,7 +40,6 @@ public interface ContextOrBuilder
    *
    * 
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -55,7 +52,6 @@ public interface ContextOrBuilder
    *
    * 
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -68,7 +64,6 @@ public interface ContextOrBuilder
    *
    * 
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -81,7 +76,6 @@ public interface ContextOrBuilder
    *
    * 
    * A list of RPC context rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ContextProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ContextProto.java
index 874ab11c46..f67ad6b869 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ContextProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ContextProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/context.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class ContextProto {
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 dbc04231a7..aa6c0f25a9 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/context.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -42,10 +41,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
@@ -54,6 +53,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;
   }
@@ -67,16 +71,13 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object selector_ = "";
+  private volatile java.lang.Object selector_;
 
   /**
    *
    *
    * 
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -103,7 +104,6 @@ public java.lang.String getSelector() {
    *
    * 
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -126,10 +126,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_;
 
   /**
    *
@@ -198,10 +195,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_;
 
   /**
    *
@@ -270,10 +264,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_;
 
   /**
    *
@@ -342,10 +333,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_;
 
   /**
    *
@@ -675,12 +663,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     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_ & ~0x00000001);
+      provided_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      allowedRequestExtensions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      allowedResponseExtensions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000008);
       return this;
     }
 
@@ -706,34 +698,30 @@ 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);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.api.ContextRule result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.selector_ = selector_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        requested_.makeImmutable();
-        result.requested_ = requested_;
+      result.selector_ = selector_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        requested_ = requested_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        provided_.makeImmutable();
-        result.provided_ = provided_;
+      result.requested_ = requested_;
+      if (((bitField0_ & 0x00000002) != 0)) {
+        provided_ = provided_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
       }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        allowedRequestExtensions_.makeImmutable();
-        result.allowedRequestExtensions_ = allowedRequestExtensions_;
+      result.provided_ = provided_;
+      if (((bitField0_ & 0x00000004) != 0)) {
+        allowedRequestExtensions_ = allowedRequestExtensions_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000004);
       }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        allowedResponseExtensions_.makeImmutable();
-        result.allowedResponseExtensions_ = allowedResponseExtensions_;
+      result.allowedRequestExtensions_ = allowedRequestExtensions_;
+      if (((bitField0_ & 0x00000008) != 0)) {
+        allowedResponseExtensions_ = allowedResponseExtensions_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000008);
       }
+      result.allowedResponseExtensions_ = allowedResponseExtensions_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -783,13 +771,12 @@ public Builder mergeFrom(com.google.api.ContextRule other) {
       if (other == com.google.api.ContextRule.getDefaultInstance()) return this;
       if (!other.getSelector().isEmpty()) {
         selector_ = other.selector_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.requested_.isEmpty()) {
         if (requested_.isEmpty()) {
           requested_ = other.requested_;
-          bitField0_ |= 0x00000002;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureRequestedIsMutable();
           requested_.addAll(other.requested_);
@@ -799,7 +786,7 @@ public Builder mergeFrom(com.google.api.ContextRule other) {
       if (!other.provided_.isEmpty()) {
         if (provided_.isEmpty()) {
           provided_ = other.provided_;
-          bitField0_ |= 0x00000004;
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureProvidedIsMutable();
           provided_.addAll(other.provided_);
@@ -809,7 +796,7 @@ public Builder mergeFrom(com.google.api.ContextRule other) {
       if (!other.allowedRequestExtensions_.isEmpty()) {
         if (allowedRequestExtensions_.isEmpty()) {
           allowedRequestExtensions_ = other.allowedRequestExtensions_;
-          bitField0_ |= 0x00000008;
+          bitField0_ = (bitField0_ & ~0x00000004);
         } else {
           ensureAllowedRequestExtensionsIsMutable();
           allowedRequestExtensions_.addAll(other.allowedRequestExtensions_);
@@ -819,7 +806,7 @@ public Builder mergeFrom(com.google.api.ContextRule other) {
       if (!other.allowedResponseExtensions_.isEmpty()) {
         if (allowedResponseExtensions_.isEmpty()) {
           allowedResponseExtensions_ = other.allowedResponseExtensions_;
-          bitField0_ |= 0x00000010;
+          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
           ensureAllowedResponseExtensionsIsMutable();
           allowedResponseExtensions_.addAll(other.allowedResponseExtensions_);
@@ -855,7 +842,7 @@ public Builder mergeFrom(
             case 10:
               {
                 selector_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -912,7 +899,6 @@ public Builder mergeFrom(
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -938,7 +924,6 @@ public java.lang.String getSelector() {
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -964,7 +949,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -978,8 +962,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -989,7 +973,6 @@ public Builder setSelector(java.lang.String value) {
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -999,8 +982,8 @@ public Builder setSelector(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSelector() {
+
       selector_ = getDefaultInstance().getSelector();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1010,7 +993,6 @@ public Builder clearSelector() {
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -1025,20 +1007,20 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       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_ & 0x00000001) != 0)) {
         requested_ = new com.google.protobuf.LazyStringArrayList(requested_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000002;
     }
 
     /**
@@ -1054,8 +1036,7 @@ private void ensureRequestedIsMutable() {
      * @return A list containing the requested.
      */
     public com.google.protobuf.ProtocolStringList getRequestedList() {
-      requested_.makeImmutable();
-      return requested_;
+      return requested_.getUnmodifiableView();
     }
 
     /**
@@ -1128,7 +1109,6 @@ public Builder setRequested(int index, java.lang.String value) {
       }
       ensureRequestedIsMutable();
       requested_.set(index, value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1152,7 +1132,6 @@ public Builder addRequested(java.lang.String value) {
       }
       ensureRequestedIsMutable();
       requested_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1173,7 +1152,6 @@ public Builder addRequested(java.lang.String value) {
     public Builder addAllRequested(java.lang.Iterable values) {
       ensureRequestedIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, requested_);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1191,9 +1169,8 @@ public Builder addAllRequested(java.lang.Iterable values) {
      * @return This builder for chaining.
      */
     public Builder clearRequested() {
-      requested_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000002);
-      ;
+      requested_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1218,19 +1195,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_ & 0x00000002) != 0)) {
         provided_ = new com.google.protobuf.LazyStringArrayList(provided_);
+        bitField0_ |= 0x00000002;
       }
-      bitField0_ |= 0x00000004;
     }
 
     /**
@@ -1246,8 +1222,7 @@ private void ensureProvidedIsMutable() {
      * @return A list containing the provided.
      */
     public com.google.protobuf.ProtocolStringList getProvidedList() {
-      provided_.makeImmutable();
-      return provided_;
+      return provided_.getUnmodifiableView();
     }
 
     /**
@@ -1320,7 +1295,6 @@ public Builder setProvided(int index, java.lang.String value) {
       }
       ensureProvidedIsMutable();
       provided_.set(index, value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1344,7 +1318,6 @@ public Builder addProvided(java.lang.String value) {
       }
       ensureProvidedIsMutable();
       provided_.add(value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1365,7 +1338,6 @@ public Builder addProvided(java.lang.String value) {
     public Builder addAllProvided(java.lang.Iterable values) {
       ensureProvidedIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, provided_);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1383,9 +1355,8 @@ public Builder addAllProvided(java.lang.Iterable values) {
      * @return This builder for chaining.
      */
     public Builder clearProvided() {
-      provided_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000004);
-      ;
+      provided_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1410,20 +1381,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_ & 0x00000004) != 0)) {
         allowedRequestExtensions_ =
             new com.google.protobuf.LazyStringArrayList(allowedRequestExtensions_);
+        bitField0_ |= 0x00000004;
       }
-      bitField0_ |= 0x00000008;
     }
 
     /**
@@ -1439,8 +1409,7 @@ private void ensureAllowedRequestExtensionsIsMutable() {
      * @return A list containing the allowedRequestExtensions.
      */
     public com.google.protobuf.ProtocolStringList getAllowedRequestExtensionsList() {
-      allowedRequestExtensions_.makeImmutable();
-      return allowedRequestExtensions_;
+      return allowedRequestExtensions_.getUnmodifiableView();
     }
 
     /**
@@ -1513,7 +1482,6 @@ public Builder setAllowedRequestExtensions(int index, java.lang.String value) {
       }
       ensureAllowedRequestExtensionsIsMutable();
       allowedRequestExtensions_.set(index, value);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1537,7 +1505,6 @@ public Builder addAllowedRequestExtensions(java.lang.String value) {
       }
       ensureAllowedRequestExtensionsIsMutable();
       allowedRequestExtensions_.add(value);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1558,7 +1525,6 @@ public Builder addAllowedRequestExtensions(java.lang.String value) {
     public Builder addAllAllowedRequestExtensions(java.lang.Iterable values) {
       ensureAllowedRequestExtensionsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, allowedRequestExtensions_);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1576,9 +1542,8 @@ public Builder addAllAllowedRequestExtensions(java.lang.Iterable values) {
       ensureAllowedResponseExtensionsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, allowedResponseExtensions_);
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1769,9 +1729,8 @@ public Builder addAllAllowedResponseExtensions(java.lang.Iterable
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -45,7 +43,6 @@ public interface ContextRuleOrBuilder
    *
    * 
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

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 74b611c518..e2533a7a88 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/control.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -24,9 +23,7 @@
  *
  * 
  * Selects and configures the service controller used by the service.
- *
  * Example:
- *
  *     control:
  *       environment: servicecontrol.googleapis.com
  * 

@@ -55,6 +52,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;
   }
@@ -68,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ENVIRONMENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object environment_ = "";
+  private volatile java.lang.Object environment_;
 
   /**
    *
@@ -125,8 +125,6 @@ public com.google.protobuf.ByteString getEnvironmentBytes() {
   }
 
   public static final int METHOD_POLICIES_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
   private java.util.List methodPolicies_;
 
   /**
@@ -374,9 +372,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * Selects and configures the service controller used by the service.
-   *
    * Example:
-   *
    *     control:
    *       environment: servicecontrol.googleapis.com
    * 

@@ -409,15 +405,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       environment_ = "";
+
       if (methodPoliciesBuilder_ == null) {
         methodPolicies_ = java.util.Collections.emptyList();
       } else {
         methodPolicies_ = null;
         methodPoliciesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -443,31 +439,19 @@ public com.google.api.Control build() {
     @java.lang.Override
     public com.google.api.Control buildPartial() {
       com.google.api.Control result = new com.google.api.Control(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.Control result) {
+      int from_bitField0_ = bitField0_;
+      result.environment_ = environment_;
       if (methodPoliciesBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           methodPolicies_ = java.util.Collections.unmodifiableList(methodPolicies_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.methodPolicies_ = methodPolicies_;
       } else {
         result.methodPolicies_ = methodPoliciesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.Control result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.environment_ = environment_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -517,14 +501,13 @@ public Builder mergeFrom(com.google.api.Control other) {
       if (other == com.google.api.Control.getDefaultInstance()) return this;
       if (!other.getEnvironment().isEmpty()) {
         environment_ = other.environment_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (methodPoliciesBuilder_ == null) {
         if (!other.methodPolicies_.isEmpty()) {
           if (methodPolicies_.isEmpty()) {
             methodPolicies_ = other.methodPolicies_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureMethodPoliciesIsMutable();
             methodPolicies_.addAll(other.methodPolicies_);
@@ -537,7 +520,7 @@ public Builder mergeFrom(com.google.api.Control other) {
             methodPoliciesBuilder_.dispose();
             methodPoliciesBuilder_ = null;
             methodPolicies_ = other.methodPolicies_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             methodPoliciesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getMethodPoliciesFieldBuilder()
@@ -576,7 +559,7 @@ public Builder mergeFrom(
             case 10:
               {
                 environment_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 34:
@@ -680,8 +663,8 @@ public Builder setEnvironment(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       environment_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -700,8 +683,8 @@ public Builder setEnvironment(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEnvironment() {
+
       environment_ = getDefaultInstance().getEnvironment();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -725,8 +708,8 @@ public Builder setEnvironmentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       environment_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -735,9 +718,9 @@ public Builder setEnvironmentBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureMethodPoliciesIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         methodPolicies_ = new java.util.ArrayList(methodPolicies_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -962,7 +945,7 @@ public Builder addAllMethodPolicies(
     public Builder clearMethodPolicies() {
       if (methodPoliciesBuilder_ == null) {
         methodPolicies_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         methodPoliciesBuilder_.clear();
@@ -1091,7 +1074,7 @@ public java.util.List getMethodPoliciesBuil
                 com.google.api.MethodPolicy.Builder,
                 com.google.api.MethodPolicyOrBuilder>(
                 methodPolicies_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000001) != 0),
                 getParentForChildren(),
                 isClean());
         methodPolicies_ = null;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ControlOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ControlOrBuilder.java
index 8892f7d02a..c594e61346 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ControlOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ControlOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/control.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface ControlOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ControlProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ControlProto.java
index 27bcede2fa..15affbd116 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ControlProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ControlProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/control.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class ControlProto {
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 f8448147cd..76a83b6bc0 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -47,6 +46,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;
   }
@@ -59,7 +63,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.api.CppSettings.class, com.google.api.CppSettings.Builder.class);
   }
 
-  private int bitField0_;
   public static final int COMMON_FIELD_NUMBER = 1;
   private com.google.api.CommonLanguageSettings common_;
 
@@ -76,7 +79,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasCommon() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return common_ != null;
   }
 
   /**
@@ -106,7 +109,7 @@ public com.google.api.CommonLanguageSettings getCommon() {
    */
   @java.lang.Override
   public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
-    return common_ == null ? com.google.api.CommonLanguageSettings.getDefaultInstance() : common_;
+    return getCommon();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -123,7 +126,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (common_ != null) {
       output.writeMessage(1, getCommon());
     }
     getUnknownFields().writeTo(output);
@@ -135,7 +138,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (common_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCommon());
     }
     size += getUnknownFields().getSerializedSize();
@@ -298,28 +301,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.CppSettings.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCommonFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      common_ = null;
-      if (commonBuilder_ != null) {
-        commonBuilder_.dispose();
+      if (commonBuilder_ == null) {
+        common_ = null;
+      } else {
+        common_ = null;
         commonBuilder_ = null;
       }
       return this;
@@ -347,23 +341,15 @@ public com.google.api.CppSettings build() {
     @java.lang.Override
     public com.google.api.CppSettings buildPartial() {
       com.google.api.CppSettings result = new com.google.api.CppSettings(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (commonBuilder_ == null) {
+        result.common_ = common_;
+      } else {
+        result.common_ = commonBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.CppSettings result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -441,7 +427,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -461,8 +447,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.api.CommonLanguageSettings common_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.api.CommonLanguageSettings,
@@ -482,7 +466,7 @@ public Builder mergeFrom(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return commonBuilder_ != null || common_ != null;
     }
 
     /**
@@ -521,11 +505,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
           throw new NullPointerException();
         }
         common_ = value;
+        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -541,11 +525,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
     public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderForValue) {
       if (commonBuilder_ == null) {
         common_ = builderForValue.build();
+        onChanged();
       } else {
         commonBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -560,20 +544,19 @@ public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderFo
      */
     public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
       if (commonBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && common_ != null
-            && common_ != com.google.api.CommonLanguageSettings.getDefaultInstance()) {
-          getCommonBuilder().mergeFrom(value);
+        if (common_ != null) {
+          common_ =
+              com.google.api.CommonLanguageSettings.newBuilder(common_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           common_ = value;
         }
+        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-      if (common_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -587,13 +570,14 @@ public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
      * .google.api.CommonLanguageSettings common = 1;
      */
     public Builder clearCommon() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      common_ = null;
-      if (commonBuilder_ != null) {
-        commonBuilder_.dispose();
+      if (commonBuilder_ == null) {
+        common_ = null;
+        onChanged();
+      } else {
+        common_ = null;
         commonBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -607,7 +591,7 @@ public Builder clearCommon() {
      * .google.api.CommonLanguageSettings common = 1;
      */
     public com.google.api.CommonLanguageSettings.Builder getCommonBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getCommonFieldBuilder().getBuilder();
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CppSettingsOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CppSettingsOrBuilder.java
index d8e25ce915..0966b7093f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CppSettingsOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CppSettingsOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface CppSettingsOrBuilder
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 1b08a0781e..9cd8f43666 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/http.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -50,6 +49,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;
   }
@@ -63,9 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int KIND_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object kind_ = "";
+  private volatile java.lang.Object kind_;
 
   /**
    *
@@ -116,9 +118,7 @@ public com.google.protobuf.ByteString getKindBytes() {
   }
 
   public static final int PATH_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object path_ = "";
+  private volatile java.lang.Object path_;
 
   /**
    *
@@ -372,9 +372,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       kind_ = "";
+
       path_ = "";
+
       return this;
     }
 
@@ -400,23 +401,12 @@ public com.google.api.CustomHttpPattern build() {
     @java.lang.Override
     public com.google.api.CustomHttpPattern buildPartial() {
       com.google.api.CustomHttpPattern result = new com.google.api.CustomHttpPattern(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.kind_ = kind_;
+      result.path_ = path_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.CustomHttpPattern result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.kind_ = kind_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.path_ = path_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -464,12 +454,10 @@ public Builder mergeFrom(com.google.api.CustomHttpPattern other) {
       if (other == com.google.api.CustomHttpPattern.getDefaultInstance()) return this;
       if (!other.getKind().isEmpty()) {
         kind_ = other.kind_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getPath().isEmpty()) {
         path_ = other.path_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -501,13 +489,13 @@ public Builder mergeFrom(
             case 10:
               {
                 kind_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 path_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -527,8 +515,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object kind_ = "";
 
     /**
@@ -593,8 +579,8 @@ public Builder setKind(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       kind_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -611,8 +597,8 @@ public Builder setKind(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearKind() {
+
       kind_ = getDefaultInstance().getKind();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -634,8 +620,8 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       kind_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -704,8 +690,8 @@ public Builder setPath(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       path_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -722,8 +708,8 @@ public Builder setPath(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPath() {
+
       path_ = getDefaultInstance().getPath();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -745,8 +731,8 @@ public Builder setPathBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       path_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPatternOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPatternOrBuilder.java
index ec8f1a6125..534a1e0c2d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPatternOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPatternOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/http.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface CustomHttpPatternOrBuilder
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 35906c0c7b..9b249a9586 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/distribution.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -26,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.
@@ -63,6 +60,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;
   }
@@ -136,6 +138,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;
@@ -152,7 +159,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int MIN_FIELD_NUMBER = 1;
-    private double min_ = 0D;
+    private double min_;
 
     /**
      *
@@ -171,7 +178,7 @@ public double getMin() {
     }
 
     public static final int MAX_FIELD_NUMBER = 2;
-    private double max_ = 0D;
+    private double max_;
 
     /**
      *
@@ -402,9 +409,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         min_ = 0D;
+
         max_ = 0D;
+
         return this;
       }
 
@@ -431,23 +439,12 @@ public com.google.api.Distribution.Range build() {
       @java.lang.Override
       public com.google.api.Distribution.Range buildPartial() {
         com.google.api.Distribution.Range result = new com.google.api.Distribution.Range(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        result.min_ = min_;
+        result.max_ = max_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.api.Distribution.Range result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.min_ = min_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.max_ = max_;
-        }
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -530,13 +527,13 @@ public Builder mergeFrom(
               case 9:
                 {
                   min_ = input.readDouble();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 9
               case 17:
                 {
                   max_ = input.readDouble();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 17
               default:
@@ -556,8 +553,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private double min_;
 
       /**
@@ -591,7 +586,6 @@ public double getMin() {
       public Builder setMin(double value) {
 
         min_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -608,7 +602,7 @@ public Builder setMin(double value) {
        * @return This builder for chaining.
        */
       public Builder clearMin() {
-        bitField0_ = (bitField0_ & ~0x00000001);
+
         min_ = 0D;
         onChanged();
         return this;
@@ -647,7 +641,6 @@ public double getMax() {
       public Builder setMax(double value) {
 
         max_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -664,7 +657,7 @@ public Builder setMax(double value) {
        * @return This builder for chaining.
        */
       public Builder clearMax() {
-        bitField0_ = (bitField0_ & ~0x00000002);
+
         max_ = 0D;
         onChanged();
         return this;
@@ -850,7 +843,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();
   }
 
   /**
@@ -861,7 +854,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
@@ -895,6 +887,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;
@@ -962,12 +959,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 <= i < N-1):     offset + (width * i).
-     *
      *    Lower bound (1 <= i < N):       offset + (width * (i - 1)).
      * 

      *
@@ -992,6 +986,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;
@@ -1008,7 +1007,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int NUM_FINITE_BUCKETS_FIELD_NUMBER = 1;
-      private int numFiniteBuckets_ = 0;
+      private int numFiniteBuckets_;
 
       /**
        *
@@ -1027,7 +1026,7 @@ public int getNumFiniteBuckets() {
       }
 
       public static final int WIDTH_FIELD_NUMBER = 2;
-      private double width_ = 0D;
+      private double width_;
 
       /**
        *
@@ -1046,7 +1045,7 @@ public double getWidth() {
       }
 
       public static final int OFFSET_FIELD_NUMBER = 3;
-      private double offset_ = 0D;
+      private double offset_;
 
       /**
        *
@@ -1258,12 +1257,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 <= i < N-1):     offset + (width * i).
-       *
        *    Lower bound (1 <= i < N):       offset + (width * (i - 1)).
        * 

        *
@@ -1299,10 +1295,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
-          bitField0_ = 0;
           numFiniteBuckets_ = 0;
+
           width_ = 0D;
+
           offset_ = 0D;
+
           return this;
         }
 
@@ -1330,26 +1328,13 @@ public com.google.api.Distribution.BucketOptions.Linear build() {
         public com.google.api.Distribution.BucketOptions.Linear buildPartial() {
           com.google.api.Distribution.BucketOptions.Linear result =
               new com.google.api.Distribution.BucketOptions.Linear(this);
-          if (bitField0_ != 0) {
-            buildPartial0(result);
-          }
+          result.numFiniteBuckets_ = numFiniteBuckets_;
+          result.width_ = width_;
+          result.offset_ = offset_;
           onBuilt();
           return result;
         }
 
-        private void buildPartial0(com.google.api.Distribution.BucketOptions.Linear result) {
-          int from_bitField0_ = bitField0_;
-          if (((from_bitField0_ & 0x00000001) != 0)) {
-            result.numFiniteBuckets_ = numFiniteBuckets_;
-          }
-          if (((from_bitField0_ & 0x00000002) != 0)) {
-            result.width_ = width_;
-          }
-          if (((from_bitField0_ & 0x00000004) != 0)) {
-            result.offset_ = offset_;
-          }
-        }
-
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -1436,19 +1421,19 @@ public Builder mergeFrom(
                 case 8:
                   {
                     numFiniteBuckets_ = input.readInt32();
-                    bitField0_ |= 0x00000001;
+
                     break;
                   } // case 8
                 case 17:
                   {
                     width_ = input.readDouble();
-                    bitField0_ |= 0x00000002;
+
                     break;
                   } // case 17
                 case 25:
                   {
                     offset_ = input.readDouble();
-                    bitField0_ |= 0x00000004;
+
                     break;
                   } // case 25
                 default:
@@ -1468,8 +1453,6 @@ public Builder mergeFrom(
           return this;
         }
 
-        private int bitField0_;
-
         private int numFiniteBuckets_;
 
         /**
@@ -1503,7 +1486,6 @@ public int getNumFiniteBuckets() {
         public Builder setNumFiniteBuckets(int value) {
 
           numFiniteBuckets_ = value;
-          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -1520,7 +1502,7 @@ public Builder setNumFiniteBuckets(int value) {
          * @return This builder for chaining.
          */
         public Builder clearNumFiniteBuckets() {
-          bitField0_ = (bitField0_ & ~0x00000001);
+
           numFiniteBuckets_ = 0;
           onChanged();
           return this;
@@ -1559,7 +1541,6 @@ public double getWidth() {
         public Builder setWidth(double value) {
 
           width_ = value;
-          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -1576,7 +1557,7 @@ public Builder setWidth(double value) {
          * @return This builder for chaining.
          */
         public Builder clearWidth() {
-          bitField0_ = (bitField0_ & ~0x00000002);
+
           width_ = 0D;
           onChanged();
           return this;
@@ -1615,7 +1596,6 @@ public double getOffset() {
         public Builder setOffset(double value) {
 
           offset_ = value;
-          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -1632,7 +1612,7 @@ public Builder setOffset(double value) {
          * @return This builder for chaining.
          */
         public Builder clearOffset() {
-          bitField0_ = (bitField0_ & ~0x00000004);
+
           offset_ = 0D;
           onChanged();
           return this;
@@ -1754,12 +1734,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 <= i < N-1):     scale * (growth_factor ^ i).
-     *
      *    Lower bound (1 <= i < N):       scale * (growth_factor ^ (i - 1)).
      * 

      *
@@ -1784,6 +1761,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;
@@ -1800,7 +1782,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int NUM_FINITE_BUCKETS_FIELD_NUMBER = 1;
-      private int numFiniteBuckets_ = 0;
+      private int numFiniteBuckets_;
 
       /**
        *
@@ -1819,7 +1801,7 @@ public int getNumFiniteBuckets() {
       }
 
       public static final int GROWTH_FACTOR_FIELD_NUMBER = 2;
-      private double growthFactor_ = 0D;
+      private double growthFactor_;
 
       /**
        *
@@ -1838,7 +1820,7 @@ public double getGrowthFactor() {
       }
 
       public static final int SCALE_FIELD_NUMBER = 3;
-      private double scale_ = 0D;
+      private double scale_;
 
       /**
        *
@@ -2051,12 +2033,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 <= i < N-1):     scale * (growth_factor ^ i).
-       *
        *    Lower bound (1 <= i < N):       scale * (growth_factor ^ (i - 1)).
        * 

        *
@@ -2092,10 +2071,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
-          bitField0_ = 0;
           numFiniteBuckets_ = 0;
+
           growthFactor_ = 0D;
+
           scale_ = 0D;
+
           return this;
         }
 
@@ -2123,26 +2104,13 @@ public com.google.api.Distribution.BucketOptions.Exponential build() {
         public com.google.api.Distribution.BucketOptions.Exponential buildPartial() {
           com.google.api.Distribution.BucketOptions.Exponential result =
               new com.google.api.Distribution.BucketOptions.Exponential(this);
-          if (bitField0_ != 0) {
-            buildPartial0(result);
-          }
+          result.numFiniteBuckets_ = numFiniteBuckets_;
+          result.growthFactor_ = growthFactor_;
+          result.scale_ = scale_;
           onBuilt();
           return result;
         }
 
-        private void buildPartial0(com.google.api.Distribution.BucketOptions.Exponential result) {
-          int from_bitField0_ = bitField0_;
-          if (((from_bitField0_ & 0x00000001) != 0)) {
-            result.numFiniteBuckets_ = numFiniteBuckets_;
-          }
-          if (((from_bitField0_ & 0x00000002) != 0)) {
-            result.growthFactor_ = growthFactor_;
-          }
-          if (((from_bitField0_ & 0x00000004) != 0)) {
-            result.scale_ = scale_;
-          }
-        }
-
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -2229,19 +2197,19 @@ public Builder mergeFrom(
                 case 8:
                   {
                     numFiniteBuckets_ = input.readInt32();
-                    bitField0_ |= 0x00000001;
+
                     break;
                   } // case 8
                 case 17:
                   {
                     growthFactor_ = input.readDouble();
-                    bitField0_ |= 0x00000002;
+
                     break;
                   } // case 17
                 case 25:
                   {
                     scale_ = input.readDouble();
-                    bitField0_ |= 0x00000004;
+
                     break;
                   } // case 25
                 default:
@@ -2261,8 +2229,6 @@ public Builder mergeFrom(
           return this;
         }
 
-        private int bitField0_;
-
         private int numFiniteBuckets_;
 
         /**
@@ -2296,7 +2262,6 @@ public int getNumFiniteBuckets() {
         public Builder setNumFiniteBuckets(int value) {
 
           numFiniteBuckets_ = value;
-          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -2313,7 +2278,7 @@ public Builder setNumFiniteBuckets(int value) {
          * @return This builder for chaining.
          */
         public Builder clearNumFiniteBuckets() {
-          bitField0_ = (bitField0_ & ~0x00000001);
+
           numFiniteBuckets_ = 0;
           onChanged();
           return this;
@@ -2352,7 +2317,6 @@ public double getGrowthFactor() {
         public Builder setGrowthFactor(double value) {
 
           growthFactor_ = value;
-          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -2369,7 +2333,7 @@ public Builder setGrowthFactor(double value) {
          * @return This builder for chaining.
          */
         public Builder clearGrowthFactor() {
-          bitField0_ = (bitField0_ & ~0x00000002);
+
           growthFactor_ = 0D;
           onChanged();
           return this;
@@ -2408,7 +2372,6 @@ public double getScale() {
         public Builder setScale(double value) {
 
           scale_ = value;
-          bitField0_ |= 0x00000004;
           onChanged();
           return this;
         }
@@ -2425,7 +2388,7 @@ public Builder setScale(double value) {
          * @return This builder for chaining.
          */
         public Builder clearScale() {
-          bitField0_ = (bitField0_ & ~0x00000004);
+
           scale_ = 0D;
           onChanged();
           return this;
@@ -2546,13 +2509,10 @@ public interface ExplicitOrBuilder
      *
      * 
      * Specifies a set of buckets with arbitrary widths.
-     *
      * There are `size(bounds) + 1` (= N) buckets. Bucket `i` has the following
      * boundaries:
-     *
      *    Upper bound (0 <= i < N-1):     bounds[i]
      *    Lower bound (1 <= i < 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.
@@ -2581,6 +2541,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;
@@ -2597,9 +2562,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int BOUNDS_FIELD_NUMBER = 1;
-
-      @SuppressWarnings("serial")
-      private com.google.protobuf.Internal.DoubleList bounds_ = emptyDoubleList();
+      private com.google.protobuf.Internal.DoubleList bounds_;
 
       /**
        *
@@ -2831,13 +2794,10 @@ protected Builder newBuilderForType(
        *
        * 
        * Specifies a set of buckets with arbitrary widths.
-       *
        * There are `size(bounds) + 1` (= N) buckets. Bucket `i` has the following
        * boundaries:
-       *
        *    Upper bound (0 <= i < N-1):     bounds[i]
        *    Lower bound (1 <= i < 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.
@@ -2875,8 +2835,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
-          bitField0_ = 0;
           bounds_ = emptyDoubleList();
+          bitField0_ = (bitField0_ & ~0x00000001);
           return this;
         }
 
@@ -2904,19 +2864,14 @@ public com.google.api.Distribution.BucketOptions.Explicit build() {
         public com.google.api.Distribution.BucketOptions.Explicit buildPartial() {
           com.google.api.Distribution.BucketOptions.Explicit result =
               new com.google.api.Distribution.BucketOptions.Explicit(this);
-          if (bitField0_ != 0) {
-            buildPartial0(result);
-          }
-          onBuilt();
-          return result;
-        }
-
-        private void buildPartial0(com.google.api.Distribution.BucketOptions.Explicit result) {
           int from_bitField0_ = bitField0_;
-          if (((from_bitField0_ & 0x00000001) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             bounds_.makeImmutable();
-            result.bounds_ = bounds_;
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
+          result.bounds_ = bounds_;
+          onBuilt();
+          return result;
         }
 
         @java.lang.Override
@@ -2970,8 +2925,7 @@ public Builder mergeFrom(com.google.api.Distribution.BucketOptions.Explicit othe
           if (!other.bounds_.isEmpty()) {
             if (bounds_.isEmpty()) {
               bounds_ = other.bounds_;
-              bounds_.makeImmutable();
-              bitField0_ |= 0x00000001;
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureBoundsIsMutable();
               bounds_.addAll(other.bounds_);
@@ -3015,8 +2969,7 @@ public Builder mergeFrom(
                   {
                     int length = input.readRawVarint32();
                     int limit = input.pushLimit(length);
-                    int alloc = length > 4096 ? 4096 : length;
-                    ensureBoundsIsMutable(alloc / 8);
+                    ensureBoundsIsMutable();
                     while (input.getBytesUntilLimit() > 0) {
                       bounds_.addDouble(input.readDouble());
                     }
@@ -3045,17 +2998,10 @@ public Builder mergeFrom(
         private com.google.protobuf.Internal.DoubleList bounds_ = emptyDoubleList();
 
         private void ensureBoundsIsMutable() {
-          if (!bounds_.isModifiable()) {
-            bounds_ = makeMutableCopy(bounds_);
+          if (!((bitField0_ & 0x00000001) != 0)) {
+            bounds_ = mutableCopy(bounds_);
+            bitField0_ |= 0x00000001;
           }
-          bitField0_ |= 0x00000001;
-        }
-
-        private void ensureBoundsIsMutable(int capacity) {
-          if (!bounds_.isModifiable()) {
-            bounds_ = makeMutableCopy(bounds_, capacity);
-          }
-          bitField0_ |= 0x00000001;
         }
 
         /**
@@ -3070,8 +3016,9 @@ private void ensureBoundsIsMutable(int capacity) {
          * @return A list containing the bounds.
          */
         public java.util.List getBoundsList() {
-          bounds_.makeImmutable();
-          return bounds_;
+          return ((bitField0_ & 0x00000001) != 0)
+              ? java.util.Collections.unmodifiableList(bounds_)
+              : bounds_;
         }
 
         /**
@@ -3119,10 +3066,8 @@ public double getBounds(int index) {
          * @return This builder for chaining.
          */
         public Builder setBounds(int index, double value) {
-
           ensureBoundsIsMutable();
           bounds_.setDouble(index, value);
-          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -3140,10 +3085,8 @@ public Builder setBounds(int index, double value) {
          * @return This builder for chaining.
          */
         public Builder addBounds(double value) {
-
           ensureBoundsIsMutable();
           bounds_.addDouble(value);
-          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -3163,7 +3106,6 @@ public Builder addBounds(double value) {
         public Builder addAllBounds(java.lang.Iterable values) {
           ensureBoundsIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(values, bounds_);
-          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -3251,8 +3193,6 @@ public com.google.api.Distribution.BucketOptions.Explicit getDefaultInstanceForT
     }
 
     private int optionsCase_ = 0;
-
-    @SuppressWarnings("serial")
     private java.lang.Object options_;
 
     public enum OptionsCase
@@ -3681,7 +3621,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
@@ -3726,7 +3665,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         if (linearBucketsBuilder_ != null) {
           linearBucketsBuilder_.clear();
         }
@@ -3765,30 +3703,30 @@ public com.google.api.Distribution.BucketOptions build() {
       public com.google.api.Distribution.BucketOptions buildPartial() {
         com.google.api.Distribution.BucketOptions result =
             new com.google.api.Distribution.BucketOptions(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
-        buildPartialOneofs(result);
-        onBuilt();
-        return result;
-      }
-
-      private void buildPartial0(com.google.api.Distribution.BucketOptions result) {
-        int from_bitField0_ = bitField0_;
-      }
-
-      private void buildPartialOneofs(com.google.api.Distribution.BucketOptions result) {
-        result.optionsCase_ = optionsCase_;
-        result.options_ = this.options_;
-        if (optionsCase_ == 1 && linearBucketsBuilder_ != null) {
-          result.options_ = linearBucketsBuilder_.build();
+        if (optionsCase_ == 1) {
+          if (linearBucketsBuilder_ == null) {
+            result.options_ = options_;
+          } else {
+            result.options_ = linearBucketsBuilder_.build();
+          }
         }
-        if (optionsCase_ == 2 && exponentialBucketsBuilder_ != null) {
-          result.options_ = exponentialBucketsBuilder_.build();
+        if (optionsCase_ == 2) {
+          if (exponentialBucketsBuilder_ == null) {
+            result.options_ = options_;
+          } else {
+            result.options_ = exponentialBucketsBuilder_.build();
+          }
         }
-        if (optionsCase_ == 3 && explicitBucketsBuilder_ != null) {
-          result.options_ = explicitBucketsBuilder_.build();
+        if (optionsCase_ == 3) {
+          if (explicitBucketsBuilder_ == null) {
+            result.options_ = options_;
+          } else {
+            result.options_ = explicitBucketsBuilder_.build();
+          }
         }
+        result.optionsCase_ = optionsCase_;
+        onBuilt();
+        return result;
       }
 
       @java.lang.Override
@@ -3936,8 +3874,6 @@ public Builder clearOptions() {
         return this;
       }
 
-      private int bitField0_;
-
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.api.Distribution.BucketOptions.Linear,
               com.google.api.Distribution.BucketOptions.Linear.Builder,
@@ -4154,6 +4090,7 @@ public com.google.api.Distribution.BucketOptions.LinearOrBuilder getLinearBucket
         }
         optionsCase_ = 1;
         onChanged();
+        ;
         return linearBucketsBuilder_;
       }
 
@@ -4377,6 +4314,7 @@ public Builder clearExponentialBuckets() {
         }
         optionsCase_ = 2;
         onChanged();
+        ;
         return exponentialBucketsBuilder_;
       }
 
@@ -4599,6 +4537,7 @@ public Builder clearExplicitBuckets() {
         }
         optionsCase_ = 3;
         onChanged();
+        ;
         return explicitBucketsBuilder_;
       }
 
@@ -4727,14 +4666,10 @@ public interface ExemplarOrBuilder
      *
      * 
      * 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.
      * 

@@ -4748,14 +4683,10 @@ public interface ExemplarOrBuilder
      *
      * 
      * 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.
      * 

@@ -4769,14 +4700,10 @@ public interface ExemplarOrBuilder
      *
      * 
      * 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.
      * 

@@ -4790,14 +4717,10 @@ public interface ExemplarOrBuilder
      *
      * 
      * 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.
      * 

@@ -4811,14 +4734,10 @@ public interface ExemplarOrBuilder
      *
      * 
      * 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.
      * 

@@ -4862,6 +4781,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;
@@ -4877,9 +4801,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
               com.google.api.Distribution.Exemplar.Builder.class);
     }
 
-    private int bitField0_;
     public static final int VALUE_FIELD_NUMBER = 1;
-    private double value_ = 0D;
+    private double value_;
 
     /**
      *
@@ -4914,7 +4837,7 @@ public double getValue() {
      */
     @java.lang.Override
     public boolean hasTimestamp() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return timestamp_ != null;
     }
 
     /**
@@ -4944,12 +4867,10 @@ public com.google.protobuf.Timestamp getTimestamp() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getTimestampOrBuilder() {
-      return timestamp_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : timestamp_;
+      return getTimestamp();
     }
 
     public static final int ATTACHMENTS_FIELD_NUMBER = 3;
-
-    @SuppressWarnings("serial")
     private java.util.List attachments_;
 
     /**
@@ -4957,14 +4878,10 @@ public com.google.protobuf.TimestampOrBuilder getTimestampOrBuilder() {
      *
      * 
      * 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.
      * 

@@ -4981,14 +4898,10 @@ public java.util.List getAttachmentsList() {
      *
      * 
      * 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.
      * 

@@ -5006,14 +4919,10 @@ public java.util.List getAttachmentsList() {
      *
      * 
      * 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.
      * 

@@ -5030,14 +4939,10 @@ public int getAttachmentsCount() {
      *
      * 
      * 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.
      * 

@@ -5054,14 +4959,10 @@ public com.google.protobuf.Any getAttachments(int index) {
      *
      * 
      * 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.
      * 

@@ -5090,7 +4991,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (java.lang.Double.doubleToRawLongBits(value_) != 0) {
         output.writeDouble(1, value_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (timestamp_ != null) {
         output.writeMessage(2, getTimestamp());
       }
       for (int i = 0; i < attachments_.size(); i++) {
@@ -5108,7 +5009,7 @@ public int getSerializedSize() {
       if (java.lang.Double.doubleToRawLongBits(value_) != 0) {
         size += com.google.protobuf.CodedOutputStream.computeDoubleSize(1, value_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (timestamp_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getTimestamp());
       }
       for (int i = 0; i < attachments_.size(); i++) {
@@ -5296,30 +5197,21 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.api.Distribution.Exemplar.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getTimestampFieldBuilder();
-          getAttachmentsFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         value_ = 0D;
-        timestamp_ = null;
-        if (timestampBuilder_ != null) {
-          timestampBuilder_.dispose();
+
+        if (timestampBuilder_ == null) {
+          timestamp_ = null;
+        } else {
+          timestamp_ = null;
           timestampBuilder_ = null;
         }
         if (attachmentsBuilder_ == null) {
@@ -5328,7 +5220,7 @@ public Builder clear() {
           attachments_ = null;
           attachmentsBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -5356,37 +5248,24 @@ public com.google.api.Distribution.Exemplar build() {
       public com.google.api.Distribution.Exemplar buildPartial() {
         com.google.api.Distribution.Exemplar result =
             new com.google.api.Distribution.Exemplar(this);
-        buildPartialRepeatedFields(result);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        int from_bitField0_ = bitField0_;
+        result.value_ = value_;
+        if (timestampBuilder_ == null) {
+          result.timestamp_ = timestamp_;
+        } else {
+          result.timestamp_ = timestampBuilder_.build();
         }
-        onBuilt();
-        return result;
-      }
-
-      private void buildPartialRepeatedFields(com.google.api.Distribution.Exemplar result) {
         if (attachmentsBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             attachments_ = java.util.Collections.unmodifiableList(attachments_);
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.attachments_ = attachments_;
         } else {
           result.attachments_ = attachmentsBuilder_.build();
         }
-      }
-
-      private void buildPartial0(com.google.api.Distribution.Exemplar result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.value_ = value_;
-        }
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.timestamp_ = timestampBuilder_ == null ? timestamp_ : timestampBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        result.bitField0_ |= to_bitField0_;
+        onBuilt();
+        return result;
       }
 
       @java.lang.Override
@@ -5446,7 +5325,7 @@ public Builder mergeFrom(com.google.api.Distribution.Exemplar other) {
           if (!other.attachments_.isEmpty()) {
             if (attachments_.isEmpty()) {
               attachments_ = other.attachments_;
-              bitField0_ = (bitField0_ & ~0x00000004);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureAttachmentsIsMutable();
               attachments_.addAll(other.attachments_);
@@ -5459,7 +5338,7 @@ public Builder mergeFrom(com.google.api.Distribution.Exemplar other) {
               attachmentsBuilder_.dispose();
               attachmentsBuilder_ = null;
               attachments_ = other.attachments_;
-              bitField0_ = (bitField0_ & ~0x00000004);
+              bitField0_ = (bitField0_ & ~0x00000001);
               attachmentsBuilder_ =
                   com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                       ? getAttachmentsFieldBuilder()
@@ -5498,13 +5377,13 @@ public Builder mergeFrom(
               case 9:
                 {
                   value_ = input.readDouble();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 9
               case 18:
                 {
                   input.readMessage(getTimestampFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               case 26:
@@ -5573,7 +5452,6 @@ public double getValue() {
       public Builder setValue(double value) {
 
         value_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -5591,7 +5469,7 @@ public Builder setValue(double value) {
        * @return This builder for chaining.
        */
       public Builder clearValue() {
-        bitField0_ = (bitField0_ & ~0x00000001);
+
         value_ = 0D;
         onChanged();
         return this;
@@ -5616,7 +5494,7 @@ public Builder clearValue() {
        * @return Whether the timestamp field is set.
        */
       public boolean hasTimestamp() {
-        return ((bitField0_ & 0x00000002) != 0);
+        return timestampBuilder_ != null || timestamp_ != null;
       }
 
       /**
@@ -5655,11 +5533,11 @@ public Builder setTimestamp(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           timestamp_ = value;
+          onChanged();
         } else {
           timestampBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -5675,11 +5553,11 @@ public Builder setTimestamp(com.google.protobuf.Timestamp value) {
       public Builder setTimestamp(com.google.protobuf.Timestamp.Builder builderForValue) {
         if (timestampBuilder_ == null) {
           timestamp_ = builderForValue.build();
+          onChanged();
         } else {
           timestampBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -5694,20 +5572,19 @@ public Builder setTimestamp(com.google.protobuf.Timestamp.Builder builderForValu
        */
       public Builder mergeTimestamp(com.google.protobuf.Timestamp value) {
         if (timestampBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)
-              && timestamp_ != null
-              && timestamp_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-            getTimestampBuilder().mergeFrom(value);
+          if (timestamp_ != null) {
+            timestamp_ =
+                com.google.protobuf.Timestamp.newBuilder(timestamp_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             timestamp_ = value;
           }
+          onChanged();
         } else {
           timestampBuilder_.mergeFrom(value);
         }
-        if (timestamp_ != null) {
-          bitField0_ |= 0x00000002;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -5721,13 +5598,14 @@ public Builder mergeTimestamp(com.google.protobuf.Timestamp value) {
        * .google.protobuf.Timestamp timestamp = 2;
        */
       public Builder clearTimestamp() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        timestamp_ = null;
-        if (timestampBuilder_ != null) {
-          timestampBuilder_.dispose();
+        if (timestampBuilder_ == null) {
+          timestamp_ = null;
+          onChanged();
+        } else {
+          timestamp_ = null;
           timestampBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -5741,7 +5619,7 @@ public Builder clearTimestamp() {
        * .google.protobuf.Timestamp timestamp = 2;
        */
       public com.google.protobuf.Timestamp.Builder getTimestampBuilder() {
-        bitField0_ |= 0x00000002;
+
         onChanged();
         return getTimestampFieldBuilder().getBuilder();
       }
@@ -5795,9 +5673,9 @@ public com.google.protobuf.TimestampOrBuilder getTimestampOrBuilder() {
           java.util.Collections.emptyList();
 
       private void ensureAttachmentsIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           attachments_ = new java.util.ArrayList(attachments_);
-          bitField0_ |= 0x00000004;
+          bitField0_ |= 0x00000001;
         }
       }
 
@@ -5812,14 +5690,10 @@ private void ensureAttachmentsIsMutable() {
        *
        * 
        * 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.
        * 

@@ -5839,14 +5713,10 @@ public java.util.List getAttachmentsList() {
        *
        * 
        * 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.
        * 

@@ -5866,14 +5736,10 @@ public int getAttachmentsCount() {
        *
        * 
        * 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.
        * 

@@ -5893,14 +5759,10 @@ public com.google.protobuf.Any getAttachments(int index) {
        *
        * 
        * 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.
        * 

@@ -5926,14 +5788,10 @@ public Builder setAttachments(int index, com.google.protobuf.Any value) {
        *
        * 
        * 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.
        * 

@@ -5956,14 +5814,10 @@ public Builder setAttachments(int index, com.google.protobuf.Any.Builder builder
        *
        * 
        * 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.
        * 

@@ -5989,14 +5843,10 @@ public Builder addAttachments(com.google.protobuf.Any value) {
        *
        * 
        * 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.
        * 

@@ -6022,14 +5872,10 @@ public Builder addAttachments(int index, com.google.protobuf.Any value) {
        *
        * 
        * 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.
        * 

@@ -6052,14 +5898,10 @@ public Builder addAttachments(com.google.protobuf.Any.Builder builderForValue) {
        *
        * 
        * 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.
        * 

@@ -6082,14 +5924,10 @@ public Builder addAttachments(int index, com.google.protobuf.Any.Builder builder
        *
        * 
        * 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.
        * 

@@ -6113,14 +5951,10 @@ public Builder addAllAttachments(
        *
        * 
        * 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.
        * 

@@ -6130,7 +5964,7 @@ public Builder addAllAttachments(
       public Builder clearAttachments() {
         if (attachmentsBuilder_ == null) {
           attachments_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
           attachmentsBuilder_.clear();
@@ -6143,14 +5977,10 @@ public Builder clearAttachments() {
        *
        * 
        * 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.
        * 

@@ -6173,14 +6003,10 @@ public Builder removeAttachments(int index) {
        *
        * 
        * 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.
        * 

@@ -6196,14 +6022,10 @@ public com.google.protobuf.Any.Builder getAttachmentsBuilder(int index) {
        *
        * 
        * 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.
        * 

@@ -6223,14 +6045,10 @@ public com.google.protobuf.AnyOrBuilder getAttachmentsOrBuilder(int index) {
        *
        * 
        * 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.
        * 

@@ -6251,14 +6069,10 @@ public com.google.protobuf.AnyOrBuilder getAttachmentsOrBuilder(int index) {
        *
        * 
        * 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.
        * 

@@ -6275,14 +6089,10 @@ public com.google.protobuf.Any.Builder addAttachmentsBuilder() {
        *
        * 
        * 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.
        * 

@@ -6299,14 +6109,10 @@ public com.google.protobuf.Any.Builder addAttachmentsBuilder(int index) {
        *
        * 
        * 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.
        * 

@@ -6329,7 +6135,7 @@ public java.util.List getAttachmentsBuilderList
                   com.google.protobuf.Any.Builder,
                   com.google.protobuf.AnyOrBuilder>(
                   attachments_,
-                  ((bitField0_ & 0x00000004) != 0),
+                  ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
           attachments_ = null;
@@ -6401,9 +6207,8 @@ public com.google.api.Distribution.Exemplar getDefaultInstanceForType() {
     }
   }
 
-  private int bitField0_;
   public static final int COUNT_FIELD_NUMBER = 1;
-  private long count_ = 0L;
+  private long count_;
 
   /**
    *
@@ -6424,7 +6229,7 @@ public long getCount() {
   }
 
   public static final int MEAN_FIELD_NUMBER = 2;
-  private double mean_ = 0D;
+  private double mean_;
 
   /**
    *
@@ -6444,7 +6249,7 @@ public double getMean() {
   }
 
   public static final int SUM_OF_SQUARED_DEVIATION_FIELD_NUMBER = 3;
-  private double sumOfSquaredDeviation_ = 0D;
+  private double sumOfSquaredDeviation_;
 
   /**
    *
@@ -6452,12 +6257,9 @@ public double getMean() {
    * 
    * 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.
    * 

    *
@@ -6487,7 +6289,7 @@ public double getSumOfSquaredDeviation() {
    */
   @java.lang.Override
   public boolean hasRange() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return range_ != null;
   }
 
   /**
@@ -6519,7 +6321,7 @@ public com.google.api.Distribution.Range getRange() {
    */
   @java.lang.Override
   public com.google.api.Distribution.RangeOrBuilder getRangeOrBuilder() {
-    return range_ == null ? com.google.api.Distribution.Range.getDefaultInstance() : range_;
+    return getRange();
   }
 
   public static final int BUCKET_OPTIONS_FIELD_NUMBER = 6;
@@ -6539,7 +6341,7 @@ public com.google.api.Distribution.RangeOrBuilder getRangeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasBucketOptions() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return bucketOptions_ != null;
   }
 
   /**
@@ -6573,15 +6375,11 @@ public com.google.api.Distribution.BucketOptions getBucketOptions() {
    */
   @java.lang.Override
   public com.google.api.Distribution.BucketOptionsOrBuilder getBucketOptionsOrBuilder() {
-    return bucketOptions_ == null
-        ? com.google.api.Distribution.BucketOptions.getDefaultInstance()
-        : bucketOptions_;
+    return getBucketOptions();
   }
 
   public static final int BUCKET_COUNTS_FIELD_NUMBER = 7;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.Internal.LongList bucketCounts_ = emptyLongList();
+  private com.google.protobuf.Internal.LongList bucketCounts_;
 
   /**
    *
@@ -6592,11 +6390,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
@@ -6622,11 +6418,9 @@ public java.util.List 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
@@ -6651,11 +6445,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
@@ -6675,8 +6467,6 @@ public long getBucketCounts(int index) {
   private int bucketCountsMemoizedSerializedSize = -1;
 
   public static final int EXEMPLARS_FIELD_NUMBER = 10;
-
-  @SuppressWarnings("serial")
   private java.util.List exemplars_;
 
   /**
@@ -6774,10 +6564,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (java.lang.Double.doubleToRawLongBits(sumOfSquaredDeviation_) != 0) {
       output.writeDouble(3, sumOfSquaredDeviation_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (range_ != null) {
       output.writeMessage(4, getRange());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (bucketOptions_ != null) {
       output.writeMessage(6, getBucketOptions());
     }
     if (getBucketCountsList().size() > 0) {
@@ -6808,10 +6598,10 @@ public int getSerializedSize() {
     if (java.lang.Double.doubleToRawLongBits(sumOfSquaredDeviation_) != 0) {
       size += com.google.protobuf.CodedOutputStream.computeDoubleSize(3, sumOfSquaredDeviation_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (range_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getRange());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (bucketOptions_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getBucketOptions());
     }
     {
@@ -7005,14 +6795,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.
@@ -7038,48 +6826,42 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Distribution.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getRangeFieldBuilder();
-        getBucketOptionsFieldBuilder();
-        getExemplarsFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       count_ = 0L;
+
       mean_ = 0D;
+
       sumOfSquaredDeviation_ = 0D;
-      range_ = null;
-      if (rangeBuilder_ != null) {
-        rangeBuilder_.dispose();
+
+      if (rangeBuilder_ == null) {
+        range_ = null;
+      } else {
+        range_ = null;
         rangeBuilder_ = null;
       }
-      bucketOptions_ = null;
-      if (bucketOptionsBuilder_ != null) {
-        bucketOptionsBuilder_.dispose();
+      if (bucketOptionsBuilder_ == null) {
+        bucketOptions_ = null;
+      } else {
+        bucketOptions_ = null;
         bucketOptionsBuilder_ = null;
       }
       bucketCounts_ = emptyLongList();
+      bitField0_ = (bitField0_ & ~0x00000001);
       if (exemplarsBuilder_ == null) {
         exemplars_ = java.util.Collections.emptyList();
       } else {
         exemplars_ = null;
         exemplarsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000040);
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -7105,52 +6887,36 @@ public com.google.api.Distribution build() {
     @java.lang.Override
     public com.google.api.Distribution buildPartial() {
       com.google.api.Distribution result = new com.google.api.Distribution(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      result.count_ = count_;
+      result.mean_ = mean_;
+      result.sumOfSquaredDeviation_ = sumOfSquaredDeviation_;
+      if (rangeBuilder_ == null) {
+        result.range_ = range_;
+      } else {
+        result.range_ = rangeBuilder_.build();
       }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.Distribution result) {
+      if (bucketOptionsBuilder_ == null) {
+        result.bucketOptions_ = bucketOptions_;
+      } else {
+        result.bucketOptions_ = bucketOptionsBuilder_.build();
+      }
+      if (((bitField0_ & 0x00000001) != 0)) {
+        bucketCounts_.makeImmutable();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      }
+      result.bucketCounts_ = bucketCounts_;
       if (exemplarsBuilder_ == null) {
-        if (((bitField0_ & 0x00000040) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           exemplars_ = java.util.Collections.unmodifiableList(exemplars_);
-          bitField0_ = (bitField0_ & ~0x00000040);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.exemplars_ = exemplars_;
       } else {
         result.exemplars_ = exemplarsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.Distribution result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.count_ = count_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.mean_ = mean_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.sumOfSquaredDeviation_ = sumOfSquaredDeviation_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.range_ = rangeBuilder_ == null ? range_ : rangeBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.bucketOptions_ =
-            bucketOptionsBuilder_ == null ? bucketOptions_ : bucketOptionsBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        bucketCounts_.makeImmutable();
-        result.bucketCounts_ = bucketCounts_;
-      }
-      result.bitField0_ |= to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -7216,8 +6982,7 @@ public Builder mergeFrom(com.google.api.Distribution other) {
       if (!other.bucketCounts_.isEmpty()) {
         if (bucketCounts_.isEmpty()) {
           bucketCounts_ = other.bucketCounts_;
-          bucketCounts_.makeImmutable();
-          bitField0_ |= 0x00000020;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureBucketCountsIsMutable();
           bucketCounts_.addAll(other.bucketCounts_);
@@ -7228,7 +6993,7 @@ public Builder mergeFrom(com.google.api.Distribution other) {
         if (!other.exemplars_.isEmpty()) {
           if (exemplars_.isEmpty()) {
             exemplars_ = other.exemplars_;
-            bitField0_ = (bitField0_ & ~0x00000040);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureExemplarsIsMutable();
             exemplars_.addAll(other.exemplars_);
@@ -7241,7 +7006,7 @@ public Builder mergeFrom(com.google.api.Distribution other) {
             exemplarsBuilder_.dispose();
             exemplarsBuilder_ = null;
             exemplars_ = other.exemplars_;
-            bitField0_ = (bitField0_ & ~0x00000040);
+            bitField0_ = (bitField0_ & ~0x00000002);
             exemplarsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getExemplarsFieldBuilder()
@@ -7280,31 +7045,31 @@ public Builder mergeFrom(
             case 8:
               {
                 count_ = input.readInt64();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 17:
               {
                 mean_ = input.readDouble();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 17
             case 25:
               {
                 sumOfSquaredDeviation_ = input.readDouble();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 25
             case 34:
               {
                 input.readMessage(getRangeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             case 50:
               {
                 input.readMessage(getBucketOptionsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 50
             case 56:
@@ -7394,7 +7159,6 @@ public long getCount() {
     public Builder setCount(long value) {
 
       count_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -7413,7 +7177,7 @@ public Builder setCount(long value) {
      * @return This builder for chaining.
      */
     public Builder clearCount() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       count_ = 0L;
       onChanged();
       return this;
@@ -7454,7 +7218,6 @@ public double getMean() {
     public Builder setMean(double value) {
 
       mean_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -7472,7 +7235,7 @@ public Builder setMean(double value) {
      * @return This builder for chaining.
      */
     public Builder clearMean() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       mean_ = 0D;
       onChanged();
       return this;
@@ -7486,12 +7249,9 @@ public Builder clearMean() {
      * 
      * 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.
      * 

      *
@@ -7510,12 +7270,9 @@ public double getSumOfSquaredDeviation() {
      * 
      * 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.
      * 

      *
@@ -7527,7 +7284,6 @@ public double getSumOfSquaredDeviation() {
     public Builder setSumOfSquaredDeviation(double value) {
 
       sumOfSquaredDeviation_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -7538,12 +7294,9 @@ public Builder setSumOfSquaredDeviation(double value) {
      * 
      * 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.
      * 

      *
@@ -7552,7 +7305,7 @@ public Builder setSumOfSquaredDeviation(double value) {
      * @return This builder for chaining.
      */
     public Builder clearSumOfSquaredDeviation() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       sumOfSquaredDeviation_ = 0D;
       onChanged();
       return this;
@@ -7578,7 +7331,7 @@ public Builder clearSumOfSquaredDeviation() {
      * @return Whether the range field is set.
      */
     public boolean hasRange() {
-      return ((bitField0_ & 0x00000008) != 0);
+      return rangeBuilder_ != null || range_ != null;
     }
 
     /**
@@ -7617,11 +7370,11 @@ public Builder setRange(com.google.api.Distribution.Range value) {
           throw new NullPointerException();
         }
         range_ = value;
+        onChanged();
       } else {
         rangeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -7638,11 +7391,11 @@ public Builder setRange(com.google.api.Distribution.Range value) {
     public Builder setRange(com.google.api.Distribution.Range.Builder builderForValue) {
       if (rangeBuilder_ == null) {
         range_ = builderForValue.build();
+        onChanged();
       } else {
         rangeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -7658,20 +7411,17 @@ public Builder setRange(com.google.api.Distribution.Range.Builder builderForValu
      */
     public Builder mergeRange(com.google.api.Distribution.Range value) {
       if (rangeBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)
-            && range_ != null
-            && range_ != com.google.api.Distribution.Range.getDefaultInstance()) {
-          getRangeBuilder().mergeFrom(value);
+        if (range_ != null) {
+          range_ =
+              com.google.api.Distribution.Range.newBuilder(range_).mergeFrom(value).buildPartial();
         } else {
           range_ = value;
         }
+        onChanged();
       } else {
         rangeBuilder_.mergeFrom(value);
       }
-      if (range_ != null) {
-        bitField0_ |= 0x00000008;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -7686,13 +7436,14 @@ public Builder mergeRange(com.google.api.Distribution.Range value) {
      * .google.api.Distribution.Range range = 4;
      */
     public Builder clearRange() {
-      bitField0_ = (bitField0_ & ~0x00000008);
-      range_ = null;
-      if (rangeBuilder_ != null) {
-        rangeBuilder_.dispose();
+      if (rangeBuilder_ == null) {
+        range_ = null;
+        onChanged();
+      } else {
+        range_ = null;
         rangeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -7707,7 +7458,7 @@ public Builder clearRange() {
      * .google.api.Distribution.Range range = 4;
      */
     public com.google.api.Distribution.Range.Builder getRangeBuilder() {
-      bitField0_ |= 0x00000008;
+
       onChanged();
       return getRangeFieldBuilder().getBuilder();
     }
@@ -7777,7 +7528,7 @@ public com.google.api.Distribution.RangeOrBuilder getRangeOrBuilder() {
      * @return Whether the bucketOptions field is set.
      */
     public boolean hasBucketOptions() {
-      return ((bitField0_ & 0x00000010) != 0);
+      return bucketOptionsBuilder_ != null || bucketOptions_ != null;
     }
 
     /**
@@ -7818,11 +7569,11 @@ public Builder setBucketOptions(com.google.api.Distribution.BucketOptions value)
           throw new NullPointerException();
         }
         bucketOptions_ = value;
+        onChanged();
       } else {
         bucketOptionsBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -7840,11 +7591,11 @@ public Builder setBucketOptions(
         com.google.api.Distribution.BucketOptions.Builder builderForValue) {
       if (bucketOptionsBuilder_ == null) {
         bucketOptions_ = builderForValue.build();
+        onChanged();
       } else {
         bucketOptionsBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -7860,20 +7611,19 @@ public Builder setBucketOptions(
      */
     public Builder mergeBucketOptions(com.google.api.Distribution.BucketOptions value) {
       if (bucketOptionsBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)
-            && bucketOptions_ != null
-            && bucketOptions_ != com.google.api.Distribution.BucketOptions.getDefaultInstance()) {
-          getBucketOptionsBuilder().mergeFrom(value);
+        if (bucketOptions_ != null) {
+          bucketOptions_ =
+              com.google.api.Distribution.BucketOptions.newBuilder(bucketOptions_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           bucketOptions_ = value;
         }
+        onChanged();
       } else {
         bucketOptionsBuilder_.mergeFrom(value);
       }
-      if (bucketOptions_ != null) {
-        bitField0_ |= 0x00000010;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -7888,13 +7638,14 @@ public Builder mergeBucketOptions(com.google.api.Distribution.BucketOptions valu
      * .google.api.Distribution.BucketOptions bucket_options = 6;
      */
     public Builder clearBucketOptions() {
-      bitField0_ = (bitField0_ & ~0x00000010);
-      bucketOptions_ = null;
-      if (bucketOptionsBuilder_ != null) {
-        bucketOptionsBuilder_.dispose();
+      if (bucketOptionsBuilder_ == null) {
+        bucketOptions_ = null;
+        onChanged();
+      } else {
+        bucketOptions_ = null;
         bucketOptionsBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -7909,7 +7660,7 @@ public Builder clearBucketOptions() {
      * .google.api.Distribution.BucketOptions bucket_options = 6;
      */
     public com.google.api.Distribution.BucketOptions.Builder getBucketOptionsBuilder() {
-      bitField0_ |= 0x00000010;
+
       onChanged();
       return getBucketOptionsFieldBuilder().getBuilder();
     }
@@ -7964,10 +7715,10 @@ public com.google.api.Distribution.BucketOptionsOrBuilder getBucketOptionsOrBuil
     private com.google.protobuf.Internal.LongList bucketCounts_ = emptyLongList();
 
     private void ensureBucketCountsIsMutable() {
-      if (!bucketCounts_.isModifiable()) {
-        bucketCounts_ = makeMutableCopy(bucketCounts_);
+      if (!((bitField0_ & 0x00000001) != 0)) {
+        bucketCounts_ = mutableCopy(bucketCounts_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000020;
     }
 
     /**
@@ -7979,11 +7730,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
@@ -7996,8 +7745,9 @@ private void ensureBucketCountsIsMutable() {
      * @return A list containing the bucketCounts.
      */
     public java.util.List getBucketCountsList() {
-      bucketCounts_.makeImmutable();
-      return bucketCounts_;
+      return ((bitField0_ & 0x00000001) != 0)
+          ? java.util.Collections.unmodifiableList(bucketCounts_)
+          : bucketCounts_;
     }
 
     /**
@@ -8009,11 +7759,9 @@ public java.util.List 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
@@ -8038,11 +7786,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
@@ -8068,11 +7814,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
@@ -8087,10 +7831,8 @@ public long getBucketCounts(int index) {
      * @return This builder for chaining.
      */
     public Builder setBucketCounts(int index, long value) {
-
       ensureBucketCountsIsMutable();
       bucketCounts_.setLong(index, value);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -8104,11 +7846,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
@@ -8122,10 +7862,8 @@ public Builder setBucketCounts(int index, long value) {
      * @return This builder for chaining.
      */
     public Builder addBucketCounts(long value) {
-
       ensureBucketCountsIsMutable();
       bucketCounts_.addLong(value);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -8139,11 +7877,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
@@ -8159,7 +7895,6 @@ public Builder addBucketCounts(long value) {
     public Builder addAllBucketCounts(java.lang.Iterable values) {
       ensureBucketCountsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, bucketCounts_);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -8173,11 +7908,9 @@ public Builder addAllBucketCounts(java.lang.Iterable 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
@@ -8191,7 +7924,7 @@ public Builder addAllBucketCounts(java.lang.Iterable v
      */
     public Builder clearBucketCounts() {
       bucketCounts_ = emptyLongList();
-      bitField0_ = (bitField0_ & ~0x00000020);
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -8200,9 +7933,9 @@ public Builder clearBucketCounts() {
         java.util.Collections.emptyList();
 
     private void ensureExemplarsIsMutable() {
-      if (!((bitField0_ & 0x00000040) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         exemplars_ = new java.util.ArrayList(exemplars_);
-        bitField0_ |= 0x00000040;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -8427,7 +8160,7 @@ public Builder addAllExemplars(
     public Builder clearExemplars() {
       if (exemplarsBuilder_ == null) {
         exemplars_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000040);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         exemplarsBuilder_.clear();
@@ -8555,7 +8288,7 @@ public java.util.List getExemplars
                 com.google.api.Distribution.Exemplar,
                 com.google.api.Distribution.Exemplar.Builder,
                 com.google.api.Distribution.ExemplarOrBuilder>(
-                exemplars_, ((bitField0_ & 0x00000040) != 0), getParentForChildren(), isClean());
+                exemplars_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         exemplars_ = null;
       }
       return exemplarsBuilder_;
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 236fe105cc..d23a9c10b2 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/distribution.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface DistributionOrBuilder
@@ -59,12 +58,9 @@ public interface DistributionOrBuilder
    * 
    * 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.
    * 

    *
@@ -163,11 +159,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
@@ -190,11 +184,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
@@ -217,11 +209,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/DistributionProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DistributionProto.java
index 51e0f80d36..bcecc1dae2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DistributionProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DistributionProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/distribution.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class DistributionProto {
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 6ad2931b17..ef8724cecb 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/documentation.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -24,7 +23,6 @@
  *
  * 
  * `Documentation` provides the information for describing a service.
- *
  * Example:
  * <pre><code>documentation:
  *   summary: >
@@ -51,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:
  * <pre><code>&#91;fully.qualified.proto.name]&#91;]</code></pre>
@@ -66,7 +61,6 @@
  * <pre><code>&#91;display text]&#91;fully.qualified.proto.name]</code></pre>
  * Text can be excluded from doc using the following notation:
  * <pre><code>&#40;-- internal comment --&#41;</code></pre>
- *
  * 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
@@ -108,6 +102,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;
   }
@@ -122,9 +121,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SUMMARY_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object summary_ = "";
+  private volatile java.lang.Object summary_;
 
   /**
    *
@@ -181,8 +178,6 @@ public com.google.protobuf.ByteString getSummaryBytes() {
   }
 
   public static final int PAGES_FIELD_NUMBER = 5;
-
-  @SuppressWarnings("serial")
   private java.util.List pages_;
 
   /**
@@ -256,8 +251,6 @@ public com.google.api.PageOrBuilder getPagesOrBuilder(int index) {
   }
 
   public static final int RULES_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
   private java.util.List rules_;
 
   /**
@@ -265,7 +258,6 @@ public com.google.api.PageOrBuilder getPagesOrBuilder(int index) {
    *
    * 
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -281,7 +273,6 @@ public java.util.List getRulesList() {
    *
    * 
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -298,7 +289,6 @@ public java.util.List getRulesList() {
    *
    * 
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -314,7 +304,6 @@ public int getRulesCount() {
    *
    * 
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -330,7 +319,6 @@ public com.google.api.DocumentationRule getRules(int index) {
    *
    * 
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -342,9 +330,7 @@ public com.google.api.DocumentationRuleOrBuilder getRulesOrBuilder(int index) {
   }
 
   public static final int DOCUMENTATION_ROOT_URL_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object documentationRootUrl_ = "";
+  private volatile java.lang.Object documentationRootUrl_;
 
   /**
    *
@@ -395,9 +381,7 @@ public com.google.protobuf.ByteString getDocumentationRootUrlBytes() {
   }
 
   public static final int SERVICE_ROOT_URL_FIELD_NUMBER = 6;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object serviceRootUrl_ = "";
+  private volatile java.lang.Object serviceRootUrl_;
 
   /**
    *
@@ -454,9 +438,7 @@ public com.google.protobuf.ByteString getServiceRootUrlBytes() {
   }
 
   public static final int OVERVIEW_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object overview_ = "";
+  private volatile java.lang.Object overview_;
 
   /**
    *
@@ -742,7 +724,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * `Documentation` provides the information for describing a service.
-   *
    * Example:
    * <pre><code>documentation:
    *   summary: >
@@ -769,14 +750,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:
    * <pre><code>&#91;fully.qualified.proto.name]&#91;]</code></pre>
@@ -784,7 +762,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * <pre><code>&#91;display text]&#91;fully.qualified.proto.name]</code></pre>
    * Text can be excluded from doc using the following notation:
    * <pre><code>&#40;-- internal comment --&#41;</code></pre>
-   *
    * 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
@@ -827,25 +804,28 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       summary_ = "";
+
       if (pagesBuilder_ == null) {
         pages_ = java.util.Collections.emptyList();
       } else {
         pages_ = null;
         pagesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
       } else {
         rules_ = null;
         rulesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000002);
       documentationRootUrl_ = "";
+
       serviceRootUrl_ = "";
+
       overview_ = "";
+
       return this;
     }
 
@@ -871,49 +851,31 @@ public com.google.api.Documentation build() {
     @java.lang.Override
     public com.google.api.Documentation buildPartial() {
       com.google.api.Documentation result = new com.google.api.Documentation(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.Documentation result) {
+      int from_bitField0_ = bitField0_;
+      result.summary_ = summary_;
       if (pagesBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           pages_ = java.util.Collections.unmodifiableList(pages_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.pages_ = pages_;
       } else {
         result.pages_ = pagesBuilder_.build();
       }
       if (rulesBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.rules_ = rules_;
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.Documentation result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.summary_ = summary_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.documentationRootUrl_ = documentationRootUrl_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.serviceRootUrl_ = serviceRootUrl_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.overview_ = overview_;
-      }
+      result.documentationRootUrl_ = documentationRootUrl_;
+      result.serviceRootUrl_ = serviceRootUrl_;
+      result.overview_ = overview_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -963,14 +925,13 @@ public Builder mergeFrom(com.google.api.Documentation other) {
       if (other == com.google.api.Documentation.getDefaultInstance()) return this;
       if (!other.getSummary().isEmpty()) {
         summary_ = other.summary_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (pagesBuilder_ == null) {
         if (!other.pages_.isEmpty()) {
           if (pages_.isEmpty()) {
             pages_ = other.pages_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensurePagesIsMutable();
             pages_.addAll(other.pages_);
@@ -983,7 +944,7 @@ public Builder mergeFrom(com.google.api.Documentation other) {
             pagesBuilder_.dispose();
             pagesBuilder_ = null;
             pages_ = other.pages_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             pagesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getPagesFieldBuilder()
@@ -997,7 +958,7 @@ public Builder mergeFrom(com.google.api.Documentation other) {
         if (!other.rules_.isEmpty()) {
           if (rules_.isEmpty()) {
             rules_ = other.rules_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureRulesIsMutable();
             rules_.addAll(other.rules_);
@@ -1010,7 +971,7 @@ public Builder mergeFrom(com.google.api.Documentation other) {
             rulesBuilder_.dispose();
             rulesBuilder_ = null;
             rules_ = other.rules_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000002);
             rulesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getRulesFieldBuilder()
@@ -1022,17 +983,14 @@ public Builder mergeFrom(com.google.api.Documentation other) {
       }
       if (!other.getDocumentationRootUrl().isEmpty()) {
         documentationRootUrl_ = other.documentationRootUrl_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (!other.getServiceRootUrl().isEmpty()) {
         serviceRootUrl_ = other.serviceRootUrl_;
-        bitField0_ |= 0x00000010;
         onChanged();
       }
       if (!other.getOverview().isEmpty()) {
         overview_ = other.overview_;
-        bitField0_ |= 0x00000020;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -1064,13 +1022,13 @@ public Builder mergeFrom(
             case 10:
               {
                 summary_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 overview_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 18
             case 26:
@@ -1088,7 +1046,7 @@ public Builder mergeFrom(
             case 34:
               {
                 documentationRootUrl_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             case 42:
@@ -1106,7 +1064,7 @@ public Builder mergeFrom(
             case 50:
               {
                 serviceRootUrl_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 50
             default:
@@ -1201,8 +1159,8 @@ public Builder setSummary(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       summary_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1222,8 +1180,8 @@ public Builder setSummary(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSummary() {
+
       summary_ = getDefaultInstance().getSummary();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1248,8 +1206,8 @@ public Builder setSummaryBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       summary_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1257,9 +1215,9 @@ public Builder setSummaryBytes(com.google.protobuf.ByteString value) {
     private java.util.List pages_ = java.util.Collections.emptyList();
 
     private void ensurePagesIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         pages_ = new java.util.ArrayList(pages_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1479,7 +1437,7 @@ public Builder addAllPages(java.lang.Iterable val
     public Builder clearPages() {
       if (pagesBuilder_ == null) {
         pages_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         pagesBuilder_.clear();
@@ -1600,7 +1558,7 @@ public java.util.List getPagesBuilderList() {
         pagesBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
                 com.google.api.Page, com.google.api.Page.Builder, com.google.api.PageOrBuilder>(
-                pages_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                pages_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         pages_ = null;
       }
       return pagesBuilder_;
@@ -1610,9 +1568,9 @@ public java.util.List getPagesBuilderList() {
         java.util.Collections.emptyList();
 
     private void ensureRulesIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         rules_ = new java.util.ArrayList(rules_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -1627,7 +1585,6 @@ private void ensureRulesIsMutable() {
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1646,7 +1603,6 @@ public java.util.List getRulesList() {
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1665,7 +1621,6 @@ public int getRulesCount() {
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1684,7 +1639,6 @@ public com.google.api.DocumentationRule getRules(int index) {
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1709,7 +1663,6 @@ public Builder setRules(int index, com.google.api.DocumentationRule value) {
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1731,7 +1684,6 @@ public Builder setRules(int index, com.google.api.DocumentationRule.Builder buil
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1756,7 +1708,6 @@ public Builder addRules(com.google.api.DocumentationRule value) {
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1781,7 +1732,6 @@ public Builder addRules(int index, com.google.api.DocumentationRule value) {
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1803,7 +1753,6 @@ public Builder addRules(com.google.api.DocumentationRule.Builder builderForValue
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1825,7 +1774,6 @@ public Builder addRules(int index, com.google.api.DocumentationRule.Builder buil
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1848,7 +1796,6 @@ public Builder addAllRules(
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1857,7 +1804,7 @@ public Builder addAllRules(
     public Builder clearRules() {
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         rulesBuilder_.clear();
@@ -1870,7 +1817,6 @@ public Builder clearRules() {
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1892,7 +1838,6 @@ public Builder removeRules(int index) {
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1907,7 +1852,6 @@ public com.google.api.DocumentationRule.Builder getRulesBuilder(int index) {
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1926,7 +1870,6 @@ public com.google.api.DocumentationRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1946,7 +1889,6 @@ public com.google.api.DocumentationRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1962,7 +1904,6 @@ public com.google.api.DocumentationRule.Builder addRulesBuilder() {
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1978,7 +1919,6 @@ public com.google.api.DocumentationRule.Builder addRulesBuilder(int index) {
      *
      * 
      * A list of documentation rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1999,7 +1939,7 @@ public java.util.List getRulesBuilderL
                 com.google.api.DocumentationRule,
                 com.google.api.DocumentationRule.Builder,
                 com.google.api.DocumentationRuleOrBuilder>(
-                rules_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
+                rules_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         rules_ = null;
       }
       return rulesBuilder_;
@@ -2069,8 +2009,8 @@ public Builder setDocumentationRootUrl(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       documentationRootUrl_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2087,8 +2027,8 @@ public Builder setDocumentationRootUrl(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDocumentationRootUrl() {
+
       documentationRootUrl_ = getDefaultInstance().getDocumentationRootUrl();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -2110,8 +2050,8 @@ public Builder setDocumentationRootUrlBytes(com.google.protobuf.ByteString value
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       documentationRootUrl_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2189,8 +2129,8 @@ public Builder setServiceRootUrl(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       serviceRootUrl_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2210,8 +2150,8 @@ public Builder setServiceRootUrl(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearServiceRootUrl() {
+
       serviceRootUrl_ = getDefaultInstance().getServiceRootUrl();
-      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -2236,8 +2176,8 @@ public Builder setServiceRootUrlBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       serviceRootUrl_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2342,8 +2282,8 @@ public Builder setOverview(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       overview_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2372,8 +2312,8 @@ public Builder setOverview(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearOverview() {
+
       overview_ = getDefaultInstance().getOverview();
-      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -2407,8 +2347,8 @@ public Builder setOverviewBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       overview_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
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 a1de736547..02b5fa7314 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/documentation.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface DocumentationOrBuilder
@@ -116,7 +115,6 @@ public interface DocumentationOrBuilder
    *
    * 
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -129,7 +127,6 @@ public interface DocumentationOrBuilder
    *
    * 
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -142,7 +139,6 @@ public interface DocumentationOrBuilder
    *
    * 
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -155,7 +151,6 @@ public interface DocumentationOrBuilder
    *
    * 
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -168,7 +163,6 @@ public interface DocumentationOrBuilder
    *
    * 
    * A list of documentation rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationProto.java
index 457d3d4dbb..4eebb731b2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/documentation.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class DocumentationProto {
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 6ac65e3af0..0201fa3bfb 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/documentation.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -51,6 +50,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;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object selector_ = "";
+  private volatile java.lang.Object selector_;
 
   /**
    *
@@ -131,9 +133,7 @@ public com.google.protobuf.ByteString getSelectorBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object description_ = "";
+  private volatile java.lang.Object description_;
 
   /**
    *
@@ -188,9 +188,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int DEPRECATION_DESCRIPTION_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object deprecationDescription_ = "";
+  private volatile java.lang.Object deprecationDescription_;
 
   /**
    *
@@ -456,10 +454,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       selector_ = "";
+
       description_ = "";
+
       deprecationDescription_ = "";
+
       return this;
     }
 
@@ -486,26 +486,13 @@ public com.google.api.DocumentationRule build() {
     @java.lang.Override
     public com.google.api.DocumentationRule buildPartial() {
       com.google.api.DocumentationRule result = new com.google.api.DocumentationRule(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.selector_ = selector_;
+      result.description_ = description_;
+      result.deprecationDescription_ = deprecationDescription_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.DocumentationRule result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.selector_ = selector_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.description_ = description_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.deprecationDescription_ = deprecationDescription_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -553,17 +540,14 @@ public Builder mergeFrom(com.google.api.DocumentationRule other) {
       if (other == com.google.api.DocumentationRule.getDefaultInstance()) return this;
       if (!other.getSelector().isEmpty()) {
         selector_ = other.selector_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getDeprecationDescription().isEmpty()) {
         deprecationDescription_ = other.deprecationDescription_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -595,19 +579,19 @@ public Builder mergeFrom(
             case 10:
               {
                 selector_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 description_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 deprecationDescription_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -627,8 +611,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object selector_ = "";
 
     /**
@@ -711,8 +693,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -735,8 +717,8 @@ public Builder setSelector(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSelector() {
+
       selector_ = getDefaultInstance().getSelector();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -764,8 +746,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -840,8 +822,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       description_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -860,8 +842,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
+
       description_ = getDefaultInstance().getDescription();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -885,8 +867,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       description_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -958,8 +940,8 @@ public Builder setDeprecationDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       deprecationDescription_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -977,8 +959,8 @@ public Builder setDeprecationDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDeprecationDescription() {
+
       deprecationDescription_ = getDefaultInstance().getDeprecationDescription();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1001,8 +983,8 @@ public Builder setDeprecationDescriptionBytes(com.google.protobuf.ByteString val
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       deprecationDescription_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationRuleOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationRuleOrBuilder.java
index 3d2170f2a9..376c8ecead 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationRuleOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DocumentationRuleOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/documentation.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface DocumentationRuleOrBuilder
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 366275d651..e5c685794d 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -40,9 +39,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
@@ -51,14 +50,18 @@ 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;
   }
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 2:
         return internalGetRenamedServices();
@@ -77,7 +80,6 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
             com.google.api.DotnetSettings.class, com.google.api.DotnetSettings.Builder.class);
   }
 
-  private int bitField0_;
   public static final int COMMON_FIELD_NUMBER = 1;
   private com.google.api.CommonLanguageSettings common_;
 
@@ -94,7 +96,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
    */
   @java.lang.Override
   public boolean hasCommon() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return common_ != null;
   }
 
   /**
@@ -124,7 +126,7 @@ public com.google.api.CommonLanguageSettings getCommon() {
    */
   @java.lang.Override
   public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
-    return common_ == null ? com.google.api.CommonLanguageSettings.getDefaultInstance() : common_;
+    return getCommon();
   }
 
   public static final int RENAMED_SERVICES_FIELD_NUMBER = 2;
@@ -140,7 +142,6 @@ private static final class RenamedServicesDefaultEntryHolder {
             "");
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField renamedServices_;
 
   private com.google.protobuf.MapField
@@ -216,10 +217,8 @@ public java.util.Map getRenamedServicesMap()
    * map<string, string> renamed_services = 2;
    */
   @java.lang.Override
-  public /* nullable */ java.lang.String getRenamedServicesOrDefault(
-      java.lang.String key,
-      /* nullable */
-      java.lang.String defaultValue) {
+  public java.lang.String getRenamedServicesOrDefault(
+      java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -265,7 +264,6 @@ private static final class RenamedResourcesDefaultEntryHolder {
             "");
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField renamedResources_;
 
   private com.google.protobuf.MapField
@@ -341,10 +339,8 @@ public java.util.Map getRenamedResourcesMap(
    * map<string, string> renamed_resources = 3;
    */
   @java.lang.Override
-  public /* nullable */ java.lang.String getRenamedResourcesOrDefault(
-      java.lang.String key,
-      /* nullable */
-      java.lang.String defaultValue) {
+  public java.lang.String getRenamedResourcesOrDefault(
+      java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -378,10 +374,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_;
 
   /**
    *
@@ -462,10 +455,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_;
 
   /**
    *
@@ -534,10 +524,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_;
 
   /**
    *
@@ -623,7 +610,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (common_ != null) {
       output.writeMessage(1, getCommon());
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
@@ -650,7 +637,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (common_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCommon());
     }
     for (java.util.Map.Entry entry :
@@ -875,8 +862,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 2:
           return internalGetRenamedServices();
@@ -888,8 +874,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 2:
           return internalGetMutableRenamedServices();
@@ -909,35 +894,29 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     }
 
     // Construct using com.google.api.DotnetSettings.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCommonFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      common_ = null;
-      if (commonBuilder_ != null) {
-        commonBuilder_.dispose();
+      if (commonBuilder_ == null) {
+        common_ = null;
+      } else {
+        common_ = null;
         commonBuilder_ = null;
       }
       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_ & ~0x00000004);
+      forcedNamespaceAliases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      handwrittenSignatures_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000010);
       return this;
     }
 
@@ -963,41 +942,33 @@ 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);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.api.DotnetSettings result) {
       int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.renamedServices_ = internalGetRenamedServices();
-        result.renamedServices_.makeImmutable();
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.renamedResources_ = internalGetRenamedResources();
-        result.renamedResources_.makeImmutable();
+      if (commonBuilder_ == null) {
+        result.common_ = common_;
+      } else {
+        result.common_ = commonBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        ignoredResources_.makeImmutable();
-        result.ignoredResources_ = ignoredResources_;
+      result.renamedServices_ = internalGetRenamedServices();
+      result.renamedServices_.makeImmutable();
+      result.renamedResources_ = internalGetRenamedResources();
+      result.renamedResources_.makeImmutable();
+      if (((bitField0_ & 0x00000004) != 0)) {
+        ignoredResources_ = ignoredResources_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000004);
       }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        forcedNamespaceAliases_.makeImmutable();
-        result.forcedNamespaceAliases_ = forcedNamespaceAliases_;
+      result.ignoredResources_ = ignoredResources_;
+      if (((bitField0_ & 0x00000008) != 0)) {
+        forcedNamespaceAliases_ = forcedNamespaceAliases_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000008);
       }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        handwrittenSignatures_.makeImmutable();
-        result.handwrittenSignatures_ = handwrittenSignatures_;
+      result.forcedNamespaceAliases_ = forcedNamespaceAliases_;
+      if (((bitField0_ & 0x00000010) != 0)) {
+        handwrittenSignatures_ = handwrittenSignatures_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000010);
       }
-      result.bitField0_ |= to_bitField0_;
+      result.handwrittenSignatures_ = handwrittenSignatures_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1049,13 +1020,11 @@ public Builder mergeFrom(com.google.api.DotnetSettings other) {
         mergeCommon(other.getCommon());
       }
       internalGetMutableRenamedServices().mergeFrom(other.internalGetRenamedServices());
-      bitField0_ |= 0x00000002;
       internalGetMutableRenamedResources().mergeFrom(other.internalGetRenamedResources());
-      bitField0_ |= 0x00000004;
       if (!other.ignoredResources_.isEmpty()) {
         if (ignoredResources_.isEmpty()) {
           ignoredResources_ = other.ignoredResources_;
-          bitField0_ |= 0x00000008;
+          bitField0_ = (bitField0_ & ~0x00000004);
         } else {
           ensureIgnoredResourcesIsMutable();
           ignoredResources_.addAll(other.ignoredResources_);
@@ -1065,7 +1034,7 @@ public Builder mergeFrom(com.google.api.DotnetSettings other) {
       if (!other.forcedNamespaceAliases_.isEmpty()) {
         if (forcedNamespaceAliases_.isEmpty()) {
           forcedNamespaceAliases_ = other.forcedNamespaceAliases_;
-          bitField0_ |= 0x00000010;
+          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
           ensureForcedNamespaceAliasesIsMutable();
           forcedNamespaceAliases_.addAll(other.forcedNamespaceAliases_);
@@ -1075,7 +1044,7 @@ public Builder mergeFrom(com.google.api.DotnetSettings other) {
       if (!other.handwrittenSignatures_.isEmpty()) {
         if (handwrittenSignatures_.isEmpty()) {
           handwrittenSignatures_ = other.handwrittenSignatures_;
-          bitField0_ |= 0x00000020;
+          bitField0_ = (bitField0_ & ~0x00000010);
         } else {
           ensureHandwrittenSignaturesIsMutable();
           handwrittenSignatures_.addAll(other.handwrittenSignatures_);
@@ -1111,7 +1080,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -1123,7 +1092,6 @@ public Builder mergeFrom(
                 internalGetMutableRenamedServices()
                     .getMutableMap()
                     .put(renamedServices__.getKey(), renamedServices__.getValue());
-                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
@@ -1136,7 +1104,6 @@ public Builder mergeFrom(
                 internalGetMutableRenamedResources()
                     .getMutableMap()
                     .put(renamedResources__.getKey(), renamedResources__.getValue());
-                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
@@ -1198,7 +1165,7 @@ public Builder mergeFrom(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return commonBuilder_ != null || common_ != null;
     }
 
     /**
@@ -1237,11 +1204,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
           throw new NullPointerException();
         }
         common_ = value;
+        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -1257,11 +1224,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
     public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderForValue) {
       if (commonBuilder_ == null) {
         common_ = builderForValue.build();
+        onChanged();
       } else {
         commonBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -1276,20 +1243,19 @@ public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderFo
      */
     public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
       if (commonBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && common_ != null
-            && common_ != com.google.api.CommonLanguageSettings.getDefaultInstance()) {
-          getCommonBuilder().mergeFrom(value);
+        if (common_ != null) {
+          common_ =
+              com.google.api.CommonLanguageSettings.newBuilder(common_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           common_ = value;
         }
+        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-      if (common_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1303,13 +1269,14 @@ public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
      * .google.api.CommonLanguageSettings common = 1;
      */
     public Builder clearCommon() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      common_ = null;
-      if (commonBuilder_ != null) {
-        commonBuilder_.dispose();
+      if (commonBuilder_ == null) {
+        common_ = null;
+        onChanged();
+      } else {
+        common_ = null;
         commonBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1323,7 +1290,7 @@ public Builder clearCommon() {
      * .google.api.CommonLanguageSettings common = 1;
      */
     public com.google.api.CommonLanguageSettings.Builder getCommonBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getCommonFieldBuilder().getBuilder();
     }
@@ -1386,6 +1353,8 @@ public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
 
     private com.google.protobuf.MapField
         internalGetMutableRenamedServices() {
+      onChanged();
+      ;
       if (renamedServices_ == null) {
         renamedServices_ =
             com.google.protobuf.MapField.newMapField(
@@ -1394,8 +1363,6 @@ public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
       if (!renamedServices_.isMutable()) {
         renamedServices_ = renamedServices_.copy();
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
       return renamedServices_;
     }
 
@@ -1463,10 +1430,8 @@ public java.util.Map getRenamedServicesMap()
      * map<string, string> renamed_services = 2;
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getRenamedServicesOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getRenamedServicesOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1500,7 +1465,6 @@ public java.lang.String getRenamedServicesOrThrow(java.lang.String key) {
     }
 
     public Builder clearRenamedServices() {
-      bitField0_ = (bitField0_ & ~0x00000002);
       internalGetMutableRenamedServices().getMutableMap().clear();
       return this;
     }
@@ -1529,7 +1493,6 @@ public Builder removeRenamedServices(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableRenamedServices() {
-      bitField0_ |= 0x00000002;
       return internalGetMutableRenamedServices().getMutableMap();
     }
 
@@ -1553,8 +1516,8 @@ public Builder putRenamedServices(java.lang.String key, java.lang.String value)
       if (value == null) {
         throw new NullPointerException("map value");
       }
+
       internalGetMutableRenamedServices().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000002;
       return this;
     }
 
@@ -1573,7 +1536,6 @@ public Builder putRenamedServices(java.lang.String key, java.lang.String value)
      */
     public Builder putAllRenamedServices(java.util.Map values) {
       internalGetMutableRenamedServices().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000002;
       return this;
     }
 
@@ -1590,6 +1552,8 @@ public Builder putAllRenamedServices(java.util.Map
         internalGetMutableRenamedResources() {
+      onChanged();
+      ;
       if (renamedResources_ == null) {
         renamedResources_ =
             com.google.protobuf.MapField.newMapField(
@@ -1598,8 +1562,6 @@ public Builder putAllRenamedServices(java.util.Map getRenamedResourcesMap(
      * map<string, string> renamed_resources = 3;
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getRenamedResourcesOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getRenamedResourcesOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1706,7 +1666,6 @@ public java.lang.String getRenamedResourcesOrThrow(java.lang.String key) {
     }
 
     public Builder clearRenamedResources() {
-      bitField0_ = (bitField0_ & ~0x00000004);
       internalGetMutableRenamedResources().getMutableMap().clear();
       return this;
     }
@@ -1735,7 +1694,6 @@ public Builder removeRenamedResources(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableRenamedResources() {
-      bitField0_ |= 0x00000004;
       return internalGetMutableRenamedResources().getMutableMap();
     }
 
@@ -1759,8 +1717,8 @@ public Builder putRenamedResources(java.lang.String key, java.lang.String value)
       if (value == null) {
         throw new NullPointerException("map value");
       }
+
       internalGetMutableRenamedResources().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000004;
       return this;
     }
 
@@ -1780,18 +1738,17 @@ public Builder putRenamedResources(java.lang.String key, java.lang.String value)
     public Builder putAllRenamedResources(
         java.util.Map values) {
       internalGetMutableRenamedResources().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000004;
       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_ & 0x00000004) != 0)) {
         ignoredResources_ = new com.google.protobuf.LazyStringArrayList(ignoredResources_);
+        bitField0_ |= 0x00000004;
       }
-      bitField0_ |= 0x00000008;
     }
 
     /**
@@ -1810,8 +1767,7 @@ private void ensureIgnoredResourcesIsMutable() {
      * @return A list containing the ignoredResources.
      */
     public com.google.protobuf.ProtocolStringList getIgnoredResourcesList() {
-      ignoredResources_.makeImmutable();
-      return ignoredResources_;
+      return ignoredResources_.getUnmodifiableView();
     }
 
     /**
@@ -1896,7 +1852,6 @@ public Builder setIgnoredResources(int index, java.lang.String value) {
       }
       ensureIgnoredResourcesIsMutable();
       ignoredResources_.set(index, value);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1923,7 +1878,6 @@ public Builder addIgnoredResources(java.lang.String value) {
       }
       ensureIgnoredResourcesIsMutable();
       ignoredResources_.add(value);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1947,7 +1901,6 @@ public Builder addIgnoredResources(java.lang.String value) {
     public Builder addAllIgnoredResources(java.lang.Iterable values) {
       ensureIgnoredResourcesIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, ignoredResources_);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1968,9 +1921,8 @@ public Builder addAllIgnoredResources(java.lang.Iterable value
      * @return This builder for chaining.
      */
     public Builder clearIgnoredResources() {
-      ignoredResources_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000008);
-      ;
+      ignoredResources_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1998,20 +1950,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_ & 0x00000008) != 0)) {
         forcedNamespaceAliases_ =
             new com.google.protobuf.LazyStringArrayList(forcedNamespaceAliases_);
+        bitField0_ |= 0x00000008;
       }
-      bitField0_ |= 0x00000010;
     }
 
     /**
@@ -2027,8 +1978,7 @@ private void ensureForcedNamespaceAliasesIsMutable() {
      * @return A list containing the forcedNamespaceAliases.
      */
     public com.google.protobuf.ProtocolStringList getForcedNamespaceAliasesList() {
-      forcedNamespaceAliases_.makeImmutable();
-      return forcedNamespaceAliases_;
+      return forcedNamespaceAliases_.getUnmodifiableView();
     }
 
     /**
@@ -2101,7 +2051,6 @@ public Builder setForcedNamespaceAliases(int index, java.lang.String value) {
       }
       ensureForcedNamespaceAliasesIsMutable();
       forcedNamespaceAliases_.set(index, value);
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2125,7 +2074,6 @@ public Builder addForcedNamespaceAliases(java.lang.String value) {
       }
       ensureForcedNamespaceAliasesIsMutable();
       forcedNamespaceAliases_.add(value);
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2146,7 +2094,6 @@ public Builder addForcedNamespaceAliases(java.lang.String value) {
     public Builder addAllForcedNamespaceAliases(java.lang.Iterable values) {
       ensureForcedNamespaceAliasesIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, forcedNamespaceAliases_);
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2164,9 +2111,8 @@ public Builder addAllForcedNamespaceAliases(java.lang.Iterable
      * @return This builder for chaining.
      */
     public Builder clearForcedNamespaceAliases() {
-      forcedNamespaceAliases_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000010);
-      ;
+      forcedNamespaceAliases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -2191,20 +2137,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_ & 0x00000010) != 0)) {
         handwrittenSignatures_ =
             new com.google.protobuf.LazyStringArrayList(handwrittenSignatures_);
+        bitField0_ |= 0x00000010;
       }
-      bitField0_ |= 0x00000020;
     }
 
     /**
@@ -2221,8 +2166,7 @@ private void ensureHandwrittenSignaturesIsMutable() {
      * @return A list containing the handwrittenSignatures.
      */
     public com.google.protobuf.ProtocolStringList getHandwrittenSignaturesList() {
-      handwrittenSignatures_.makeImmutable();
-      return handwrittenSignatures_;
+      return handwrittenSignatures_.getUnmodifiableView();
     }
 
     /**
@@ -2299,7 +2243,6 @@ public Builder setHandwrittenSignatures(int index, java.lang.String value) {
       }
       ensureHandwrittenSignaturesIsMutable();
       handwrittenSignatures_.set(index, value);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2324,7 +2267,6 @@ public Builder addHandwrittenSignatures(java.lang.String value) {
       }
       ensureHandwrittenSignaturesIsMutable();
       handwrittenSignatures_.add(value);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2346,7 +2288,6 @@ public Builder addHandwrittenSignatures(java.lang.String value) {
     public Builder addAllHandwrittenSignatures(java.lang.Iterable values) {
       ensureHandwrittenSignaturesIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, handwrittenSignatures_);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2365,9 +2306,8 @@ public Builder addAllHandwrittenSignatures(java.lang.Iterable
      * @return This builder for chaining.
      */
     public Builder clearHandwrittenSignatures() {
-      handwrittenSignatures_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000020);
-      ;
+      handwrittenSignatures_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -2393,7 +2333,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/DotnetSettingsOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DotnetSettingsOrBuilder.java
index 975300894a..352b156f7a 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DotnetSettingsOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/DotnetSettingsOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface DotnetSettingsOrBuilder
@@ -123,6 +122,7 @@ public interface DotnetSettingsOrBuilder
    *
    * map<string, string> renamed_services = 2;
    */
+
   /* nullable */
   java.lang.String getRenamedServicesOrDefault(
       java.lang.String key,
@@ -206,6 +206,7 @@ java.lang.String getRenamedServicesOrDefault(
    *
    * map<string, string> renamed_resources = 3;
    */
+
   /* nullable */
   java.lang.String getRenamedResourcesOrDefault(
       java.lang.String key,
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 62b5d9f1ef..84bb418381 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/endpoint.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -27,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:
@@ -61,7 +58,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_ = "";
   }
 
@@ -71,6 +68,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;
   }
@@ -84,9 +86,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -137,10 +137,7 @@ 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_;
 
   /**
    *
@@ -213,9 +210,7 @@ public com.google.protobuf.ByteString getAliasesBytes(int index) {
   }
 
   public static final int TARGET_FIELD_NUMBER = 101;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object target_ = "";
+  private volatile java.lang.Object target_;
 
   /**
    *
@@ -274,7 +269,7 @@ public com.google.protobuf.ByteString getTargetBytes() {
   }
 
   public static final int ALLOW_CORS_FIELD_NUMBER = 5;
-  private boolean allowCors_ = false;
+  private boolean allowCors_;
 
   /**
    *
@@ -497,9 +492,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:
@@ -544,11 +537,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
-      aliases_ = com.google.protobuf.LazyStringArrayList.emptyList();
+
+      aliases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       target_ = "";
+
       allowCors_ = false;
+
       return this;
     }
 
@@ -574,30 +570,19 @@ 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);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      result.name_ = name_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        aliases_ = aliases_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
+      result.aliases_ = aliases_;
+      result.target_ = target_;
+      result.allowCors_ = allowCors_;
       onBuilt();
       return result;
     }
 
-    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_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.allowCors_ = allowCors_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -645,13 +630,12 @@ public Builder mergeFrom(com.google.api.Endpoint other) {
       if (other == com.google.api.Endpoint.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.aliases_.isEmpty()) {
         if (aliases_.isEmpty()) {
           aliases_ = other.aliases_;
-          bitField0_ |= 0x00000002;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureAliasesIsMutable();
           aliases_.addAll(other.aliases_);
@@ -660,7 +644,6 @@ public Builder mergeFrom(com.google.api.Endpoint other) {
       }
       if (!other.getTarget().isEmpty()) {
         target_ = other.target_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.getAllowCors() != false) {
@@ -695,7 +678,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -708,13 +691,13 @@ public Builder mergeFrom(
             case 40:
               {
                 allowCors_ = input.readBool();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 40
             case 810:
               {
                 target_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 810
             default:
@@ -800,8 +783,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -818,8 +801,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -841,20 +824,20 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       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_ & 0x00000001) != 0)) {
         aliases_ = new com.google.protobuf.LazyStringArrayList(aliases_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000002;
     }
 
     /**
@@ -871,8 +854,7 @@ private void ensureAliasesIsMutable() {
      * @return A list containing the aliases.
      */
     public com.google.protobuf.ProtocolStringList getAliasesList() {
-      aliases_.makeImmutable();
-      return aliases_;
+      return aliases_.getUnmodifiableView();
     }
 
     /**
@@ -949,7 +931,6 @@ public Builder setAliases(int index, java.lang.String value) {
       }
       ensureAliasesIsMutable();
       aliases_.set(index, value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -974,7 +955,6 @@ public Builder addAliases(java.lang.String value) {
       }
       ensureAliasesIsMutable();
       aliases_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -996,7 +976,6 @@ public Builder addAliases(java.lang.String value) {
     public Builder addAllAliases(java.lang.Iterable values) {
       ensureAliasesIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, aliases_);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1015,9 +994,8 @@ public Builder addAllAliases(java.lang.Iterable values) {
      * @return This builder for chaining.
      */
     public Builder clearAliases() {
-      aliases_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000002);
-      ;
+      aliases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1043,7 +1021,6 @@ public Builder addAliasesBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureAliasesIsMutable();
       aliases_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1124,8 +1101,8 @@ public Builder setTarget(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       target_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1146,8 +1123,8 @@ public Builder setTarget(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTarget() {
+
       target_ = getDefaultInstance().getTarget();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1173,8 +1150,8 @@ public Builder setTargetBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       target_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1222,7 +1199,6 @@ public boolean getAllowCors() {
     public Builder setAllowCors(boolean value) {
 
       allowCors_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1244,7 +1220,7 @@ public Builder setAllowCors(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearAllowCors() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       allowCors_ = false;
       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 a43970103f..e2b3e769c2 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/endpoint.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface EndpointOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/EndpointProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/EndpointProto.java
index d22d39c93d..19e0c2a4d5 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/EndpointProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/EndpointProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/endpoint.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class EndpointProto {
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 09154889ee..3ecb6173ba 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/error_reason.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -53,10 +52,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * 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": {
@@ -64,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".
    * 

@@ -77,11 +73,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * 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": {
@@ -89,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.
    * 

    *
@@ -103,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": {
@@ -124,11 +115,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -147,11 +136,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -170,11 +157,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -193,11 +178,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -216,11 +199,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -239,13 +220,11 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -255,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": {
@@ -281,12 +258,10 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -296,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": {
@@ -323,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": {
@@ -336,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.
    * 

@@ -352,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": {
@@ -376,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": {
@@ -398,10 +364,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -424,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": {
@@ -447,10 +409,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * 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": {
@@ -473,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": {
@@ -496,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": {
@@ -524,10 +479,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -548,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": {
@@ -572,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": {
@@ -596,10 +545,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -619,12 +566,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -645,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": {
@@ -666,14 +608,11 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * 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": {
@@ -693,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"
@@ -716,11 +653,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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"
@@ -739,12 +674,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * 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": {
@@ -752,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).
    * 

@@ -765,10 +696,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * 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": {
@@ -776,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.
    * 

    *
@@ -789,10 +717,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * The request violates the location policies when creating resources in
    * the restricted region.
-   *
    * Example of an ErrorInfo when creating the Cloud Storage Bucket by
    * "projects/123" for service storage.googleapis.com:
-   *
    *     { "reason": "LOCATION_POLICY_VIOLATED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -800,7 +726,6 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "service": "storage.googleapis.com",
    *       }
    *     }
-   *
    * This response indicates creating the Cloud Storage Bucket in
    * "locations/asia-northeast3" violates at least one location policy.
    * The troubleshooting guidance is provided in the Help links.
@@ -814,11 +739,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * The request is denied because origin request header is missing.
-   *
    * Example of an ErrorInfo when
    * accessing "pubsub.googleapis.com" service with an empty "Origin" request
    * header.
-   *
    * {
    *   reason: "MISSING_ORIGIN"
    *   domain: "googleapis.com"
@@ -839,10 +762,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * The request is denied because the request contains more than one credential
    * type that are individually acceptable, but not together. The customer
    * should retry their request with only one set of credentials.
-   *
    * Example of an ErrorInfo when
    * accessing "pubsub.googleapis.com" service with overloaded credentials.
-   *
    * {
    *   reason: "OVERLOADED_CREDENTIALS"
    *   domain: "googleapis.com"
@@ -875,10 +796,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * 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": {
@@ -886,7 +805,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".
    * 

@@ -900,11 +818,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * 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": {
@@ -912,7 +828,6 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "service": "pubsub.googleapis.com"
    *       }
    *     }
-   *
    * This response indicates the billing account associated has been disabled.
    * 

    *
@@ -927,10 +842,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": {
@@ -949,11 +862,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -973,11 +884,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -997,11 +906,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -1021,11 +928,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -1045,11 +950,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -1069,13 +972,11 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -1085,12 +986,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": {
@@ -1112,12 +1011,10 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -1127,12 +1024,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": {
@@ -1155,11 +1050,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": {
@@ -1168,7 +1061,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.
    * 

@@ -1185,10 +1077,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": {
@@ -1210,10 +1100,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": {
@@ -1233,10 +1121,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -1260,11 +1146,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": {
@@ -1284,10 +1168,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * 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": {
@@ -1311,10 +1193,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": {
@@ -1335,15 +1215,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": {
@@ -1364,10 +1241,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -1389,10 +1264,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": {
@@ -1414,11 +1287,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": {
@@ -1439,10 +1310,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -1463,12 +1332,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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": {
@@ -1490,10 +1356,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": {
@@ -1512,14 +1376,11 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * 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": {
@@ -1540,10 +1401,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"
@@ -1564,11 +1423,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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"
@@ -1588,12 +1445,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * 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": {
@@ -1601,7 +1455,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).
    * 

@@ -1615,10 +1468,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * 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": {
@@ -1626,7 +1477,6 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "service": "pubsub.googleapis.com"
    *       }
    *     }
-   *
    * This response indicates the associated GCP account has been suspended.
    * 

    *
@@ -1640,10 +1490,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * The request violates the location policies when creating resources in
    * the restricted region.
-   *
    * Example of an ErrorInfo when creating the Cloud Storage Bucket by
    * "projects/123" for service storage.googleapis.com:
-   *
    *     { "reason": "LOCATION_POLICY_VIOLATED",
    *       "domain": "googleapis.com",
    *       "metadata": {
@@ -1651,7 +1499,6 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *         "service": "storage.googleapis.com",
    *       }
    *     }
-   *
    * This response indicates creating the Cloud Storage Bucket in
    * "locations/asia-northeast3" violates at least one location policy.
    * The troubleshooting guidance is provided in the Help links.
@@ -1666,11 +1513,9 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * The request is denied because origin request header is missing.
-   *
    * Example of an ErrorInfo when
    * accessing "pubsub.googleapis.com" service with an empty "Origin" request
    * header.
-   *
    * {
    *   reason: "MISSING_ORIGIN"
    *   domain: "googleapis.com"
@@ -1692,10 +1537,8 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum {
    * The request is denied because the request contains more than one credential
    * type that are individually acceptable, but not together. The customer
    * should retry their request with only one set of credentials.
-   *
    * Example of an ErrorInfo when
    * accessing "pubsub.googleapis.com" service with overloaded credentials.
-   *
    * {
    *   reason: "OVERLOADED_CREDENTIALS"
    *   domain: "googleapis.com"
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ErrorReasonProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ErrorReasonProto.java
index c14d315414..f8083aca42 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ErrorReasonProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ErrorReasonProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/error_reason.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class ErrorReasonProto {
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 fb27344c0e..dc201e8641 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/field_behavior.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -27,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.
  * 

  *
@@ -139,10 +137,8 @@ public enum FieldBehavior implements com.google.protobuf.ProtocolMessageEnum {
    * google.api.resource) is used in the resource name to uniquely identify the
    * resource. For AIP-compliant APIs, this should only be applied to the
    * `name` field on the resource.
-   *
    * This behavior should not be applied to references to other resources within
    * the message.
-   *
    * The identifier field of resources often have different field behavior
    * depending on the request it is embedded in (e.g. for Create methods name
    * is optional and unused, while for Update methods it is required). Instead
@@ -268,10 +264,8 @@ public enum FieldBehavior implements com.google.protobuf.ProtocolMessageEnum {
    * google.api.resource) is used in the resource name to uniquely identify the
    * resource. For AIP-compliant APIs, this should only be applied to the
    * `name` field on the resource.
-   *
    * This behavior should not be applied to references to other resources within
    * the message.
-   *
    * The identifier field of resources often have different field behavior
    * depending on the request it is embedded in (e.g. for Create methods name
    * is optional and unused, while for Update methods it is required). Instead
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 17cd087c69..eb0fd208e1 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/field_behavior.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class FieldBehaviorProto {
@@ -38,9 +37,7 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
    * 
    * 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/FieldInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfo.java
index 99e7798e26..ead04cf29b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfo.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/field_info.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new FieldInfo();
   }
 
+  @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.FieldInfoProto.internal_static_google_api_FieldInfo_descriptor;
   }
@@ -295,7 +299,7 @@ private Format(int value) {
   }
 
   public static final int FORMAT_FIELD_NUMBER = 1;
-  private int format_ = 0;
+  private int format_;
 
   /**
    *
@@ -330,13 +334,12 @@ public int getFormatValue() {
    */
   @java.lang.Override
   public com.google.api.FieldInfo.Format getFormat() {
-    com.google.api.FieldInfo.Format result = com.google.api.FieldInfo.Format.forNumber(format_);
+    @SuppressWarnings("deprecation")
+    com.google.api.FieldInfo.Format result = com.google.api.FieldInfo.Format.valueOf(format_);
     return result == null ? com.google.api.FieldInfo.Format.UNRECOGNIZED : result;
   }
 
   public static final int REFERENCED_TYPES_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List referencedTypes_;
 
   /**
@@ -344,7 +347,6 @@ public com.google.api.FieldInfo.Format getFormat() {
    *
    * 
    * The type(s) that the annotated, generic field may represent.
-   *
    * Currently, this must only be used on fields of type `google.protobuf.Any`.
    * Supporting other generic types may be considered in the future.
    * 

@@ -361,7 +363,6 @@ public java.util.List getReferencedTypesList() {
    *
    * 
    * The type(s) that the annotated, generic field may represent.
-   *
    * Currently, this must only be used on fields of type `google.protobuf.Any`.
    * Supporting other generic types may be considered in the future.
    * 

@@ -379,7 +380,6 @@ public java.util.List getReferencedTypesList() {
    *
    * 
    * The type(s) that the annotated, generic field may represent.
-   *
    * Currently, this must only be used on fields of type `google.protobuf.Any`.
    * Supporting other generic types may be considered in the future.
    * 

@@ -396,7 +396,6 @@ public int getReferencedTypesCount() {
    *
    * 
    * The type(s) that the annotated, generic field may represent.
-   *
    * Currently, this must only be used on fields of type `google.protobuf.Any`.
    * Supporting other generic types may be considered in the future.
    * 

@@ -413,7 +412,6 @@ public com.google.api.TypeReference getReferencedTypes(int index) {
    *
    * 
    * The type(s) that the annotated, generic field may represent.
-   *
    * Currently, this must only be used on fields of type `google.protobuf.Any`.
    * Supporting other generic types may be considered in the future.
    * 

@@ -629,15 +627,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       format_ = 0;
+
       if (referencedTypesBuilder_ == null) {
         referencedTypes_ = java.util.Collections.emptyList();
       } else {
         referencedTypes_ = null;
         referencedTypesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -663,31 +661,19 @@ public com.google.api.FieldInfo build() {
     @java.lang.Override
     public com.google.api.FieldInfo buildPartial() {
       com.google.api.FieldInfo result = new com.google.api.FieldInfo(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.FieldInfo result) {
+      int from_bitField0_ = bitField0_;
+      result.format_ = format_;
       if (referencedTypesBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           referencedTypes_ = java.util.Collections.unmodifiableList(referencedTypes_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.referencedTypes_ = referencedTypes_;
       } else {
         result.referencedTypes_ = referencedTypesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.FieldInfo result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.format_ = format_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -742,7 +728,7 @@ public Builder mergeFrom(com.google.api.FieldInfo other) {
         if (!other.referencedTypes_.isEmpty()) {
           if (referencedTypes_.isEmpty()) {
             referencedTypes_ = other.referencedTypes_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureReferencedTypesIsMutable();
             referencedTypes_.addAll(other.referencedTypes_);
@@ -755,7 +741,7 @@ public Builder mergeFrom(com.google.api.FieldInfo other) {
             referencedTypesBuilder_.dispose();
             referencedTypesBuilder_ = null;
             referencedTypes_ = other.referencedTypes_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             referencedTypesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getReferencedTypesFieldBuilder()
@@ -794,7 +780,7 @@ public Builder mergeFrom(
             case 8:
               {
                 format_ = input.readEnum();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 18:
@@ -863,8 +849,8 @@ public int getFormatValue() {
      * @return This builder for chaining.
      */
     public Builder setFormatValue(int value) {
+
       format_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -884,7 +870,8 @@ public Builder setFormatValue(int value) {
      */
     @java.lang.Override
     public com.google.api.FieldInfo.Format getFormat() {
-      com.google.api.FieldInfo.Format result = com.google.api.FieldInfo.Format.forNumber(format_);
+      @SuppressWarnings("deprecation")
+      com.google.api.FieldInfo.Format result = com.google.api.FieldInfo.Format.valueOf(format_);
       return result == null ? com.google.api.FieldInfo.Format.UNRECOGNIZED : result;
     }
 
@@ -906,7 +893,7 @@ public Builder setFormat(com.google.api.FieldInfo.Format value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000001;
+
       format_ = value.getNumber();
       onChanged();
       return this;
@@ -926,7 +913,7 @@ public Builder setFormat(com.google.api.FieldInfo.Format value) {
      * @return This builder for chaining.
      */
     public Builder clearFormat() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       format_ = 0;
       onChanged();
       return this;
@@ -936,9 +923,9 @@ public Builder clearFormat() {
         java.util.Collections.emptyList();
 
     private void ensureReferencedTypesIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         referencedTypes_ = new java.util.ArrayList(referencedTypes_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -953,7 +940,6 @@ private void ensureReferencedTypesIsMutable() {
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -973,7 +959,6 @@ public java.util.List getReferencedTypesList() {
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -993,7 +978,6 @@ public int getReferencedTypesCount() {
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -1013,7 +997,6 @@ public com.google.api.TypeReference getReferencedTypes(int index) {
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -1039,7 +1022,6 @@ public Builder setReferencedTypes(int index, com.google.api.TypeReference value)
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -1063,7 +1045,6 @@ public Builder setReferencedTypes(
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -1089,7 +1070,6 @@ public Builder addReferencedTypes(com.google.api.TypeReference value) {
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -1115,7 +1095,6 @@ public Builder addReferencedTypes(int index, com.google.api.TypeReference value)
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -1138,7 +1117,6 @@ public Builder addReferencedTypes(com.google.api.TypeReference.Builder builderFo
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -1162,7 +1140,6 @@ public Builder addReferencedTypes(
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -1186,7 +1163,6 @@ public Builder addAllReferencedTypes(
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -1196,7 +1172,7 @@ public Builder addAllReferencedTypes(
     public Builder clearReferencedTypes() {
       if (referencedTypesBuilder_ == null) {
         referencedTypes_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         referencedTypesBuilder_.clear();
@@ -1209,7 +1185,6 @@ public Builder clearReferencedTypes() {
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -1232,7 +1207,6 @@ public Builder removeReferencedTypes(int index) {
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -1248,7 +1222,6 @@ public com.google.api.TypeReference.Builder getReferencedTypesBuilder(int index)
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -1268,7 +1241,6 @@ public com.google.api.TypeReferenceOrBuilder getReferencedTypesOrBuilder(int ind
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -1289,7 +1261,6 @@ public com.google.api.TypeReferenceOrBuilder getReferencedTypesOrBuilder(int ind
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -1306,7 +1277,6 @@ public com.google.api.TypeReference.Builder addReferencedTypesBuilder() {
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -1323,7 +1293,6 @@ public com.google.api.TypeReference.Builder addReferencedTypesBuilder(int index)
      *
      * 
      * The type(s) that the annotated, generic field may represent.
-     *
      * Currently, this must only be used on fields of type `google.protobuf.Any`.
      * Supporting other generic types may be considered in the future.
      * 

@@ -1346,7 +1315,7 @@ public java.util.List getReferencedTypesBu
                 com.google.api.TypeReference.Builder,
                 com.google.api.TypeReferenceOrBuilder>(
                 referencedTypes_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000001) != 0),
                 getParentForChildren(),
                 isClean());
         referencedTypes_ = null;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfoOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfoOrBuilder.java
index 1e689a6aca..60df0f7efc 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfoOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfoOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/field_info.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface FieldInfoOrBuilder
@@ -59,7 +58,6 @@ public interface FieldInfoOrBuilder
    *
    * 
    * The type(s) that the annotated, generic field may represent.
-   *
    * Currently, this must only be used on fields of type `google.protobuf.Any`.
    * Supporting other generic types may be considered in the future.
    * 

@@ -73,7 +71,6 @@ public interface FieldInfoOrBuilder
    *
    * 
    * The type(s) that the annotated, generic field may represent.
-   *
    * Currently, this must only be used on fields of type `google.protobuf.Any`.
    * Supporting other generic types may be considered in the future.
    * 

@@ -87,7 +84,6 @@ public interface FieldInfoOrBuilder
    *
    * 
    * The type(s) that the annotated, generic field may represent.
-   *
    * Currently, this must only be used on fields of type `google.protobuf.Any`.
    * Supporting other generic types may be considered in the future.
    * 

@@ -101,7 +97,6 @@ public interface FieldInfoOrBuilder
    *
    * 
    * The type(s) that the annotated, generic field may represent.
-   *
    * Currently, this must only be used on fields of type `google.protobuf.Any`.
    * Supporting other generic types may be considered in the future.
    * 

@@ -115,7 +110,6 @@ public interface FieldInfoOrBuilder
    *
    * 
    * The type(s) that the annotated, generic field may represent.
-   *
    * Currently, this must only be used on fields of type `google.protobuf.Any`.
    * Supporting other generic types may be considered in the future.
    * 

diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfoProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfoProto.java
index 21be351bbb..8eb474c09d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfoProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfoProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/field_info.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class FieldInfoProto {
@@ -37,9 +36,7 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
    *
    * 
    * Rich semantic descriptor of an API field beyond the basic typing.
-   *
    * Examples:
-   *
    *     string request_id = 1 [(google.api.field_info).format = UUID4];
    *     string old_ip_address = 2 [(google.api.field_info).format = IPV4];
    *     string new_ip_address = 3 [(google.api.field_info).format = IPV6];
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldPolicy.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldPolicy.java
index 78f97ec6d8..89de84c4ff 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldPolicy.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldPolicy.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -24,7 +23,6 @@
  *
  * 
  * Google API Policy Annotation
- *
  * This message defines a simple API policy annotation that can be used to
  * annotate API request and response message fields with applicable policies.
  * One field may have multiple applicable policies that must all be satisfied
@@ -58,6 +56,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new FieldPolicy();
   }
 
+  @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.PolicyProto.internal_static_google_api_FieldPolicy_descriptor;
   }
@@ -71,9 +74,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object selector_ = "";
+  private volatile java.lang.Object selector_;
 
   /**
    *
@@ -81,11 +82,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * Selects one or more request or response message fields to apply this
    * `FieldPolicy`.
-   *
    * When a `FieldPolicy` is used in proto annotation, the selector must
    * be left as empty. The service config generator will automatically fill
    * the correct value.
-   *
    * When a `FieldPolicy` is used in service config, the selector must be a
    * comma-separated string with valid request or response field paths,
    * such as "foo.bar" or "foo.bar,foo.baz".
@@ -114,11 +113,9 @@ public java.lang.String getSelector() {
    * 
    * Selects one or more request or response message fields to apply this
    * `FieldPolicy`.
-   *
    * When a `FieldPolicy` is used in proto annotation, the selector must
    * be left as empty. The service config generator will automatically fill
    * the correct value.
-   *
    * When a `FieldPolicy` is used in service config, the selector must be a
    * comma-separated string with valid request or response field paths,
    * such as "foo.bar" or "foo.bar,foo.baz".
@@ -142,9 +139,7 @@ public com.google.protobuf.ByteString getSelectorBytes() {
   }
 
   public static final int RESOURCE_PERMISSION_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object resourcePermission_ = "";
+  private volatile java.lang.Object resourcePermission_;
 
   /**
    *
@@ -201,9 +196,7 @@ public com.google.protobuf.ByteString getResourcePermissionBytes() {
   }
 
   public static final int RESOURCE_TYPE_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object resourceType_ = "";
+  private volatile java.lang.Object resourceType_;
 
   /**
    *
@@ -434,7 +427,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * Google API Policy Annotation
-   *
    * This message defines a simple API policy annotation that can be used to
    * annotate API request and response message fields with applicable policies.
    * One field may have multiple applicable policies that must all be satisfied
@@ -471,10 +463,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       selector_ = "";
+
       resourcePermission_ = "";
+
       resourceType_ = "";
+
       return this;
     }
 
@@ -500,26 +494,13 @@ public com.google.api.FieldPolicy build() {
     @java.lang.Override
     public com.google.api.FieldPolicy buildPartial() {
       com.google.api.FieldPolicy result = new com.google.api.FieldPolicy(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.selector_ = selector_;
+      result.resourcePermission_ = resourcePermission_;
+      result.resourceType_ = resourceType_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.FieldPolicy result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.selector_ = selector_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.resourcePermission_ = resourcePermission_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.resourceType_ = resourceType_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -567,17 +548,14 @@ public Builder mergeFrom(com.google.api.FieldPolicy other) {
       if (other == com.google.api.FieldPolicy.getDefaultInstance()) return this;
       if (!other.getSelector().isEmpty()) {
         selector_ = other.selector_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getResourcePermission().isEmpty()) {
         resourcePermission_ = other.resourcePermission_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getResourceType().isEmpty()) {
         resourceType_ = other.resourceType_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -609,19 +587,19 @@ public Builder mergeFrom(
             case 10:
               {
                 selector_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 resourcePermission_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 resourceType_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -641,8 +619,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object selector_ = "";
 
     /**
@@ -651,11 +627,9 @@ public Builder mergeFrom(
      * 
      * Selects one or more request or response message fields to apply this
      * `FieldPolicy`.
-     *
      * When a `FieldPolicy` is used in proto annotation, the selector must
      * be left as empty. The service config generator will automatically fill
      * the correct value.
-     *
      * When a `FieldPolicy` is used in service config, the selector must be a
      * comma-separated string with valid request or response field paths,
      * such as "foo.bar" or "foo.bar,foo.baz".
@@ -683,11 +657,9 @@ public java.lang.String getSelector() {
      * 
      * Selects one or more request or response message fields to apply this
      * `FieldPolicy`.
-     *
      * When a `FieldPolicy` is used in proto annotation, the selector must
      * be left as empty. The service config generator will automatically fill
      * the correct value.
-     *
      * When a `FieldPolicy` is used in service config, the selector must be a
      * comma-separated string with valid request or response field paths,
      * such as "foo.bar" or "foo.bar,foo.baz".
@@ -715,11 +687,9 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      * 
      * Selects one or more request or response message fields to apply this
      * `FieldPolicy`.
-     *
      * When a `FieldPolicy` is used in proto annotation, the selector must
      * be left as empty. The service config generator will automatically fill
      * the correct value.
-     *
      * When a `FieldPolicy` is used in service config, the selector must be a
      * comma-separated string with valid request or response field paths,
      * such as "foo.bar" or "foo.bar,foo.baz".
@@ -734,8 +704,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -746,11 +716,9 @@ public Builder setSelector(java.lang.String value) {
      * 
      * Selects one or more request or response message fields to apply this
      * `FieldPolicy`.
-     *
      * When a `FieldPolicy` is used in proto annotation, the selector must
      * be left as empty. The service config generator will automatically fill
      * the correct value.
-     *
      * When a `FieldPolicy` is used in service config, the selector must be a
      * comma-separated string with valid request or response field paths,
      * such as "foo.bar" or "foo.bar,foo.baz".
@@ -761,8 +729,8 @@ public Builder setSelector(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSelector() {
+
       selector_ = getDefaultInstance().getSelector();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -773,11 +741,9 @@ public Builder clearSelector() {
      * 
      * Selects one or more request or response message fields to apply this
      * `FieldPolicy`.
-     *
      * When a `FieldPolicy` is used in proto annotation, the selector must
      * be left as empty. The service config generator will automatically fill
      * the correct value.
-     *
      * When a `FieldPolicy` is used in service config, the selector must be a
      * comma-separated string with valid request or response field paths,
      * such as "foo.bar" or "foo.bar,foo.baz".
@@ -793,8 +759,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -872,8 +838,8 @@ public Builder setResourcePermission(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       resourcePermission_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -893,8 +859,8 @@ public Builder setResourcePermission(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResourcePermission() {
+
       resourcePermission_ = getDefaultInstance().getResourcePermission();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -919,8 +885,8 @@ public Builder setResourcePermissionBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       resourcePermission_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -989,8 +955,8 @@ public Builder setResourceType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       resourceType_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1007,8 +973,8 @@ public Builder setResourceType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResourceType() {
+
       resourceType_ = getDefaultInstance().getResourceType();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1030,8 +996,8 @@ public Builder setResourceTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       resourceType_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldPolicyOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldPolicyOrBuilder.java
index fee039eede..a980d30d7e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldPolicyOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldPolicyOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface FieldPolicyOrBuilder
@@ -30,11 +29,9 @@ public interface FieldPolicyOrBuilder
    * 
    * Selects one or more request or response message fields to apply this
    * `FieldPolicy`.
-   *
    * When a `FieldPolicy` is used in proto annotation, the selector must
    * be left as empty. The service config generator will automatically fill
    * the correct value.
-   *
    * When a `FieldPolicy` is used in service config, the selector must be a
    * comma-separated string with valid request or response field paths,
    * such as "foo.bar" or "foo.bar,foo.baz".
@@ -52,11 +49,9 @@ public interface FieldPolicyOrBuilder
    * 
    * Selects one or more request or response message fields to apply this
    * `FieldPolicy`.
-   *
    * When a `FieldPolicy` is used in proto annotation, the selector must
    * be left as empty. The service config generator will automatically fill
    * the correct value.
-   *
    * When a `FieldPolicy` is used in service config, the selector must be a
    * comma-separated string with valid request or response field paths,
    * such as "foo.bar" or "foo.bar,foo.baz".
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 a377bec6af..6a8b41cd03 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -47,14 +46,18 @@ 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;
   }
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 2:
         return internalGetRenamedServices();
@@ -71,7 +74,6 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
             com.google.api.GoSettings.class, com.google.api.GoSettings.Builder.class);
   }
 
-  private int bitField0_;
   public static final int COMMON_FIELD_NUMBER = 1;
   private com.google.api.CommonLanguageSettings common_;
 
@@ -88,7 +90,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
    */
   @java.lang.Override
   public boolean hasCommon() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return common_ != null;
   }
 
   /**
@@ -118,7 +120,7 @@ public com.google.api.CommonLanguageSettings getCommon() {
    */
   @java.lang.Override
   public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
-    return common_ == null ? com.google.api.CommonLanguageSettings.getDefaultInstance() : common_;
+    return getCommon();
   }
 
   public static final int RENAMED_SERVICES_FIELD_NUMBER = 2;
@@ -134,7 +136,6 @@ private static final class RenamedServicesDefaultEntryHolder {
             "");
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField renamedServices_;
 
   private com.google.protobuf.MapField
@@ -157,7 +158,6 @@ public int getRenamedServicesCount() {
    * Map of service names to renamed services. Keys are the package relative
    * service names and values are the name to be used for the service client
    * and call options.
-   *
    * publishing:
    *   go_settings:
    *     renamed_services:
@@ -188,7 +188,6 @@ public java.util.Map getRenamedServices() {
    * Map of service names to renamed services. Keys are the package relative
    * service names and values are the name to be used for the service client
    * and call options.
-   *
    * publishing:
    *   go_settings:
    *     renamed_services:
@@ -209,7 +208,6 @@ public java.util.Map getRenamedServicesMap()
    * Map of service names to renamed services. Keys are the package relative
    * service names and values are the name to be used for the service client
    * and call options.
-   *
    * publishing:
    *   go_settings:
    *     renamed_services:
@@ -219,10 +217,8 @@ public java.util.Map getRenamedServicesMap()
    * map<string, string> renamed_services = 2;
    */
   @java.lang.Override
-  public /* nullable */ java.lang.String getRenamedServicesOrDefault(
-      java.lang.String key,
-      /* nullable */
-      java.lang.String defaultValue) {
+  public java.lang.String getRenamedServicesOrDefault(
+      java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -237,7 +233,6 @@ public java.util.Map getRenamedServicesMap()
    * Map of service names to renamed services. Keys are the package relative
    * service names and values are the name to be used for the service client
    * and call options.
-   *
    * publishing:
    *   go_settings:
    *     renamed_services:
@@ -272,7 +267,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (common_ != null) {
       output.writeMessage(1, getCommon());
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
@@ -286,7 +281,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (common_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCommon());
     }
     for (java.util.Map.Entry entry :
@@ -456,8 +451,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 2:
           return internalGetRenamedServices();
@@ -467,8 +461,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 2:
           return internalGetMutableRenamedServices();
@@ -486,28 +479,19 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     }
 
     // Construct using com.google.api.GoSettings.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCommonFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      common_ = null;
-      if (commonBuilder_ != null) {
-        commonBuilder_.dispose();
+      if (commonBuilder_ == null) {
+        common_ = null;
+      } else {
+        common_ = null;
         commonBuilder_ = null;
       }
       internalGetMutableRenamedServices().clear();
@@ -536,27 +520,18 @@ public com.google.api.GoSettings build() {
     @java.lang.Override
     public com.google.api.GoSettings buildPartial() {
       com.google.api.GoSettings result = new com.google.api.GoSettings(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      if (commonBuilder_ == null) {
+        result.common_ = common_;
+      } else {
+        result.common_ = commonBuilder_.build();
       }
+      result.renamedServices_ = internalGetRenamedServices();
+      result.renamedServices_.makeImmutable();
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.GoSettings result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.renamedServices_ = internalGetRenamedServices();
-        result.renamedServices_.makeImmutable();
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -606,7 +581,6 @@ public Builder mergeFrom(com.google.api.GoSettings other) {
         mergeCommon(other.getCommon());
       }
       internalGetMutableRenamedServices().mergeFrom(other.internalGetRenamedServices());
-      bitField0_ |= 0x00000002;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -636,7 +610,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -648,7 +622,6 @@ public Builder mergeFrom(
                 internalGetMutableRenamedServices()
                     .getMutableMap()
                     .put(renamedServices__.getKey(), renamedServices__.getValue());
-                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -689,7 +662,7 @@ public Builder mergeFrom(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return commonBuilder_ != null || common_ != null;
     }
 
     /**
@@ -728,11 +701,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
           throw new NullPointerException();
         }
         common_ = value;
+        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -748,11 +721,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
     public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderForValue) {
       if (commonBuilder_ == null) {
         common_ = builderForValue.build();
+        onChanged();
       } else {
         commonBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -767,20 +740,19 @@ public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderFo
      */
     public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
       if (commonBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && common_ != null
-            && common_ != com.google.api.CommonLanguageSettings.getDefaultInstance()) {
-          getCommonBuilder().mergeFrom(value);
+        if (common_ != null) {
+          common_ =
+              com.google.api.CommonLanguageSettings.newBuilder(common_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           common_ = value;
         }
+        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-      if (common_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -794,13 +766,14 @@ public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
      * .google.api.CommonLanguageSettings common = 1;
      */
     public Builder clearCommon() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      common_ = null;
-      if (commonBuilder_ != null) {
-        commonBuilder_.dispose();
+      if (commonBuilder_ == null) {
+        common_ = null;
+        onChanged();
+      } else {
+        common_ = null;
         commonBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -814,7 +787,7 @@ public Builder clearCommon() {
      * .google.api.CommonLanguageSettings common = 1;
      */
     public com.google.api.CommonLanguageSettings.Builder getCommonBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getCommonFieldBuilder().getBuilder();
     }
@@ -877,6 +850,8 @@ public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
 
     private com.google.protobuf.MapField
         internalGetMutableRenamedServices() {
+      onChanged();
+      ;
       if (renamedServices_ == null) {
         renamedServices_ =
             com.google.protobuf.MapField.newMapField(
@@ -885,8 +860,6 @@ public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
       if (!renamedServices_.isMutable()) {
         renamedServices_ = renamedServices_.copy();
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
       return renamedServices_;
     }
 
@@ -901,7 +874,6 @@ public int getRenamedServicesCount() {
      * Map of service names to renamed services. Keys are the package relative
      * service names and values are the name to be used for the service client
      * and call options.
-     *
      * publishing:
      *   go_settings:
      *     renamed_services:
@@ -932,7 +904,6 @@ public java.util.Map getRenamedServices() {
      * Map of service names to renamed services. Keys are the package relative
      * service names and values are the name to be used for the service client
      * and call options.
-     *
      * publishing:
      *   go_settings:
      *     renamed_services:
@@ -953,7 +924,6 @@ public java.util.Map getRenamedServicesMap()
      * Map of service names to renamed services. Keys are the package relative
      * service names and values are the name to be used for the service client
      * and call options.
-     *
      * publishing:
      *   go_settings:
      *     renamed_services:
@@ -963,10 +933,8 @@ public java.util.Map getRenamedServicesMap()
      * map<string, string> renamed_services = 2;
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getRenamedServicesOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getRenamedServicesOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -981,7 +949,6 @@ public java.util.Map getRenamedServicesMap()
      * Map of service names to renamed services. Keys are the package relative
      * service names and values are the name to be used for the service client
      * and call options.
-     *
      * publishing:
      *   go_settings:
      *     renamed_services:
@@ -1003,7 +970,6 @@ public java.lang.String getRenamedServicesOrThrow(java.lang.String key) {
     }
 
     public Builder clearRenamedServices() {
-      bitField0_ = (bitField0_ & ~0x00000002);
       internalGetMutableRenamedServices().getMutableMap().clear();
       return this;
     }
@@ -1015,7 +981,6 @@ public Builder clearRenamedServices() {
      * Map of service names to renamed services. Keys are the package relative
      * service names and values are the name to be used for the service client
      * and call options.
-     *
      * publishing:
      *   go_settings:
      *     renamed_services:
@@ -1035,7 +1000,6 @@ public Builder removeRenamedServices(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableRenamedServices() {
-      bitField0_ |= 0x00000002;
       return internalGetMutableRenamedServices().getMutableMap();
     }
 
@@ -1046,7 +1010,6 @@ public java.util.Map getMutableRenamedServic
      * Map of service names to renamed services. Keys are the package relative
      * service names and values are the name to be used for the service client
      * and call options.
-     *
      * publishing:
      *   go_settings:
      *     renamed_services:
@@ -1062,8 +1025,8 @@ public Builder putRenamedServices(java.lang.String key, java.lang.String value)
       if (value == null) {
         throw new NullPointerException("map value");
       }
+
       internalGetMutableRenamedServices().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000002;
       return this;
     }
 
@@ -1074,7 +1037,6 @@ public Builder putRenamedServices(java.lang.String key, java.lang.String value)
      * Map of service names to renamed services. Keys are the package relative
      * service names and values are the name to be used for the service client
      * and call options.
-     *
      * publishing:
      *   go_settings:
      *     renamed_services:
@@ -1085,7 +1047,6 @@ public Builder putRenamedServices(java.lang.String key, java.lang.String value)
      */
     public Builder putAllRenamedServices(java.util.Map values) {
       internalGetMutableRenamedServices().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000002;
       return this;
     }
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/GoSettingsOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/GoSettingsOrBuilder.java
index ac5627b23f..3560355dc4 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/GoSettingsOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/GoSettingsOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface GoSettingsOrBuilder
@@ -68,7 +67,6 @@ public interface GoSettingsOrBuilder
    * Map of service names to renamed services. Keys are the package relative
    * service names and values are the name to be used for the service client
    * and call options.
-   *
    * publishing:
    *   go_settings:
    *     renamed_services:
@@ -86,7 +84,6 @@ public interface GoSettingsOrBuilder
    * Map of service names to renamed services. Keys are the package relative
    * service names and values are the name to be used for the service client
    * and call options.
-   *
    * publishing:
    *   go_settings:
    *     renamed_services:
@@ -108,7 +105,6 @@ public interface GoSettingsOrBuilder
    * Map of service names to renamed services. Keys are the package relative
    * service names and values are the name to be used for the service client
    * and call options.
-   *
    * publishing:
    *   go_settings:
    *     renamed_services:
@@ -126,7 +122,6 @@ public interface GoSettingsOrBuilder
    * Map of service names to renamed services. Keys are the package relative
    * service names and values are the name to be used for the service client
    * and call options.
-   *
    * publishing:
    *   go_settings:
    *     renamed_services:
@@ -135,6 +130,7 @@ public interface GoSettingsOrBuilder
    *
    * map<string, string> renamed_services = 2;
    */
+
   /* nullable */
   java.lang.String getRenamedServicesOrDefault(
       java.lang.String key,
@@ -148,7 +144,6 @@ java.lang.String getRenamedServicesOrDefault(
    * Map of service names to renamed services. Keys are the package relative
    * service names and values are the name to be used for the service client
    * and call options.
-   *
    * publishing:
    *   go_settings:
    *     renamed_services:
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 eeb976a475..ec4934a4b9 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/http.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -51,6 +50,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;
   }
@@ -64,8 +68,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RULES_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List rules_;
 
   /**
@@ -73,7 +75,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -89,7 +90,6 @@ public java.util.List getRulesList() {
    *
    * 
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -105,7 +105,6 @@ public java.util.List getRulesOrBuil
    *
    * 
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -121,7 +120,6 @@ public int getRulesCount() {
    *
    * 
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -137,7 +135,6 @@ public com.google.api.HttpRule getRules(int index) {
    *
    * 
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -149,7 +146,7 @@ public com.google.api.HttpRuleOrBuilder getRulesOrBuilder(int index) {
   }
 
   public static final int FULLY_DECODE_RESERVED_EXPANSION_FIELD_NUMBER = 2;
-  private boolean fullyDecodeReservedExpansion_ = false;
+  private boolean fullyDecodeReservedExpansion_;
 
   /**
    *
@@ -158,7 +155,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.
    * 

@@ -380,7 +376,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
       } else {
@@ -389,6 +384,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       fullyDecodeReservedExpansion_ = false;
+
       return this;
     }
 
@@ -414,15 +410,7 @@ public com.google.api.Http build() {
     @java.lang.Override
     public com.google.api.Http buildPartial() {
       com.google.api.Http result = new com.google.api.Http(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.Http result) {
+      int from_bitField0_ = bitField0_;
       if (rulesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
@@ -432,13 +420,9 @@ private void buildPartialRepeatedFields(com.google.api.Http result) {
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.Http result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.fullyDecodeReservedExpansion_ = fullyDecodeReservedExpansion_;
-      }
+      result.fullyDecodeReservedExpansion_ = fullyDecodeReservedExpansion_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -557,7 +541,7 @@ public Builder mergeFrom(
             case 16:
               {
                 fullyDecodeReservedExpansion_ = input.readBool();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             default:
@@ -599,7 +583,6 @@ private void ensureRulesIsMutable() {
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -618,7 +601,6 @@ public java.util.List getRulesList() {
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -637,7 +619,6 @@ public int getRulesCount() {
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -656,7 +637,6 @@ public com.google.api.HttpRule getRules(int index) {
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -681,7 +661,6 @@ public Builder setRules(int index, com.google.api.HttpRule value) {
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -703,7 +682,6 @@ public Builder setRules(int index, com.google.api.HttpRule.Builder builderForVal
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -728,7 +706,6 @@ public Builder addRules(com.google.api.HttpRule value) {
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -753,7 +730,6 @@ public Builder addRules(int index, com.google.api.HttpRule value) {
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -775,7 +751,6 @@ public Builder addRules(com.google.api.HttpRule.Builder builderForValue) {
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -797,7 +772,6 @@ public Builder addRules(int index, com.google.api.HttpRule.Builder builderForVal
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -819,7 +793,6 @@ public Builder addAllRules(java.lang.Iterable
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -841,7 +814,6 @@ public Builder clearRules() {
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -863,7 +835,6 @@ public Builder removeRules(int index) {
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -878,7 +849,6 @@ public com.google.api.HttpRule.Builder getRulesBuilder(int index) {
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -897,7 +867,6 @@ public com.google.api.HttpRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -916,7 +885,6 @@ public java.util.List getRulesOrBuil
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -931,7 +899,6 @@ public com.google.api.HttpRule.Builder addRulesBuilder() {
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -946,7 +913,6 @@ public com.google.api.HttpRule.Builder addRulesBuilder(int index) {
      *
      * 
      * A list of HTTP configuration rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -982,7 +948,6 @@ public java.util.List 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.
      * 

@@ -1003,7 +968,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.
      * 

@@ -1016,7 +980,6 @@ public boolean getFullyDecodeReservedExpansion() {
     public Builder setFullyDecodeReservedExpansion(boolean value) {
 
       fullyDecodeReservedExpansion_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1028,7 +991,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.
      * 

@@ -1038,7 +1000,7 @@ public Builder setFullyDecodeReservedExpansion(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearFullyDecodeReservedExpansion() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       fullyDecodeReservedExpansion_ = false;
       onChanged();
       return this;
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 9128b3e272..d7539b5296 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/httpbody.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -26,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.
  * 

@@ -93,6 +79,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;
   }
@@ -106,9 +97,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONTENT_TYPE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object contentType_ = "";
+  private volatile java.lang.Object contentType_;
 
   /**
    *
@@ -159,7 +148,7 @@ public com.google.protobuf.ByteString getContentTypeBytes() {
   }
 
   public static final int DATA_FIELD_NUMBER = 2;
-  private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY;
+  private com.google.protobuf.ByteString data_;
 
   /**
    *
@@ -178,8 +167,6 @@ public com.google.protobuf.ByteString getData() {
   }
 
   public static final int EXTENSIONS_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
   private java.util.List extensions_;
 
   /**
@@ -442,44 +429,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.
    * 

@@ -512,16 +486,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       contentType_ = "";
+
       data_ = com.google.protobuf.ByteString.EMPTY;
+
       if (extensionsBuilder_ == null) {
         extensions_ = java.util.Collections.emptyList();
       } else {
         extensions_ = null;
         extensionsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -547,34 +522,20 @@ public com.google.api.HttpBody build() {
     @java.lang.Override
     public com.google.api.HttpBody buildPartial() {
       com.google.api.HttpBody result = new com.google.api.HttpBody(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.HttpBody result) {
+      int from_bitField0_ = bitField0_;
+      result.contentType_ = contentType_;
+      result.data_ = data_;
       if (extensionsBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           extensions_ = java.util.Collections.unmodifiableList(extensions_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.extensions_ = extensions_;
       } else {
         result.extensions_ = extensionsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.HttpBody result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.contentType_ = contentType_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.data_ = data_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -624,7 +585,6 @@ public Builder mergeFrom(com.google.api.HttpBody other) {
       if (other == com.google.api.HttpBody.getDefaultInstance()) return this;
       if (!other.getContentType().isEmpty()) {
         contentType_ = other.contentType_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getData() != com.google.protobuf.ByteString.EMPTY) {
@@ -634,7 +594,7 @@ public Builder mergeFrom(com.google.api.HttpBody other) {
         if (!other.extensions_.isEmpty()) {
           if (extensions_.isEmpty()) {
             extensions_ = other.extensions_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureExtensionsIsMutable();
             extensions_.addAll(other.extensions_);
@@ -647,7 +607,7 @@ public Builder mergeFrom(com.google.api.HttpBody other) {
             extensionsBuilder_.dispose();
             extensionsBuilder_ = null;
             extensions_ = other.extensions_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
             extensionsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getExtensionsFieldBuilder()
@@ -686,13 +646,13 @@ public Builder mergeFrom(
             case 10:
               {
                 contentType_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 data_ = input.readBytes();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
@@ -790,8 +750,8 @@ public Builder setContentType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       contentType_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -808,8 +768,8 @@ public Builder setContentType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearContentType() {
+
       contentType_ = getDefaultInstance().getContentType();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -831,8 +791,8 @@ public Builder setContentTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       contentType_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -871,8 +831,8 @@ public Builder setData(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       data_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -889,7 +849,7 @@ public Builder setData(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearData() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       data_ = getDefaultInstance().getData();
       onChanged();
       return this;
@@ -898,9 +858,9 @@ public Builder clearData() {
     private java.util.List extensions_ = java.util.Collections.emptyList();
 
     private void ensureExtensionsIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         extensions_ = new java.util.ArrayList(extensions_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1133,7 +1093,7 @@ public Builder addAllExtensions(java.lang.Iterable getExtensionsBuilderList(
                 com.google.protobuf.Any,
                 com.google.protobuf.Any.Builder,
                 com.google.protobuf.AnyOrBuilder>(
-                extensions_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
+                extensions_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         extensions_ = null;
       }
       return extensionsBuilder_;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBodyOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBodyOrBuilder.java
index 1f46dc6b74..f069f2e119 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBodyOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBodyOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/httpbody.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface HttpBodyOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBodyProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBodyProto.java
index 73acb93323..5043b6de20 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBodyProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBodyProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/httpbody.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class HttpBodyProto {
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 acbea2c9b5..69274e2ab3 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/http.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface HttpOrBuilder
@@ -29,7 +28,6 @@ public interface HttpOrBuilder
    *
    * 
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -42,7 +40,6 @@ public interface HttpOrBuilder
    *
    * 
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -55,7 +52,6 @@ public interface HttpOrBuilder
    *
    * 
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -68,7 +64,6 @@ public interface HttpOrBuilder
    *
    * 
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -81,7 +76,6 @@ public interface HttpOrBuilder
    *
    * 
    * A list of HTTP configuration rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -96,7 +90,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.
    * 

diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpProto.java
index a494ef768b..e6325d9dfd 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/http.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class HttpProto {
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 9125f1ed4d..3c061cdb0d 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/http.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -24,7 +23,6 @@
  *
  * 
  * 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
@@ -33,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) = {
@@ -61,16 +55,12 @@
  *     message Message {
  *       string text = 1; // The resource content.
  *     }
- *
  * This enables an HTTP REST to gRPC mapping as below:
- *
  * - HTTP: `GET /v1/messages/123456`
  * - gRPC: `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,24 +76,19 @@
  *       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: `GET /v1/messages/123456?revision=2&sub.subfield=foo`
  * - gRPC: `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&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&foo.b=B&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) = {
@@ -116,19 +101,15 @@
  *       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: `PATCH /v1/messages/123456 { "text": "Hi!" }`
  * - gRPC: `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) = {
@@ -141,22 +122,16 @@
  *       string message_id = 1;
  *       string text = 2;
  *     }
- *
- *
  * The following HTTP JSON to RPC mapping is enabled:
- *
  * - HTTP: `PATCH /v1/messages/123456 { "text": "Hi!" }`
  * - gRPC: `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) = {
@@ -171,17 +146,12 @@
  *       string message_id = 1;
  *       string user_id = 2;
  *     }
- *
  * This enables the following two alternative HTTP JSON to RPC mappings:
- *
  * - HTTP: `GET /v1/messages/123456`
  * - gRPC: `GetMessage(message_id: "123456")`
- *
  * - HTTP: `GET /v1/users/me/messages/123456`
  * - gRPC: `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.
@@ -198,29 +168,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
@@ -228,7 +192,6 @@
  * [Discovery
  * Document](https://developers.google.com/discovery/v1/reference/apis) as
  * `{var}`.
- *
  * If a variable contains multiple path segments, such as `"{var=foo/*}"`
  * 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.
@@ -237,14 +200,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
@@ -252,20 +212,15 @@
  * 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.
- *
  * The following example selects a gRPC method and applies an `HttpRule` to it:
- *
  *     http:
  *       rules:
  *         - 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
@@ -273,17 +228,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.
@@ -315,6 +266,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;
   }
@@ -328,8 +284,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   private int patternCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object pattern_;
 
   public enum PatternCase
@@ -390,16 +344,13 @@ public PatternCase getPatternCase() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object selector_ = "";
+  private volatile java.lang.Object selector_;
 
   /**
    *
    *
    * 
    * Selects a method to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -426,7 +377,6 @@ public java.lang.String getSelector() {
    *
    * 
    * Selects a method to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -880,9 +830,7 @@ public com.google.api.CustomHttpPatternOrBuilder getCustomOrBuilder() {
   }
 
   public static final int BODY_FIELD_NUMBER = 7;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object body_ = "";
+  private volatile java.lang.Object body_;
 
   /**
    *
@@ -891,7 +839,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.
    * 

@@ -920,7 +867,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.
    * 

@@ -943,9 +889,7 @@ public com.google.protobuf.ByteString getBodyBytes() {
   }
 
   public static final int RESPONSE_BODY_FIELD_NUMBER = 12;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object responseBody_ = "";
+  private volatile java.lang.Object responseBody_;
 
   /**
    *
@@ -954,7 +898,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.
    * 

@@ -983,7 +926,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.
    * 

@@ -1006,8 +948,6 @@ public com.google.protobuf.ByteString getResponseBodyBytes() {
   }
 
   public static final int ADDITIONAL_BINDINGS_FIELD_NUMBER = 11;
-
-  @SuppressWarnings("serial")
   private java.util.List additionalBindings_;
 
   /**
@@ -1373,7 +1313,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * 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
@@ -1382,21 +1321,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) = {
@@ -1410,16 +1345,12 @@ 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: `GET /v1/messages/123456`
    * - gRPC: `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) = {
@@ -1435,24 +1366,19 @@ 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: `GET /v1/messages/123456?revision=2&sub.subfield=foo`
    * - gRPC: `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&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&foo.b=B&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) = {
@@ -1465,19 +1391,15 @@ 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: `PATCH /v1/messages/123456 { "text": "Hi!" }`
    * - gRPC: `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) = {
@@ -1490,22 +1412,16 @@ 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: `PATCH /v1/messages/123456 { "text": "Hi!" }`
    * - gRPC: `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) = {
@@ -1520,17 +1436,12 @@ 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: `GET /v1/messages/123456`
    * - gRPC: `GetMessage(message_id: "123456")`
-   *
    * - HTTP: `GET /v1/users/me/messages/123456`
    * - gRPC: `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.
@@ -1547,29 +1458,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
@@ -1577,7 +1482,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/*}"`
    * 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.
@@ -1586,14 +1490,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
@@ -1601,20 +1502,15 @@ 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.
-   *
    * The following example selects a gRPC method and applies an `HttpRule` to it:
-   *
    *     http:
    *       rules:
    *         - 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
@@ -1622,17 +1518,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.
@@ -1666,20 +1558,22 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       selector_ = "";
+
       if (customBuilder_ != null) {
         customBuilder_.clear();
       }
       body_ = "";
+
       responseBody_ = "";
+
       if (additionalBindingsBuilder_ == null) {
         additionalBindings_ = java.util.Collections.emptyList();
       } else {
         additionalBindings_ = null;
         additionalBindingsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000200);
+      bitField0_ = (bitField0_ & ~0x00000001);
       patternCase_ = 0;
       pattern_ = null;
       return this;
@@ -1707,46 +1601,44 @@ public com.google.api.HttpRule build() {
     @java.lang.Override
     public com.google.api.HttpRule buildPartial() {
       com.google.api.HttpRule result = new com.google.api.HttpRule(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      result.selector_ = selector_;
+      if (patternCase_ == 2) {
+        result.pattern_ = pattern_;
       }
-      buildPartialOneofs(result);
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.HttpRule result) {
+      if (patternCase_ == 3) {
+        result.pattern_ = pattern_;
+      }
+      if (patternCase_ == 4) {
+        result.pattern_ = pattern_;
+      }
+      if (patternCase_ == 5) {
+        result.pattern_ = pattern_;
+      }
+      if (patternCase_ == 6) {
+        result.pattern_ = pattern_;
+      }
+      if (patternCase_ == 8) {
+        if (customBuilder_ == null) {
+          result.pattern_ = pattern_;
+        } else {
+          result.pattern_ = customBuilder_.build();
+        }
+      }
+      result.body_ = body_;
+      result.responseBody_ = responseBody_;
       if (additionalBindingsBuilder_ == null) {
-        if (((bitField0_ & 0x00000200) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           additionalBindings_ = java.util.Collections.unmodifiableList(additionalBindings_);
-          bitField0_ = (bitField0_ & ~0x00000200);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.additionalBindings_ = additionalBindings_;
       } else {
         result.additionalBindings_ = additionalBindingsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.HttpRule result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.selector_ = selector_;
-      }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.body_ = body_;
-      }
-      if (((from_bitField0_ & 0x00000100) != 0)) {
-        result.responseBody_ = responseBody_;
-      }
-    }
-
-    private void buildPartialOneofs(com.google.api.HttpRule result) {
       result.patternCase_ = patternCase_;
-      result.pattern_ = this.pattern_;
-      if (patternCase_ == 8 && customBuilder_ != null) {
-        result.pattern_ = customBuilder_.build();
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1796,24 +1688,21 @@ public Builder mergeFrom(com.google.api.HttpRule other) {
       if (other == com.google.api.HttpRule.getDefaultInstance()) return this;
       if (!other.getSelector().isEmpty()) {
         selector_ = other.selector_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getBody().isEmpty()) {
         body_ = other.body_;
-        bitField0_ |= 0x00000080;
         onChanged();
       }
       if (!other.getResponseBody().isEmpty()) {
         responseBody_ = other.responseBody_;
-        bitField0_ |= 0x00000100;
         onChanged();
       }
       if (additionalBindingsBuilder_ == null) {
         if (!other.additionalBindings_.isEmpty()) {
           if (additionalBindings_.isEmpty()) {
             additionalBindings_ = other.additionalBindings_;
-            bitField0_ = (bitField0_ & ~0x00000200);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureAdditionalBindingsIsMutable();
             additionalBindings_.addAll(other.additionalBindings_);
@@ -1826,7 +1715,7 @@ public Builder mergeFrom(com.google.api.HttpRule other) {
             additionalBindingsBuilder_.dispose();
             additionalBindingsBuilder_ = null;
             additionalBindings_ = other.additionalBindings_;
-            bitField0_ = (bitField0_ & ~0x00000200);
+            bitField0_ = (bitField0_ & ~0x00000001);
             additionalBindingsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getAdditionalBindingsFieldBuilder()
@@ -1911,7 +1800,7 @@ public Builder mergeFrom(
             case 10:
               {
                 selector_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -1952,7 +1841,7 @@ public Builder mergeFrom(
             case 58:
               {
                 body_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 58
             case 66:
@@ -1976,7 +1865,7 @@ public Builder mergeFrom(
             case 98:
               {
                 responseBody_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000100;
+
                 break;
               } // case 98
             default:
@@ -2019,7 +1908,6 @@ public Builder clearPattern() {
      *
      * 
      * Selects a method to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -2045,7 +1933,6 @@ public java.lang.String getSelector() {
      *
      * 
      * Selects a method to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -2071,7 +1958,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      *
      * 
      * Selects a method to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -2085,8 +1971,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2096,7 +1982,6 @@ public Builder setSelector(java.lang.String value) {
      *
      * 
      * Selects a method to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -2106,8 +1991,8 @@ public Builder setSelector(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSelector() {
+
       selector_ = getDefaultInstance().getSelector();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -2117,7 +2002,6 @@ public Builder clearSelector() {
      *
      * 
      * Selects a method to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -2132,8 +2016,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3078,6 +2962,7 @@ public com.google.api.CustomHttpPatternOrBuilder getCustomOrBuilder() {
       }
       patternCase_ = 8;
       onChanged();
+      ;
       return customBuilder_;
     }
 
@@ -3090,7 +2975,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.
      * 

@@ -3118,7 +3002,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.
      * 

@@ -3146,7 +3029,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.
      * 

@@ -3160,8 +3042,8 @@ public Builder setBody(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       body_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -3173,7 +3055,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.
      * 

@@ -3183,8 +3064,8 @@ public Builder setBody(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearBody() {
+
       body_ = getDefaultInstance().getBody();
-      bitField0_ = (bitField0_ & ~0x00000080);
       onChanged();
       return this;
     }
@@ -3196,7 +3077,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.
      * 

@@ -3211,8 +3091,8 @@ public Builder setBodyBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       body_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -3226,7 +3106,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.
      * 

@@ -3254,7 +3133,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.
      * 

@@ -3282,7 +3160,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.
      * 

@@ -3296,8 +3173,8 @@ public Builder setResponseBody(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       responseBody_ = value;
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -3309,7 +3186,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.
      * 

@@ -3319,8 +3195,8 @@ public Builder setResponseBody(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResponseBody() {
+
       responseBody_ = getDefaultInstance().getResponseBody();
-      bitField0_ = (bitField0_ & ~0x00000100);
       onChanged();
       return this;
     }
@@ -3332,7 +3208,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.
      * 

@@ -3347,8 +3222,8 @@ public Builder setResponseBodyBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       responseBody_ = value;
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -3357,9 +3232,9 @@ public Builder setResponseBodyBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureAdditionalBindingsIsMutable() {
-      if (!((bitField0_ & 0x00000200) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         additionalBindings_ = new java.util.ArrayList(additionalBindings_);
-        bitField0_ |= 0x00000200;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -3606,7 +3481,7 @@ public Builder addAllAdditionalBindings(
     public Builder clearAdditionalBindings() {
       if (additionalBindingsBuilder_ == null) {
         additionalBindings_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000200);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         additionalBindingsBuilder_.clear();
@@ -3749,7 +3624,7 @@ public java.util.List getAdditionalBindingsBuil
                 com.google.api.HttpRule.Builder,
                 com.google.api.HttpRuleOrBuilder>(
                 additionalBindings_,
-                ((bitField0_ & 0x00000200) != 0),
+                ((bitField0_ & 0x00000001) != 0),
                 getParentForChildren(),
                 isClean());
         additionalBindings_ = null;
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 ec08dfd773..00873f86f6 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/http.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface HttpRuleOrBuilder
@@ -29,7 +28,6 @@ public interface HttpRuleOrBuilder
    *
    * 
    * Selects a method to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -45,7 +43,6 @@ public interface HttpRuleOrBuilder
    *
    * 
    * Selects a method to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -307,7 +304,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.
    * 

@@ -325,7 +321,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.
    * 

@@ -343,7 +338,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.
    * 

@@ -361,7 +355,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.
    * 

@@ -437,5 +430,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 8f0bf37264..9c2764c0b0 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -49,14 +48,18 @@ 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;
   }
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 2:
         return internalGetServiceClassNames();
@@ -73,11 +76,8 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
             com.google.api.JavaSettings.class, com.google.api.JavaSettings.Builder.class);
   }
 
-  private int bitField0_;
   public static final int LIBRARY_PACKAGE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object libraryPackage_ = "";
+  private volatile java.lang.Object libraryPackage_;
 
   /**
    *
@@ -88,9 +88,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
    * 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
@@ -122,9 +120,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
@@ -160,7 +156,6 @@ private static final class ServiceClassNamesDefaultEntryHolder {
             "");
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField serviceClassNames_;
 
   private com.google.protobuf.MapField
@@ -186,9 +181,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:
@@ -223,9 +216,7 @@ public java.util.Map 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:
@@ -250,9 +241,7 @@ public java.util.Map 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:
@@ -263,10 +252,8 @@ public java.util.Map getServiceClassNamesMap
    * map<string, string> service_class_names = 2;
    */
   @java.lang.Override
-  public /* nullable */ java.lang.String getServiceClassNamesOrDefault(
-      java.lang.String key,
-      /* nullable */
-      java.lang.String defaultValue) {
+  public java.lang.String getServiceClassNamesOrDefault(
+      java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -284,9 +271,7 @@ public java.util.Map 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:
@@ -324,7 +309,7 @@ public java.lang.String getServiceClassNamesOrThrow(java.lang.String key) {
    */
   @java.lang.Override
   public boolean hasCommon() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return common_ != null;
   }
 
   /**
@@ -354,7 +339,7 @@ public com.google.api.CommonLanguageSettings getCommon() {
    */
   @java.lang.Override
   public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
-    return common_ == null ? com.google.api.CommonLanguageSettings.getDefaultInstance() : common_;
+    return getCommon();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -379,7 +364,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         internalGetServiceClassNames(),
         ServiceClassNamesDefaultEntryHolder.defaultEntry,
         2);
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (common_ != null) {
       output.writeMessage(3, getCommon());
     }
     getUnknownFields().writeTo(output);
@@ -404,7 +389,7 @@ public int getSerializedSize() {
               .build();
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, serviceClassNames__);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (common_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getCommon());
     }
     size += getUnknownFields().getSerializedSize();
@@ -567,8 +552,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 2:
           return internalGetServiceClassNames();
@@ -578,8 +562,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 2:
           return internalGetMutableServiceClassNames();
@@ -597,30 +580,22 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     }
 
     // Construct using com.google.api.JavaSettings.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCommonFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       libraryPackage_ = "";
+
       internalGetMutableServiceClassNames().clear();
-      common_ = null;
-      if (commonBuilder_ != null) {
-        commonBuilder_.dispose();
+      if (commonBuilder_ == null) {
+        common_ = null;
+      } else {
+        common_ = null;
         commonBuilder_ = null;
       }
       return this;
@@ -648,30 +623,19 @@ public com.google.api.JavaSettings build() {
     @java.lang.Override
     public com.google.api.JavaSettings buildPartial() {
       com.google.api.JavaSettings result = new com.google.api.JavaSettings(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      result.libraryPackage_ = libraryPackage_;
+      result.serviceClassNames_ = internalGetServiceClassNames();
+      result.serviceClassNames_.makeImmutable();
+      if (commonBuilder_ == null) {
+        result.common_ = common_;
+      } else {
+        result.common_ = commonBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.JavaSettings result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.libraryPackage_ = libraryPackage_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.serviceClassNames_ = internalGetServiceClassNames();
-        result.serviceClassNames_.makeImmutable();
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -719,11 +683,9 @@ public Builder mergeFrom(com.google.api.JavaSettings other) {
       if (other == com.google.api.JavaSettings.getDefaultInstance()) return this;
       if (!other.getLibraryPackage().isEmpty()) {
         libraryPackage_ = other.libraryPackage_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       internalGetMutableServiceClassNames().mergeFrom(other.internalGetServiceClassNames());
-      bitField0_ |= 0x00000002;
       if (other.hasCommon()) {
         mergeCommon(other.getCommon());
       }
@@ -756,7 +718,7 @@ public Builder mergeFrom(
             case 10:
               {
                 libraryPackage_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -769,13 +731,12 @@ public Builder mergeFrom(
                 internalGetMutableServiceClassNames()
                     .getMutableMap()
                     .put(serviceClassNames__.getKey(), serviceClassNames__.getValue());
-                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -808,9 +769,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
@@ -841,9 +800,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
@@ -874,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
@@ -891,8 +846,8 @@ public Builder setLibraryPackage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       libraryPackage_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -906,9 +861,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
@@ -919,8 +872,8 @@ public Builder setLibraryPackage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLibraryPackage() {
+
       libraryPackage_ = getDefaultInstance().getLibraryPackage();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -934,9 +887,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
@@ -952,8 +903,8 @@ public Builder setLibraryPackageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       libraryPackage_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -971,6 +922,8 @@ public Builder setLibraryPackageBytes(com.google.protobuf.ByteString value) {
 
     private com.google.protobuf.MapField
         internalGetMutableServiceClassNames() {
+      onChanged();
+      ;
       if (serviceClassNames_ == null) {
         serviceClassNames_ =
             com.google.protobuf.MapField.newMapField(
@@ -979,8 +932,6 @@ public Builder setLibraryPackageBytes(com.google.protobuf.ByteString value) {
       if (!serviceClassNames_.isMutable()) {
         serviceClassNames_ = serviceClassNames_.copy();
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
       return serviceClassNames_;
     }
 
@@ -998,9 +949,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:
@@ -1035,9 +984,7 @@ public java.util.Map 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:
@@ -1062,9 +1009,7 @@ public java.util.Map 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:
@@ -1075,10 +1020,8 @@ public java.util.Map getServiceClassNamesMap
      * map<string, string> service_class_names = 2;
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getServiceClassNamesOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getServiceClassNamesOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1097,9 +1040,7 @@ public java.util.Map 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:
@@ -1123,7 +1064,6 @@ public java.lang.String getServiceClassNamesOrThrow(java.lang.String key) {
     }
 
     public Builder clearServiceClassNames() {
-      bitField0_ = (bitField0_ & ~0x00000002);
       internalGetMutableServiceClassNames().getMutableMap().clear();
       return this;
     }
@@ -1138,9 +1078,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:
@@ -1161,7 +1099,6 @@ public Builder removeServiceClassNames(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableServiceClassNames() {
-      bitField0_ |= 0x00000002;
       return internalGetMutableServiceClassNames().getMutableMap();
     }
 
@@ -1175,9 +1112,7 @@ public java.util.Map 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:
@@ -1194,8 +1129,8 @@ public Builder putServiceClassNames(java.lang.String key, java.lang.String value
       if (value == null) {
         throw new NullPointerException("map value");
       }
+
       internalGetMutableServiceClassNames().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000002;
       return this;
     }
 
@@ -1209,9 +1144,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:
@@ -1224,7 +1157,6 @@ public Builder putServiceClassNames(java.lang.String key, java.lang.String value
     public Builder putAllServiceClassNames(
         java.util.Map values) {
       internalGetMutableServiceClassNames().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000002;
       return this;
     }
 
@@ -1247,7 +1179,7 @@ public Builder putAllServiceClassNames(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return commonBuilder_ != null || common_ != null;
     }
 
     /**
@@ -1286,11 +1218,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
           throw new NullPointerException();
         }
         common_ = value;
+        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1306,11 +1238,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
     public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderForValue) {
       if (commonBuilder_ == null) {
         common_ = builderForValue.build();
+        onChanged();
       } else {
         commonBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1325,20 +1257,19 @@ public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderFo
      */
     public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
       if (commonBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && common_ != null
-            && common_ != com.google.api.CommonLanguageSettings.getDefaultInstance()) {
-          getCommonBuilder().mergeFrom(value);
+        if (common_ != null) {
+          common_ =
+              com.google.api.CommonLanguageSettings.newBuilder(common_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           common_ = value;
         }
+        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-      if (common_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1352,13 +1283,14 @@ public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
      * .google.api.CommonLanguageSettings common = 3;
      */
     public Builder clearCommon() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      common_ = null;
-      if (commonBuilder_ != null) {
-        commonBuilder_.dispose();
+      if (commonBuilder_ == null) {
+        common_ = null;
+        onChanged();
+      } else {
+        common_ = null;
         commonBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1372,7 +1304,7 @@ public Builder clearCommon() {
      * .google.api.CommonLanguageSettings common = 3;
      */
     public com.google.api.CommonLanguageSettings.Builder getCommonBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getCommonFieldBuilder().getBuilder();
     }
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 23bcf75015..34737b3c32 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface JavaSettingsOrBuilder
@@ -33,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
@@ -56,9 +53,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
@@ -80,9 +75,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:
@@ -104,9 +97,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:
@@ -132,9 +123,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:
@@ -156,9 +145,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:
@@ -168,6 +155,7 @@ public interface JavaSettingsOrBuilder
    *
    * map<string, string> service_class_names = 2;
    */
+
   /* nullable */
   java.lang.String getServiceClassNamesOrDefault(
       java.lang.String key,
@@ -184,9 +172,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 03366f6346..2caa282261 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/auth.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -49,6 +48,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;
   }
@@ -62,8 +66,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,9 +336,7 @@ public com.google.protobuf.ByteString getCookieBytes() {
   }
 
   public static final int VALUE_PREFIX_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object valuePrefix_ = "";
+  private volatile java.lang.Object valuePrefix_;
 
   /**
    *
@@ -347,7 +347,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.
    * 

@@ -378,7 +377,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.
    * 

@@ -641,8 +639,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       valuePrefix_ = "";
+
       inCase_ = 0;
       in_ = null;
       return this;
@@ -670,24 +668,19 @@ public com.google.api.JwtLocation build() {
     @java.lang.Override
     public com.google.api.JwtLocation buildPartial() {
       com.google.api.JwtLocation result = new com.google.api.JwtLocation(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (inCase_ == 1) {
+        result.in_ = in_;
       }
-      buildPartialOneofs(result);
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.api.JwtLocation result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.valuePrefix_ = valuePrefix_;
+      if (inCase_ == 2) {
+        result.in_ = in_;
       }
-    }
-
-    private void buildPartialOneofs(com.google.api.JwtLocation result) {
+      if (inCase_ == 4) {
+        result.in_ = in_;
+      }
+      result.valuePrefix_ = valuePrefix_;
       result.inCase_ = inCase_;
-      result.in_ = this.in_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -737,7 +730,6 @@ public Builder mergeFrom(com.google.api.JwtLocation other) {
       if (other == com.google.api.JwtLocation.getDefaultInstance()) return this;
       if (!other.getValuePrefix().isEmpty()) {
         valuePrefix_ = other.valuePrefix_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       switch (other.getInCase()) {
@@ -810,7 +802,7 @@ public Builder mergeFrom(
             case 26:
               {
                 valuePrefix_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 26
             case 34:
@@ -851,8 +843,6 @@ public Builder clearIn() {
       return this;
     }
 
-    private int bitField0_;
-
     /**
      *
      *
@@ -1281,7 +1271,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.
      * 

@@ -1311,7 +1300,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.
      * 

@@ -1341,7 +1329,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.
      * 

@@ -1355,8 +1342,8 @@ public Builder setValuePrefix(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       valuePrefix_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1370,7 +1357,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.
      * 

@@ -1380,8 +1366,8 @@ public Builder setValuePrefix(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearValuePrefix() {
+
       valuePrefix_ = getDefaultInstance().getValuePrefix();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1395,7 +1381,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.
      * 

@@ -1410,8 +1395,8 @@ public Builder setValuePrefixBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       valuePrefix_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
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 c9a56790e4..7e3585e8d1 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/auth.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface JwtLocationOrBuilder
@@ -150,7 +149,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.
    * 

@@ -170,7 +168,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.
    * 

@@ -181,5 +178,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 6497bd8e96..573c0d69be 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/label.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -51,6 +50,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;
   }
@@ -223,9 +227,7 @@ private ValueType(int value) {
   }
 
   public static final int KEY_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object key_ = "";
+  private volatile java.lang.Object key_;
 
   /**
    *
@@ -276,7 +278,7 @@ public com.google.protobuf.ByteString getKeyBytes() {
   }
 
   public static final int VALUE_TYPE_FIELD_NUMBER = 2;
-  private int valueType_ = 0;
+  private int valueType_;
 
   /**
    *
@@ -307,15 +309,14 @@ public int getValueTypeValue() {
    */
   @java.lang.Override
   public com.google.api.LabelDescriptor.ValueType getValueType() {
+    @SuppressWarnings("deprecation")
     com.google.api.LabelDescriptor.ValueType result =
-        com.google.api.LabelDescriptor.ValueType.forNumber(valueType_);
+        com.google.api.LabelDescriptor.ValueType.valueOf(valueType_);
     return result == null ? com.google.api.LabelDescriptor.ValueType.UNRECOGNIZED : result;
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object description_ = "";
+  private volatile java.lang.Object description_;
 
   /**
    *
@@ -576,10 +577,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       key_ = "";
+
       valueType_ = 0;
+
       description_ = "";
+
       return this;
     }
 
@@ -605,26 +608,13 @@ public com.google.api.LabelDescriptor build() {
     @java.lang.Override
     public com.google.api.LabelDescriptor buildPartial() {
       com.google.api.LabelDescriptor result = new com.google.api.LabelDescriptor(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.key_ = key_;
+      result.valueType_ = valueType_;
+      result.description_ = description_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.LabelDescriptor result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.key_ = key_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.valueType_ = valueType_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.description_ = description_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -672,7 +662,6 @@ public Builder mergeFrom(com.google.api.LabelDescriptor other) {
       if (other == com.google.api.LabelDescriptor.getDefaultInstance()) return this;
       if (!other.getKey().isEmpty()) {
         key_ = other.key_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.valueType_ != 0) {
@@ -680,7 +669,6 @@ public Builder mergeFrom(com.google.api.LabelDescriptor other) {
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -712,19 +700,19 @@ public Builder mergeFrom(
             case 10:
               {
                 key_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 valueType_ = input.readEnum();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 description_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -744,8 +732,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object key_ = "";
 
     /**
@@ -810,8 +796,8 @@ public Builder setKey(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       key_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -828,8 +814,8 @@ public Builder setKey(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearKey() {
+
       key_ = getDefaultInstance().getKey();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -851,8 +837,8 @@ public Builder setKeyBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       key_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -888,8 +874,8 @@ public int getValueTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setValueTypeValue(int value) {
+
       valueType_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -907,8 +893,9 @@ public Builder setValueTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.api.LabelDescriptor.ValueType getValueType() {
+      @SuppressWarnings("deprecation")
       com.google.api.LabelDescriptor.ValueType result =
-          com.google.api.LabelDescriptor.ValueType.forNumber(valueType_);
+          com.google.api.LabelDescriptor.ValueType.valueOf(valueType_);
       return result == null ? com.google.api.LabelDescriptor.ValueType.UNRECOGNIZED : result;
     }
 
@@ -928,7 +915,7 @@ public Builder setValueType(com.google.api.LabelDescriptor.ValueType value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000002;
+
       valueType_ = value.getNumber();
       onChanged();
       return this;
@@ -946,7 +933,7 @@ public Builder setValueType(com.google.api.LabelDescriptor.ValueType value) {
      * @return This builder for chaining.
      */
     public Builder clearValueType() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       valueType_ = 0;
       onChanged();
       return this;
@@ -1016,8 +1003,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       description_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1034,8 +1021,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
+
       description_ = getDefaultInstance().getDescription();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1057,8 +1044,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       description_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptorOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptorOrBuilder.java
index 456276e19c..81851404b2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptorOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptorOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/label.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface LabelDescriptorOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LabelProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LabelProto.java
index 587157ba1b..b72b54293d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LabelProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LabelProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/label.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class LabelProto {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LaunchStage.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LaunchStage.java
index f32728f3bf..dc48887971 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LaunchStage.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LaunchStage.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/launch_stage.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LaunchStageProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LaunchStageProto.java
index 65d44d5e60..b730fedb74 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LaunchStageProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LaunchStageProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/launch_stage.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class LaunchStageProto {
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 2622feaacd..b8dd4d4c20 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -24,7 +23,6 @@
  *
  * 
  * 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
@@ -59,6 +57,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;
   }
@@ -72,9 +75,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -131,8 +132,6 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int LABELS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List labels_;
 
   /**
@@ -217,9 +216,7 @@ public com.google.api.LabelDescriptorOrBuilder getLabelsOrBuilder(int index) {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object description_ = "";
+  private volatile java.lang.Object description_;
 
   /**
    *
@@ -272,9 +269,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object displayName_ = "";
+  private volatile java.lang.Object displayName_;
 
   /**
    *
@@ -518,7 +513,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * 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
@@ -555,17 +549,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       if (labelsBuilder_ == null) {
         labels_ = java.util.Collections.emptyList();
       } else {
         labels_ = null;
         labelsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       description_ = "";
+
       displayName_ = "";
+
       return this;
     }
 
@@ -591,37 +587,21 @@ public com.google.api.LogDescriptor build() {
     @java.lang.Override
     public com.google.api.LogDescriptor buildPartial() {
       com.google.api.LogDescriptor result = new com.google.api.LogDescriptor(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.LogDescriptor result) {
+      int from_bitField0_ = bitField0_;
+      result.name_ = name_;
       if (labelsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           labels_ = java.util.Collections.unmodifiableList(labels_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.labels_ = labels_;
       } else {
         result.labels_ = labelsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.LogDescriptor result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.description_ = description_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.displayName_ = displayName_;
-      }
+      result.description_ = description_;
+      result.displayName_ = displayName_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -671,14 +651,13 @@ public Builder mergeFrom(com.google.api.LogDescriptor other) {
       if (other == com.google.api.LogDescriptor.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (labelsBuilder_ == null) {
         if (!other.labels_.isEmpty()) {
           if (labels_.isEmpty()) {
             labels_ = other.labels_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureLabelsIsMutable();
             labels_.addAll(other.labels_);
@@ -691,7 +670,7 @@ public Builder mergeFrom(com.google.api.LogDescriptor other) {
             labelsBuilder_.dispose();
             labelsBuilder_ = null;
             labels_ = other.labels_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             labelsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getLabelsFieldBuilder()
@@ -703,12 +682,10 @@ public Builder mergeFrom(com.google.api.LogDescriptor other) {
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -740,7 +717,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -758,13 +735,13 @@ public Builder mergeFrom(
             case 26:
               {
                 description_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 displayName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             default:
@@ -859,8 +836,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -880,8 +857,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -906,8 +883,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -916,9 +893,9 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureLabelsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         labels_ = new java.util.ArrayList(labels_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1163,7 +1140,7 @@ public Builder addAllLabels(
     public Builder clearLabels() {
       if (labelsBuilder_ == null) {
         labels_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         labelsBuilder_.clear();
@@ -1305,7 +1282,7 @@ public java.util.List getLabelsBuilderLi
                 com.google.api.LabelDescriptor,
                 com.google.api.LabelDescriptor.Builder,
                 com.google.api.LabelDescriptorOrBuilder>(
-                labels_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                labels_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         labels_ = null;
       }
       return labelsBuilder_;
@@ -1378,8 +1355,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       description_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1397,8 +1374,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
+
       description_ = getDefaultInstance().getDescription();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1421,8 +1398,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       description_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1494,8 +1471,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       displayName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1513,8 +1490,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
+
       displayName_ = getDefaultInstance().getDisplayName();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1537,8 +1514,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       displayName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LogDescriptorOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LogDescriptorOrBuilder.java
index 55ea16fd4b..976d352166 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LogDescriptorOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LogDescriptorOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface LogDescriptorOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LogProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LogProto.java
index 839580fb4f..481a408584 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LogProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LogProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class LogProto {
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 fb7ea3721d..74d3c46062 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/logging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -24,12 +23,10 @@
  *
  * 
  * 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:
@@ -78,6 +75,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;
   }
@@ -215,7 +217,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
@@ -224,6 +226,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;
@@ -240,9 +247,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int MONITORED_RESOURCE_FIELD_NUMBER = 3;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object monitoredResource_ = "";
+    private volatile java.lang.Object monitoredResource_;
 
     /**
      *
@@ -297,10 +302,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_;
 
     /**
      *
@@ -593,9 +595,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         monitoredResource_ = "";
-        logs_ = com.google.protobuf.LazyStringArrayList.emptyList();
+
+        logs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -623,24 +626,17 @@ 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);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        int from_bitField0_ = bitField0_;
+        result.monitoredResource_ = monitoredResource_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          logs_ = logs_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
+        result.logs_ = logs_;
         onBuilt();
         return result;
       }
 
-      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();
@@ -690,13 +686,12 @@ public Builder mergeFrom(com.google.api.Logging.LoggingDestination other) {
         if (other == com.google.api.Logging.LoggingDestination.getDefaultInstance()) return this;
         if (!other.getMonitoredResource().isEmpty()) {
           monitoredResource_ = other.monitoredResource_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.logs_.isEmpty()) {
           if (logs_.isEmpty()) {
             logs_ = other.logs_;
-            bitField0_ |= 0x00000002;
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureLogsIsMutable();
             logs_.addAll(other.logs_);
@@ -739,7 +734,7 @@ public Builder mergeFrom(
               case 26:
                 {
                   monitoredResource_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 26
               default:
@@ -831,8 +826,8 @@ public Builder setMonitoredResource(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         monitoredResource_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -851,8 +846,8 @@ public Builder setMonitoredResource(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearMonitoredResource() {
+
         monitoredResource_ = getDefaultInstance().getMonitoredResource();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -876,20 +871,20 @@ public Builder setMonitoredResourceBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         monitoredResource_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         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_ & 0x00000001) != 0)) {
           logs_ = new com.google.protobuf.LazyStringArrayList(logs_);
+          bitField0_ |= 0x00000001;
         }
-        bitField0_ |= 0x00000002;
       }
 
       /**
@@ -907,8 +902,7 @@ private void ensureLogsIsMutable() {
        * @return A list containing the logs.
        */
       public com.google.protobuf.ProtocolStringList getLogsList() {
-        logs_.makeImmutable();
-        return logs_;
+        return logs_.getUnmodifiableView();
       }
 
       /**
@@ -989,7 +983,6 @@ public Builder setLogs(int index, java.lang.String value) {
         }
         ensureLogsIsMutable();
         logs_.set(index, value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1015,7 +1008,6 @@ public Builder addLogs(java.lang.String value) {
         }
         ensureLogsIsMutable();
         logs_.add(value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1038,7 +1030,6 @@ public Builder addLogs(java.lang.String value) {
       public Builder addAllLogs(java.lang.Iterable values) {
         ensureLogsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, logs_);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1058,9 +1049,8 @@ public Builder addAllLogs(java.lang.Iterable values) {
        * @return This builder for chaining.
        */
       public Builder clearLogs() {
-        logs_ = com.google.protobuf.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        ;
+        logs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1087,7 +1077,6 @@ public Builder addLogsBytes(com.google.protobuf.ByteString value) {
         checkByteStringIsUtf8(value);
         ensureLogsIsMutable();
         logs_.add(value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1157,8 +1146,6 @@ public com.google.api.Logging.LoggingDestination getDefaultInstanceForType() {
   }
 
   public static final int PRODUCER_DESTINATIONS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List producerDestinations_;
 
   /**
@@ -1249,8 +1236,6 @@ public com.google.api.Logging.LoggingDestinationOrBuilder getProducerDestination
   }
 
   public static final int CONSUMER_DESTINATIONS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List consumerDestinations_;
 
   /**
@@ -1518,12 +1503,10 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * 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:
@@ -1576,7 +1559,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (producerDestinationsBuilder_ == null) {
         producerDestinations_ = java.util.Collections.emptyList();
       } else {
@@ -1616,15 +1598,7 @@ public com.google.api.Logging build() {
     @java.lang.Override
     public com.google.api.Logging buildPartial() {
       com.google.api.Logging result = new com.google.api.Logging(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.Logging result) {
+      int from_bitField0_ = bitField0_;
       if (producerDestinationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           producerDestinations_ = java.util.Collections.unmodifiableList(producerDestinations_);
@@ -1643,10 +1617,8 @@ private void buildPartialRepeatedFields(com.google.api.Logging result) {
       } else {
         result.consumerDestinations_ = consumerDestinationsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.Logging result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LoggingOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LoggingOrBuilder.java
index abd5aa2195..0cc597e725 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LoggingOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LoggingOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/logging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface LoggingOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LoggingProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LoggingProto.java
index 36d1bd51b3..be670d0736 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LoggingProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/LoggingProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/logging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class LoggingProto {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodPolicy.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodPolicy.java
index 4d84dbe997..6dadaf79c7 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodPolicy.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodPolicy.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new MethodPolicy();
   }
 
+  @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.PolicyProto.internal_static_google_api_MethodPolicy_descriptor;
   }
@@ -63,9 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 9;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object selector_ = "";
+  private volatile java.lang.Object selector_;
 
   /**
    *
@@ -73,10 +75,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * Selects a method to which these policies should be enforced, for example,
    * "google.pubsub.v1.Subscriber.CreateSubscription".
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
-   *
    * NOTE: This field must not be set in the proto annotation. It will be
    * automatically filled by the service config compiler .
    * 

@@ -104,10 +104,8 @@ public java.lang.String getSelector() {
    * 
    * Selects a method to which these policies should be enforced, for example,
    * "google.pubsub.v1.Subscriber.CreateSubscription".
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
-   *
    * NOTE: This field must not be set in the proto annotation. It will be
    * automatically filled by the service config compiler .
    * 

@@ -130,8 +128,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
   }
 
   public static final int REQUEST_POLICIES_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List requestPolicies_;
 
   /**
@@ -409,15 +405,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       selector_ = "";
+
       if (requestPoliciesBuilder_ == null) {
         requestPolicies_ = java.util.Collections.emptyList();
       } else {
         requestPolicies_ = null;
         requestPoliciesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -443,31 +439,19 @@ public com.google.api.MethodPolicy build() {
     @java.lang.Override
     public com.google.api.MethodPolicy buildPartial() {
       com.google.api.MethodPolicy result = new com.google.api.MethodPolicy(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.MethodPolicy result) {
+      int from_bitField0_ = bitField0_;
+      result.selector_ = selector_;
       if (requestPoliciesBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           requestPolicies_ = java.util.Collections.unmodifiableList(requestPolicies_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.requestPolicies_ = requestPolicies_;
       } else {
         result.requestPolicies_ = requestPoliciesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.MethodPolicy result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.selector_ = selector_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -517,14 +501,13 @@ public Builder mergeFrom(com.google.api.MethodPolicy other) {
       if (other == com.google.api.MethodPolicy.getDefaultInstance()) return this;
       if (!other.getSelector().isEmpty()) {
         selector_ = other.selector_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (requestPoliciesBuilder_ == null) {
         if (!other.requestPolicies_.isEmpty()) {
           if (requestPolicies_.isEmpty()) {
             requestPolicies_ = other.requestPolicies_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureRequestPoliciesIsMutable();
             requestPolicies_.addAll(other.requestPolicies_);
@@ -537,7 +520,7 @@ public Builder mergeFrom(com.google.api.MethodPolicy other) {
             requestPoliciesBuilder_.dispose();
             requestPoliciesBuilder_ = null;
             requestPolicies_ = other.requestPolicies_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             requestPoliciesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getRequestPoliciesFieldBuilder()
@@ -588,7 +571,7 @@ public Builder mergeFrom(
             case 74:
               {
                 selector_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 74
             default:
@@ -618,10 +601,8 @@ public Builder mergeFrom(
      * 
      * Selects a method to which these policies should be enforced, for example,
      * "google.pubsub.v1.Subscriber.CreateSubscription".
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
-     *
      * NOTE: This field must not be set in the proto annotation. It will be
      * automatically filled by the service config compiler .
      * 

@@ -648,10 +629,8 @@ public java.lang.String getSelector() {
      * 
      * Selects a method to which these policies should be enforced, for example,
      * "google.pubsub.v1.Subscriber.CreateSubscription".
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
-     *
      * NOTE: This field must not be set in the proto annotation. It will be
      * automatically filled by the service config compiler .
      * 

@@ -678,10 +657,8 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      * 
      * Selects a method to which these policies should be enforced, for example,
      * "google.pubsub.v1.Subscriber.CreateSubscription".
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
-     *
      * NOTE: This field must not be set in the proto annotation. It will be
      * automatically filled by the service config compiler .
      * 

@@ -695,8 +672,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -707,10 +684,8 @@ public Builder setSelector(java.lang.String value) {
      * 
      * Selects a method to which these policies should be enforced, for example,
      * "google.pubsub.v1.Subscriber.CreateSubscription".
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
-     *
      * NOTE: This field must not be set in the proto annotation. It will be
      * automatically filled by the service config compiler .
      * 

@@ -720,8 +695,8 @@ public Builder setSelector(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSelector() {
+
       selector_ = getDefaultInstance().getSelector();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -732,10 +707,8 @@ public Builder clearSelector() {
      * 
      * Selects a method to which these policies should be enforced, for example,
      * "google.pubsub.v1.Subscriber.CreateSubscription".
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
-     *
      * NOTE: This field must not be set in the proto annotation. It will be
      * automatically filled by the service config compiler .
      * 

@@ -750,8 +723,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -760,9 +733,9 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureRequestPoliciesIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         requestPolicies_ = new java.util.ArrayList(requestPolicies_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -987,7 +960,7 @@ public Builder addAllRequestPolicies(
     public Builder clearRequestPolicies() {
       if (requestPoliciesBuilder_ == null) {
         requestPolicies_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         requestPoliciesBuilder_.clear();
@@ -1116,7 +1089,7 @@ public java.util.List getRequestPoliciesBuil
                 com.google.api.FieldPolicy.Builder,
                 com.google.api.FieldPolicyOrBuilder>(
                 requestPolicies_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000001) != 0),
                 getParentForChildren(),
                 isClean());
         requestPolicies_ = null;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodPolicyOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodPolicyOrBuilder.java
index 75a6ad668b..c02f51a48f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodPolicyOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodPolicyOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface MethodPolicyOrBuilder
@@ -30,10 +29,8 @@ public interface MethodPolicyOrBuilder
    * 
    * Selects a method to which these policies should be enforced, for example,
    * "google.pubsub.v1.Subscriber.CreateSubscription".
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
-   *
    * NOTE: This field must not be set in the proto annotation. It will be
    * automatically filled by the service config compiler .
    * 

@@ -50,10 +47,8 @@ public interface MethodPolicyOrBuilder
    * 
    * Selects a method to which these policies should be enforced, for example,
    * "google.pubsub.v1.Subscriber.CreateSubscription".
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
-   *
    * NOTE: This field must not be set in the proto annotation. It will be
    * automatically filled by the service config compiler .
    * 

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 82e99b0660..6d891039b1 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -41,7 +40,7 @@ private MethodSettings(com.google.protobuf.GeneratedMessageV3.Builder builder
 
   private MethodSettings() {
     selector_ = "";
-    autoPopulatedFields_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    autoPopulatedFields_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
   @java.lang.Override
@@ -50,6 +49,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;
   }
@@ -235,6 +239,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;
@@ -250,7 +259,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
               com.google.api.MethodSettings.LongRunning.Builder.class);
     }
 
-    private int bitField0_;
     public static final int INITIAL_POLL_DELAY_FIELD_NUMBER = 1;
     private com.google.protobuf.Duration initialPollDelay_;
 
@@ -268,7 +276,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      */
     @java.lang.Override
     public boolean hasInitialPollDelay() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return initialPollDelay_ != null;
     }
 
     /**
@@ -302,13 +310,11 @@ public com.google.protobuf.Duration getInitialPollDelay() {
      */
     @java.lang.Override
     public com.google.protobuf.DurationOrBuilder getInitialPollDelayOrBuilder() {
-      return initialPollDelay_ == null
-          ? com.google.protobuf.Duration.getDefaultInstance()
-          : initialPollDelay_;
+      return getInitialPollDelay();
     }
 
     public static final int POLL_DELAY_MULTIPLIER_FIELD_NUMBER = 2;
-    private float pollDelayMultiplier_ = 0F;
+    private float pollDelayMultiplier_;
 
     /**
      *
@@ -345,7 +351,7 @@ public float getPollDelayMultiplier() {
      */
     @java.lang.Override
     public boolean hasMaxPollDelay() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return maxPollDelay_ != null;
     }
 
     /**
@@ -379,9 +385,7 @@ public com.google.protobuf.Duration getMaxPollDelay() {
      */
     @java.lang.Override
     public com.google.protobuf.DurationOrBuilder getMaxPollDelayOrBuilder() {
-      return maxPollDelay_ == null
-          ? com.google.protobuf.Duration.getDefaultInstance()
-          : maxPollDelay_;
+      return getMaxPollDelay();
     }
 
     public static final int TOTAL_POLL_TIMEOUT_FIELD_NUMBER = 4;
@@ -401,7 +405,7 @@ public com.google.protobuf.DurationOrBuilder getMaxPollDelayOrBuilder() {
      */
     @java.lang.Override
     public boolean hasTotalPollTimeout() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return totalPollTimeout_ != null;
     }
 
     /**
@@ -435,9 +439,7 @@ public com.google.protobuf.Duration getTotalPollTimeout() {
      */
     @java.lang.Override
     public com.google.protobuf.DurationOrBuilder getTotalPollTimeoutOrBuilder() {
-      return totalPollTimeout_ == null
-          ? com.google.protobuf.Duration.getDefaultInstance()
-          : totalPollTimeout_;
+      return getTotalPollTimeout();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -454,16 +456,16 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (initialPollDelay_ != null) {
         output.writeMessage(1, getInitialPollDelay());
       }
       if (java.lang.Float.floatToRawIntBits(pollDelayMultiplier_) != 0) {
         output.writeFloat(2, pollDelayMultiplier_);
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (maxPollDelay_ != null) {
         output.writeMessage(3, getMaxPollDelay());
       }
-      if (((bitField0_ & 0x00000004) != 0)) {
+      if (totalPollTimeout_ != null) {
         output.writeMessage(4, getTotalPollTimeout());
       }
       getUnknownFields().writeTo(output);
@@ -475,16 +477,16 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (initialPollDelay_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getInitialPollDelay());
       }
       if (java.lang.Float.floatToRawIntBits(pollDelayMultiplier_) != 0) {
         size += com.google.protobuf.CodedOutputStream.computeFloatSize(2, pollDelayMultiplier_);
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (maxPollDelay_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getMaxPollDelay());
       }
-      if (((bitField0_ & 0x00000004) != 0)) {
+      if (totalPollTimeout_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getTotalPollTimeout());
       }
       size += getUnknownFields().getSerializedSize();
@@ -678,41 +680,33 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.api.MethodSettings.LongRunning.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getInitialPollDelayFieldBuilder();
-          getMaxPollDelayFieldBuilder();
-          getTotalPollTimeoutFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
-        initialPollDelay_ = null;
-        if (initialPollDelayBuilder_ != null) {
-          initialPollDelayBuilder_.dispose();
+        if (initialPollDelayBuilder_ == null) {
+          initialPollDelay_ = null;
+        } else {
+          initialPollDelay_ = null;
           initialPollDelayBuilder_ = null;
         }
         pollDelayMultiplier_ = 0F;
-        maxPollDelay_ = null;
-        if (maxPollDelayBuilder_ != null) {
-          maxPollDelayBuilder_.dispose();
+
+        if (maxPollDelayBuilder_ == null) {
+          maxPollDelay_ = null;
+        } else {
+          maxPollDelay_ = null;
           maxPollDelayBuilder_ = null;
         }
-        totalPollTimeout_ = null;
-        if (totalPollTimeoutBuilder_ != null) {
-          totalPollTimeoutBuilder_.dispose();
+        if (totalPollTimeoutBuilder_ == null) {
+          totalPollTimeout_ = null;
+        } else {
+          totalPollTimeout_ = null;
           totalPollTimeoutBuilder_ = null;
         }
         return this;
@@ -742,39 +736,24 @@ public com.google.api.MethodSettings.LongRunning build() {
       public com.google.api.MethodSettings.LongRunning buildPartial() {
         com.google.api.MethodSettings.LongRunning result =
             new com.google.api.MethodSettings.LongRunning(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
-        onBuilt();
-        return result;
-      }
-
-      private void buildPartial0(com.google.api.MethodSettings.LongRunning result) {
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.initialPollDelay_ =
-              initialPollDelayBuilder_ == null
-                  ? initialPollDelay_
-                  : initialPollDelayBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.pollDelayMultiplier_ = pollDelayMultiplier_;
+        if (initialPollDelayBuilder_ == null) {
+          result.initialPollDelay_ = initialPollDelay_;
+        } else {
+          result.initialPollDelay_ = initialPollDelayBuilder_.build();
         }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.maxPollDelay_ =
-              maxPollDelayBuilder_ == null ? maxPollDelay_ : maxPollDelayBuilder_.build();
-          to_bitField0_ |= 0x00000002;
+        result.pollDelayMultiplier_ = pollDelayMultiplier_;
+        if (maxPollDelayBuilder_ == null) {
+          result.maxPollDelay_ = maxPollDelay_;
+        } else {
+          result.maxPollDelay_ = maxPollDelayBuilder_.build();
         }
-        if (((from_bitField0_ & 0x00000008) != 0)) {
-          result.totalPollTimeout_ =
-              totalPollTimeoutBuilder_ == null
-                  ? totalPollTimeout_
-                  : totalPollTimeoutBuilder_.build();
-          to_bitField0_ |= 0x00000004;
+        if (totalPollTimeoutBuilder_ == null) {
+          result.totalPollTimeout_ = totalPollTimeout_;
+        } else {
+          result.totalPollTimeout_ = totalPollTimeoutBuilder_.build();
         }
-        result.bitField0_ |= to_bitField0_;
+        onBuilt();
+        return result;
       }
 
       @java.lang.Override
@@ -866,26 +845,26 @@ public Builder mergeFrom(
                 {
                   input.readMessage(
                       getInitialPollDelayFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 21:
                 {
                   pollDelayMultiplier_ = input.readFloat();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 21
               case 26:
                 {
                   input.readMessage(getMaxPollDelayFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 26
               case 34:
                 {
                   input.readMessage(
                       getTotalPollTimeoutFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000008;
+
                   break;
                 } // case 34
               default:
@@ -905,8 +884,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private com.google.protobuf.Duration initialPollDelay_;
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.protobuf.Duration,
@@ -927,7 +904,7 @@ public Builder mergeFrom(
        * @return Whether the initialPollDelay field is set.
        */
       public boolean hasInitialPollDelay() {
-        return ((bitField0_ & 0x00000001) != 0);
+        return initialPollDelayBuilder_ != null || initialPollDelay_ != null;
       }
 
       /**
@@ -968,11 +945,11 @@ public Builder setInitialPollDelay(com.google.protobuf.Duration value) {
             throw new NullPointerException();
           }
           initialPollDelay_ = value;
+          onChanged();
         } else {
           initialPollDelayBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+
         return this;
       }
 
@@ -989,11 +966,11 @@ public Builder setInitialPollDelay(com.google.protobuf.Duration value) {
       public Builder setInitialPollDelay(com.google.protobuf.Duration.Builder builderForValue) {
         if (initialPollDelayBuilder_ == null) {
           initialPollDelay_ = builderForValue.build();
+          onChanged();
         } else {
           initialPollDelayBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+
         return this;
       }
 
@@ -1009,20 +986,19 @@ public Builder setInitialPollDelay(com.google.protobuf.Duration.Builder builderF
        */
       public Builder mergeInitialPollDelay(com.google.protobuf.Duration value) {
         if (initialPollDelayBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)
-              && initialPollDelay_ != null
-              && initialPollDelay_ != com.google.protobuf.Duration.getDefaultInstance()) {
-            getInitialPollDelayBuilder().mergeFrom(value);
+          if (initialPollDelay_ != null) {
+            initialPollDelay_ =
+                com.google.protobuf.Duration.newBuilder(initialPollDelay_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             initialPollDelay_ = value;
           }
+          onChanged();
         } else {
           initialPollDelayBuilder_.mergeFrom(value);
         }
-        if (initialPollDelay_ != null) {
-          bitField0_ |= 0x00000001;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -1037,13 +1013,14 @@ public Builder mergeInitialPollDelay(com.google.protobuf.Duration value) {
        * .google.protobuf.Duration initial_poll_delay = 1;
        */
       public Builder clearInitialPollDelay() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        initialPollDelay_ = null;
-        if (initialPollDelayBuilder_ != null) {
-          initialPollDelayBuilder_.dispose();
+        if (initialPollDelayBuilder_ == null) {
+          initialPollDelay_ = null;
+          onChanged();
+        } else {
+          initialPollDelay_ = null;
           initialPollDelayBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1058,7 +1035,7 @@ public Builder clearInitialPollDelay() {
        * .google.protobuf.Duration initial_poll_delay = 1;
        */
       public com.google.protobuf.Duration.Builder getInitialPollDelayBuilder() {
-        bitField0_ |= 0x00000001;
+
         onChanged();
         return getInitialPollDelayFieldBuilder().getBuilder();
       }
@@ -1147,7 +1124,6 @@ public float getPollDelayMultiplier() {
       public Builder setPollDelayMultiplier(float value) {
 
         pollDelayMultiplier_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1166,7 +1142,7 @@ public Builder setPollDelayMultiplier(float value) {
        * @return This builder for chaining.
        */
       public Builder clearPollDelayMultiplier() {
-        bitField0_ = (bitField0_ & ~0x00000002);
+
         pollDelayMultiplier_ = 0F;
         onChanged();
         return this;
@@ -1192,7 +1168,7 @@ public Builder clearPollDelayMultiplier() {
        * @return Whether the maxPollDelay field is set.
        */
       public boolean hasMaxPollDelay() {
-        return ((bitField0_ & 0x00000004) != 0);
+        return maxPollDelayBuilder_ != null || maxPollDelay_ != null;
       }
 
       /**
@@ -1233,11 +1209,11 @@ public Builder setMaxPollDelay(com.google.protobuf.Duration value) {
             throw new NullPointerException();
           }
           maxPollDelay_ = value;
+          onChanged();
         } else {
           maxPollDelayBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
+
         return this;
       }
 
@@ -1254,11 +1230,11 @@ public Builder setMaxPollDelay(com.google.protobuf.Duration value) {
       public Builder setMaxPollDelay(com.google.protobuf.Duration.Builder builderForValue) {
         if (maxPollDelayBuilder_ == null) {
           maxPollDelay_ = builderForValue.build();
+          onChanged();
         } else {
           maxPollDelayBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
+
         return this;
       }
 
@@ -1274,20 +1250,19 @@ public Builder setMaxPollDelay(com.google.protobuf.Duration.Builder builderForVa
        */
       public Builder mergeMaxPollDelay(com.google.protobuf.Duration value) {
         if (maxPollDelayBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) != 0)
-              && maxPollDelay_ != null
-              && maxPollDelay_ != com.google.protobuf.Duration.getDefaultInstance()) {
-            getMaxPollDelayBuilder().mergeFrom(value);
+          if (maxPollDelay_ != null) {
+            maxPollDelay_ =
+                com.google.protobuf.Duration.newBuilder(maxPollDelay_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             maxPollDelay_ = value;
           }
+          onChanged();
         } else {
           maxPollDelayBuilder_.mergeFrom(value);
         }
-        if (maxPollDelay_ != null) {
-          bitField0_ |= 0x00000004;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -1302,13 +1277,14 @@ public Builder mergeMaxPollDelay(com.google.protobuf.Duration value) {
        * .google.protobuf.Duration max_poll_delay = 3;
        */
       public Builder clearMaxPollDelay() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        maxPollDelay_ = null;
-        if (maxPollDelayBuilder_ != null) {
-          maxPollDelayBuilder_.dispose();
+        if (maxPollDelayBuilder_ == null) {
+          maxPollDelay_ = null;
+          onChanged();
+        } else {
+          maxPollDelay_ = null;
           maxPollDelayBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1323,7 +1299,7 @@ public Builder clearMaxPollDelay() {
        * .google.protobuf.Duration max_poll_delay = 3;
        */
       public com.google.protobuf.Duration.Builder getMaxPollDelayBuilder() {
-        bitField0_ |= 0x00000004;
+
         onChanged();
         return getMaxPollDelayFieldBuilder().getBuilder();
       }
@@ -1395,7 +1371,7 @@ public com.google.protobuf.DurationOrBuilder getMaxPollDelayOrBuilder() {
        * @return Whether the totalPollTimeout field is set.
        */
       public boolean hasTotalPollTimeout() {
-        return ((bitField0_ & 0x00000008) != 0);
+        return totalPollTimeoutBuilder_ != null || totalPollTimeout_ != null;
       }
 
       /**
@@ -1436,11 +1412,11 @@ public Builder setTotalPollTimeout(com.google.protobuf.Duration value) {
             throw new NullPointerException();
           }
           totalPollTimeout_ = value;
+          onChanged();
         } else {
           totalPollTimeoutBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000008;
-        onChanged();
+
         return this;
       }
 
@@ -1457,11 +1433,11 @@ public Builder setTotalPollTimeout(com.google.protobuf.Duration value) {
       public Builder setTotalPollTimeout(com.google.protobuf.Duration.Builder builderForValue) {
         if (totalPollTimeoutBuilder_ == null) {
           totalPollTimeout_ = builderForValue.build();
+          onChanged();
         } else {
           totalPollTimeoutBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000008;
-        onChanged();
+
         return this;
       }
 
@@ -1477,20 +1453,19 @@ public Builder setTotalPollTimeout(com.google.protobuf.Duration.Builder builderF
        */
       public Builder mergeTotalPollTimeout(com.google.protobuf.Duration value) {
         if (totalPollTimeoutBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) != 0)
-              && totalPollTimeout_ != null
-              && totalPollTimeout_ != com.google.protobuf.Duration.getDefaultInstance()) {
-            getTotalPollTimeoutBuilder().mergeFrom(value);
+          if (totalPollTimeout_ != null) {
+            totalPollTimeout_ =
+                com.google.protobuf.Duration.newBuilder(totalPollTimeout_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             totalPollTimeout_ = value;
           }
+          onChanged();
         } else {
           totalPollTimeoutBuilder_.mergeFrom(value);
         }
-        if (totalPollTimeout_ != null) {
-          bitField0_ |= 0x00000008;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -1505,13 +1480,14 @@ public Builder mergeTotalPollTimeout(com.google.protobuf.Duration value) {
        * .google.protobuf.Duration total_poll_timeout = 4;
        */
       public Builder clearTotalPollTimeout() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        totalPollTimeout_ = null;
-        if (totalPollTimeoutBuilder_ != null) {
-          totalPollTimeoutBuilder_.dispose();
+        if (totalPollTimeoutBuilder_ == null) {
+          totalPollTimeout_ = null;
+          onChanged();
+        } else {
+          totalPollTimeout_ = null;
           totalPollTimeoutBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1526,7 +1502,7 @@ public Builder clearTotalPollTimeout() {
        * .google.protobuf.Duration total_poll_timeout = 4;
        */
       public com.google.protobuf.Duration.Builder getTotalPollTimeoutBuilder() {
-        bitField0_ |= 0x00000008;
+
         onChanged();
         return getTotalPollTimeoutFieldBuilder().getBuilder();
       }
@@ -1642,11 +1618,8 @@ public com.google.api.MethodSettings.LongRunning getDefaultInstanceForType() {
     }
   }
 
-  private int bitField0_;
   public static final int SELECTOR_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object selector_ = "";
+  private volatile java.lang.Object selector_;
 
   /**
    *
@@ -1654,9 +1627,7 @@ public com.google.api.MethodSettings.LongRunning getDefaultInstanceForType() {
    * 
    * The fully qualified name of the method, for which the options below apply.
    * This is used to find the method to apply the options.
-   *
    * Example:
-   *
    *    publishing:
    *      method_settings:
    *      - selector: google.storage.control.v2.StorageControl.CreateFolder
@@ -1686,9 +1657,7 @@ public java.lang.String getSelector() {
    * 
    * The fully qualified name of the method, for which the options below apply.
    * This is used to find the method to apply the options.
-   *
    * Example:
-   *
    *    publishing:
    *      method_settings:
    *      - selector: google.storage.control.v2.StorageControl.CreateFolder
@@ -1722,9 +1691,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
@@ -1741,7 +1708,7 @@ public com.google.protobuf.ByteString getSelectorBytes() {
    */
   @java.lang.Override
   public boolean hasLongRunning() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return longRunning_ != null;
   }
 
   /**
@@ -1751,9 +1718,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
@@ -1782,9 +1747,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
@@ -1799,16 +1762,11 @@ public com.google.api.MethodSettings.LongRunning getLongRunning() {
    */
   @java.lang.Override
   public com.google.api.MethodSettings.LongRunningOrBuilder getLongRunningOrBuilder() {
-    return longRunning_ == null
-        ? com.google.api.MethodSettings.LongRunning.getDefaultInstance()
-        : longRunning_;
+    return getLongRunning();
   }
 
   public static final int AUTO_POPULATED_FIELDS_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList autoPopulatedFields_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList autoPopulatedFields_;
 
   /**
    *
@@ -1817,9 +1775,7 @@ public com.google.api.MethodSettings.LongRunningOrBuilder getLongRunningOrBuilde
    * List of top-level fields of the request message, that should be
    * automatically populated by the client libraries based on their
    * (google.api.field_info).format. Currently supported format: UUID4.
-   *
    * Example of a YAML configuration:
-   *
    *    publishing:
    *      method_settings:
    *      - selector: google.example.v1.ExampleService.CreateExample
@@ -1842,9 +1798,7 @@ public com.google.protobuf.ProtocolStringList getAutoPopulatedFieldsList() {
    * List of top-level fields of the request message, that should be
    * automatically populated by the client libraries based on their
    * (google.api.field_info).format. Currently supported format: UUID4.
-   *
    * Example of a YAML configuration:
-   *
    *    publishing:
    *      method_settings:
    *      - selector: google.example.v1.ExampleService.CreateExample
@@ -1867,9 +1821,7 @@ public int getAutoPopulatedFieldsCount() {
    * List of top-level fields of the request message, that should be
    * automatically populated by the client libraries based on their
    * (google.api.field_info).format. Currently supported format: UUID4.
-   *
    * Example of a YAML configuration:
-   *
    *    publishing:
    *      method_settings:
    *      - selector: google.example.v1.ExampleService.CreateExample
@@ -1893,9 +1845,7 @@ public java.lang.String getAutoPopulatedFields(int index) {
    * List of top-level fields of the request message, that should be
    * automatically populated by the client libraries based on their
    * (google.api.field_info).format. Currently supported format: UUID4.
-   *
    * Example of a YAML configuration:
-   *
    *    publishing:
    *      method_settings:
    *      - selector: google.example.v1.ExampleService.CreateExample
@@ -1929,7 +1879,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(selector_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, selector_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (longRunning_ != null) {
       output.writeMessage(2, getLongRunning());
     }
     for (int i = 0; i < autoPopulatedFields_.size(); i++) {
@@ -1947,7 +1897,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(selector_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, selector_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (longRunning_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getLongRunning());
     }
     {
@@ -2126,32 +2076,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.MethodSettings.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getLongRunningFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       selector_ = "";
-      longRunning_ = null;
-      if (longRunningBuilder_ != null) {
-        longRunningBuilder_.dispose();
+
+      if (longRunningBuilder_ == null) {
+        longRunning_ = null;
+      } else {
+        longRunning_ = null;
         longRunningBuilder_ = null;
       }
-      autoPopulatedFields_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      autoPopulatedFields_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -2177,29 +2120,20 @@ public com.google.api.MethodSettings build() {
     @java.lang.Override
     public com.google.api.MethodSettings buildPartial() {
       com.google.api.MethodSettings result = new com.google.api.MethodSettings(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.api.MethodSettings result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.selector_ = selector_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.longRunning_ =
-            longRunningBuilder_ == null ? longRunning_ : longRunningBuilder_.build();
-        to_bitField0_ |= 0x00000001;
+      result.selector_ = selector_;
+      if (longRunningBuilder_ == null) {
+        result.longRunning_ = longRunning_;
+      } else {
+        result.longRunning_ = longRunningBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        autoPopulatedFields_.makeImmutable();
-        result.autoPopulatedFields_ = autoPopulatedFields_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        autoPopulatedFields_ = autoPopulatedFields_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
-      result.bitField0_ |= to_bitField0_;
+      result.autoPopulatedFields_ = autoPopulatedFields_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -2249,7 +2183,6 @@ public Builder mergeFrom(com.google.api.MethodSettings other) {
       if (other == com.google.api.MethodSettings.getDefaultInstance()) return this;
       if (!other.getSelector().isEmpty()) {
         selector_ = other.selector_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasLongRunning()) {
@@ -2258,7 +2191,7 @@ public Builder mergeFrom(com.google.api.MethodSettings other) {
       if (!other.autoPopulatedFields_.isEmpty()) {
         if (autoPopulatedFields_.isEmpty()) {
           autoPopulatedFields_ = other.autoPopulatedFields_;
-          bitField0_ |= 0x00000004;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureAutoPopulatedFieldsIsMutable();
           autoPopulatedFields_.addAll(other.autoPopulatedFields_);
@@ -2294,13 +2227,13 @@ public Builder mergeFrom(
             case 10:
               {
                 selector_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getLongRunningFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
@@ -2337,9 +2270,7 @@ public Builder mergeFrom(
      * 
      * The fully qualified name of the method, for which the options below apply.
      * This is used to find the method to apply the options.
-     *
      * Example:
-     *
      *    publishing:
      *      method_settings:
      *      - selector: google.storage.control.v2.StorageControl.CreateFolder
@@ -2368,9 +2299,7 @@ public java.lang.String getSelector() {
      * 
      * The fully qualified name of the method, for which the options below apply.
      * This is used to find the method to apply the options.
-     *
      * Example:
-     *
      *    publishing:
      *      method_settings:
      *      - selector: google.storage.control.v2.StorageControl.CreateFolder
@@ -2399,9 +2328,7 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      * 
      * The fully qualified name of the method, for which the options below apply.
      * This is used to find the method to apply the options.
-     *
      * Example:
-     *
      *    publishing:
      *      method_settings:
      *      - selector: google.storage.control.v2.StorageControl.CreateFolder
@@ -2417,8 +2344,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2429,9 +2356,7 @@ public Builder setSelector(java.lang.String value) {
      * 
      * The fully qualified name of the method, for which the options below apply.
      * This is used to find the method to apply the options.
-     *
      * Example:
-     *
      *    publishing:
      *      method_settings:
      *      - selector: google.storage.control.v2.StorageControl.CreateFolder
@@ -2443,8 +2368,8 @@ public Builder setSelector(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSelector() {
+
       selector_ = getDefaultInstance().getSelector();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -2455,9 +2380,7 @@ public Builder clearSelector() {
      * 
      * The fully qualified name of the method, for which the options below apply.
      * This is used to find the method to apply the options.
-     *
      * Example:
-     *
      *    publishing:
      *      method_settings:
      *      - selector: google.storage.control.v2.StorageControl.CreateFolder
@@ -2474,8 +2397,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2494,9 +2417,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
@@ -2512,7 +2433,7 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
      * @return Whether the longRunning field is set.
      */
     public boolean hasLongRunning() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return longRunningBuilder_ != null || longRunning_ != null;
     }
 
     /**
@@ -2522,9 +2443,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
@@ -2556,9 +2475,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
@@ -2577,11 +2494,11 @@ public Builder setLongRunning(com.google.api.MethodSettings.LongRunning value) {
           throw new NullPointerException();
         }
         longRunning_ = value;
+        onChanged();
       } else {
         longRunningBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -2592,9 +2509,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
@@ -2611,11 +2526,11 @@ public Builder setLongRunning(
         com.google.api.MethodSettings.LongRunning.Builder builderForValue) {
       if (longRunningBuilder_ == null) {
         longRunning_ = builderForValue.build();
+        onChanged();
       } else {
         longRunningBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -2626,9 +2541,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
@@ -2643,20 +2556,19 @@ public Builder setLongRunning(
      */
     public Builder mergeLongRunning(com.google.api.MethodSettings.LongRunning value) {
       if (longRunningBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && longRunning_ != null
-            && longRunning_ != com.google.api.MethodSettings.LongRunning.getDefaultInstance()) {
-          getLongRunningBuilder().mergeFrom(value);
+        if (longRunning_ != null) {
+          longRunning_ =
+              com.google.api.MethodSettings.LongRunning.newBuilder(longRunning_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           longRunning_ = value;
         }
+        onChanged();
       } else {
         longRunningBuilder_.mergeFrom(value);
       }
-      if (longRunning_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2667,9 +2579,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
@@ -2683,13 +2593,14 @@ public Builder mergeLongRunning(com.google.api.MethodSettings.LongRunning value)
      * .google.api.MethodSettings.LongRunning long_running = 2;
      */
     public Builder clearLongRunning() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      longRunning_ = null;
-      if (longRunningBuilder_ != null) {
-        longRunningBuilder_.dispose();
+      if (longRunningBuilder_ == null) {
+        longRunning_ = null;
+        onChanged();
+      } else {
+        longRunning_ = null;
         longRunningBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2700,9 +2611,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
@@ -2716,7 +2625,7 @@ public Builder clearLongRunning() {
      * .google.api.MethodSettings.LongRunning long_running = 2;
      */
     public com.google.api.MethodSettings.LongRunning.Builder getLongRunningBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getLongRunningFieldBuilder().getBuilder();
     }
@@ -2728,9 +2637,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
@@ -2760,9 +2667,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
@@ -2792,14 +2697,14 @@ public com.google.api.MethodSettings.LongRunningOrBuilder getLongRunningOrBuilde
       return longRunningBuilder_;
     }
 
-    private com.google.protobuf.LazyStringArrayList autoPopulatedFields_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList autoPopulatedFields_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureAutoPopulatedFieldsIsMutable() {
-      if (!autoPopulatedFields_.isModifiable()) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         autoPopulatedFields_ = new com.google.protobuf.LazyStringArrayList(autoPopulatedFields_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000004;
     }
 
     /**
@@ -2809,9 +2714,7 @@ private void ensureAutoPopulatedFieldsIsMutable() {
      * List of top-level fields of the request message, that should be
      * automatically populated by the client libraries based on their
      * (google.api.field_info).format. Currently supported format: UUID4.
-     *
      * Example of a YAML configuration:
-     *
      *    publishing:
      *      method_settings:
      *      - selector: google.example.v1.ExampleService.CreateExample
@@ -2824,8 +2727,7 @@ private void ensureAutoPopulatedFieldsIsMutable() {
      * @return A list containing the autoPopulatedFields.
      */
     public com.google.protobuf.ProtocolStringList getAutoPopulatedFieldsList() {
-      autoPopulatedFields_.makeImmutable();
-      return autoPopulatedFields_;
+      return autoPopulatedFields_.getUnmodifiableView();
     }
 
     /**
@@ -2835,9 +2737,7 @@ public com.google.protobuf.ProtocolStringList getAutoPopulatedFieldsList() {
      * List of top-level fields of the request message, that should be
      * automatically populated by the client libraries based on their
      * (google.api.field_info).format. Currently supported format: UUID4.
-     *
      * Example of a YAML configuration:
-     *
      *    publishing:
      *      method_settings:
      *      - selector: google.example.v1.ExampleService.CreateExample
@@ -2860,9 +2760,7 @@ public int getAutoPopulatedFieldsCount() {
      * List of top-level fields of the request message, that should be
      * automatically populated by the client libraries based on their
      * (google.api.field_info).format. Currently supported format: UUID4.
-     *
      * Example of a YAML configuration:
-     *
      *    publishing:
      *      method_settings:
      *      - selector: google.example.v1.ExampleService.CreateExample
@@ -2886,9 +2784,7 @@ public java.lang.String getAutoPopulatedFields(int index) {
      * List of top-level fields of the request message, that should be
      * automatically populated by the client libraries based on their
      * (google.api.field_info).format. Currently supported format: UUID4.
-     *
      * Example of a YAML configuration:
-     *
      *    publishing:
      *      method_settings:
      *      - selector: google.example.v1.ExampleService.CreateExample
@@ -2912,9 +2808,7 @@ public com.google.protobuf.ByteString getAutoPopulatedFieldsBytes(int index) {
      * List of top-level fields of the request message, that should be
      * automatically populated by the client libraries based on their
      * (google.api.field_info).format. Currently supported format: UUID4.
-     *
      * Example of a YAML configuration:
-     *
      *    publishing:
      *      method_settings:
      *      - selector: google.example.v1.ExampleService.CreateExample
@@ -2934,7 +2828,6 @@ public Builder setAutoPopulatedFields(int index, java.lang.String value) {
       }
       ensureAutoPopulatedFieldsIsMutable();
       autoPopulatedFields_.set(index, value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2946,9 +2839,7 @@ public Builder setAutoPopulatedFields(int index, java.lang.String value) {
      * List of top-level fields of the request message, that should be
      * automatically populated by the client libraries based on their
      * (google.api.field_info).format. Currently supported format: UUID4.
-     *
      * Example of a YAML configuration:
-     *
      *    publishing:
      *      method_settings:
      *      - selector: google.example.v1.ExampleService.CreateExample
@@ -2967,7 +2858,6 @@ public Builder addAutoPopulatedFields(java.lang.String value) {
       }
       ensureAutoPopulatedFieldsIsMutable();
       autoPopulatedFields_.add(value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2979,9 +2869,7 @@ public Builder addAutoPopulatedFields(java.lang.String value) {
      * List of top-level fields of the request message, that should be
      * automatically populated by the client libraries based on their
      * (google.api.field_info).format. Currently supported format: UUID4.
-     *
      * Example of a YAML configuration:
-     *
      *    publishing:
      *      method_settings:
      *      - selector: google.example.v1.ExampleService.CreateExample
@@ -2997,7 +2885,6 @@ public Builder addAutoPopulatedFields(java.lang.String value) {
     public Builder addAllAutoPopulatedFields(java.lang.Iterable values) {
       ensureAutoPopulatedFieldsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, autoPopulatedFields_);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -3009,9 +2896,7 @@ public Builder addAllAutoPopulatedFields(java.lang.Iterable va
      * List of top-level fields of the request message, that should be
      * automatically populated by the client libraries based on their
      * (google.api.field_info).format. Currently supported format: UUID4.
-     *
      * Example of a YAML configuration:
-     *
      *    publishing:
      *      method_settings:
      *      - selector: google.example.v1.ExampleService.CreateExample
@@ -3024,9 +2909,8 @@ public Builder addAllAutoPopulatedFields(java.lang.Iterable va
      * @return This builder for chaining.
      */
     public Builder clearAutoPopulatedFields() {
-      autoPopulatedFields_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000004);
-      ;
+      autoPopulatedFields_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -3038,9 +2922,7 @@ public Builder clearAutoPopulatedFields() {
      * List of top-level fields of the request message, that should be
      * automatically populated by the client libraries based on their
      * (google.api.field_info).format. Currently supported format: UUID4.
-     *
      * Example of a YAML configuration:
-     *
      *    publishing:
      *      method_settings:
      *      - selector: google.example.v1.ExampleService.CreateExample
@@ -3060,7 +2942,6 @@ public Builder addAutoPopulatedFieldsBytes(com.google.protobuf.ByteString value)
       checkByteStringIsUtf8(value);
       ensureAutoPopulatedFieldsIsMutable();
       autoPopulatedFields_.add(value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
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 7ad43d4e72..bec5a3bd03 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface MethodSettingsOrBuilder
@@ -30,9 +29,7 @@ public interface MethodSettingsOrBuilder
    * 
    * The fully qualified name of the method, for which the options below apply.
    * This is used to find the method to apply the options.
-   *
    * Example:
-   *
    *    publishing:
    *      method_settings:
    *      - selector: google.storage.control.v2.StorageControl.CreateFolder
@@ -51,9 +48,7 @@ public interface MethodSettingsOrBuilder
    * 
    * The fully qualified name of the method, for which the options below apply.
    * This is used to find the method to apply the options.
-   *
    * Example:
-   *
    *    publishing:
    *      method_settings:
    *      - selector: google.storage.control.v2.StorageControl.CreateFolder
@@ -73,9 +68,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
@@ -99,9 +92,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
@@ -125,9 +116,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
@@ -149,9 +138,7 @@ public interface MethodSettingsOrBuilder
    * List of top-level fields of the request message, that should be
    * automatically populated by the client libraries based on their
    * (google.api.field_info).format. Currently supported format: UUID4.
-   *
    * Example of a YAML configuration:
-   *
    *    publishing:
    *      method_settings:
    *      - selector: google.example.v1.ExampleService.CreateExample
@@ -172,9 +159,7 @@ public interface MethodSettingsOrBuilder
    * List of top-level fields of the request message, that should be
    * automatically populated by the client libraries based on their
    * (google.api.field_info).format. Currently supported format: UUID4.
-   *
    * Example of a YAML configuration:
-   *
    *    publishing:
    *      method_settings:
    *      - selector: google.example.v1.ExampleService.CreateExample
@@ -195,9 +180,7 @@ public interface MethodSettingsOrBuilder
    * List of top-level fields of the request message, that should be
    * automatically populated by the client libraries based on their
    * (google.api.field_info).format. Currently supported format: UUID4.
-   *
    * Example of a YAML configuration:
-   *
    *    publishing:
    *      method_settings:
    *      - selector: google.example.v1.ExampleService.CreateExample
@@ -219,9 +202,7 @@ public interface MethodSettingsOrBuilder
    * List of top-level fields of the request message, that should be
    * automatically populated by the client libraries based on their
    * (google.api.field_info).format. Currently supported format: UUID4.
-   *
    * Example of a YAML configuration:
-   *
    *    publishing:
    *      method_settings:
    *      - selector: google.example.v1.ExampleService.CreateExample
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 a6370cd904..1127885db6 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/metric.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -50,14 +49,18 @@ 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;
   }
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 2:
         return internalGetLabels();
@@ -75,9 +78,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
   }
 
   public static final int TYPE_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object type_ = "";
+  private volatile java.lang.Object type_;
 
   /**
    *
@@ -143,7 +144,6 @@ private static final class LabelsDefaultEntryHolder {
             "");
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField labels_;
 
   private com.google.protobuf.MapField internalGetLabels() {
@@ -208,10 +208,7 @@ public java.util.Map getLabelsMap() {
    * map<string, string> labels = 2;
    */
   @java.lang.Override
-  public /* nullable */ java.lang.String getLabelsOrDefault(
-      java.lang.String key,
-      /* nullable */
-      java.lang.String defaultValue) {
+  public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -435,8 +432,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 2:
           return internalGetLabels();
@@ -446,8 +442,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 2:
           return internalGetMutableLabels();
@@ -474,8 +469,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       type_ = "";
+
       internalGetMutableLabels().clear();
       return this;
     }
@@ -502,24 +497,14 @@ public com.google.api.Metric build() {
     @java.lang.Override
     public com.google.api.Metric buildPartial() {
       com.google.api.Metric result = new com.google.api.Metric(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      int from_bitField0_ = bitField0_;
+      result.type_ = type_;
+      result.labels_ = internalGetLabels();
+      result.labels_.makeImmutable();
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.Metric result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.type_ = type_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.labels_ = internalGetLabels();
-        result.labels_.makeImmutable();
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -567,11 +552,9 @@ public Builder mergeFrom(com.google.api.Metric other) {
       if (other == com.google.api.Metric.getDefaultInstance()) return this;
       if (!other.getType().isEmpty()) {
         type_ = other.type_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       internalGetMutableLabels().mergeFrom(other.internalGetLabels());
-      bitField0_ |= 0x00000002;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -607,13 +590,12 @@ public Builder mergeFrom(
                 internalGetMutableLabels()
                     .getMutableMap()
                     .put(labels__.getKey(), labels__.getValue());
-                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             case 26:
               {
                 type_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 26
             default:
@@ -705,8 +687,8 @@ public Builder setType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       type_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -725,8 +707,8 @@ public Builder setType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearType() {
+
       type_ = getDefaultInstance().getType();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -750,8 +732,8 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       type_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -767,14 +749,14 @@ private com.google.protobuf.MapField interna
 
     private com.google.protobuf.MapField
         internalGetMutableLabels() {
+      onChanged();
+      ;
       if (labels_ == null) {
         labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
       }
       if (!labels_.isMutable()) {
         labels_ = labels_.copy();
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
       return labels_;
     }
 
@@ -833,10 +815,8 @@ public java.util.Map getLabelsMap() {
      * map<string, string> labels = 2;
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getLabelsOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getLabelsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -867,7 +847,6 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
     }
 
     public Builder clearLabels() {
-      bitField0_ = (bitField0_ & ~0x00000002);
       internalGetMutableLabels().getMutableMap().clear();
       return this;
     }
@@ -893,7 +872,6 @@ public Builder removeLabels(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableLabels() {
-      bitField0_ |= 0x00000002;
       return internalGetMutableLabels().getMutableMap();
     }
 
@@ -914,8 +892,8 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
+
       internalGetMutableLabels().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000002;
       return this;
     }
 
@@ -931,7 +909,6 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllLabels(java.util.Map values) {
       internalGetMutableLabels().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000002;
       return this;
     }
 
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 62d6ba8c30..61773f5617 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/metric.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -51,7 +50,7 @@ private MetricDescriptor() {
     description_ = "";
     displayName_ = "";
     launchStage_ = 0;
-    monitoredResourceTypes_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    monitoredResourceTypes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
   @java.lang.Override
@@ -60,6 +59,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;
   }
@@ -764,6 +768,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;
@@ -969,9 +978,8 @@ private TimeSeriesResourceHierarchyLevel(int value) {
       // @@protoc_insertion_point(enum_scope:google.api.MetricDescriptor.MetricDescriptorMetadata.TimeSeriesResourceHierarchyLevel)
     }
 
-    private int bitField0_;
     public static final int LAUNCH_STAGE_FIELD_NUMBER = 1;
-    private int launchStage_ = 0;
+    private int launchStage_;
 
     /**
      *
@@ -1012,7 +1020,8 @@ public int getLaunchStageValue() {
     @java.lang.Override
     @java.lang.Deprecated
     public com.google.api.LaunchStage getLaunchStage() {
-      com.google.api.LaunchStage result = com.google.api.LaunchStage.forNumber(launchStage_);
+      @SuppressWarnings("deprecation")
+      com.google.api.LaunchStage result = com.google.api.LaunchStage.valueOf(launchStage_);
       return result == null ? com.google.api.LaunchStage.UNRECOGNIZED : result;
     }
 
@@ -1035,7 +1044,7 @@ public com.google.api.LaunchStage getLaunchStage() {
      */
     @java.lang.Override
     public boolean hasSamplePeriod() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return samplePeriod_ != null;
     }
 
     /**
@@ -1073,9 +1082,7 @@ public com.google.protobuf.Duration getSamplePeriod() {
      */
     @java.lang.Override
     public com.google.protobuf.DurationOrBuilder getSamplePeriodOrBuilder() {
-      return samplePeriod_ == null
-          ? com.google.protobuf.Duration.getDefaultInstance()
-          : samplePeriod_;
+      return getSamplePeriod();
     }
 
     public static final int INGEST_DELAY_FIELD_NUMBER = 3;
@@ -1096,7 +1103,7 @@ public com.google.protobuf.DurationOrBuilder getSamplePeriodOrBuilder() {
      */
     @java.lang.Override
     public boolean hasIngestDelay() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return ingestDelay_ != null;
     }
 
     /**
@@ -1132,16 +1139,11 @@ public com.google.protobuf.Duration getIngestDelay() {
      */
     @java.lang.Override
     public com.google.protobuf.DurationOrBuilder getIngestDelayOrBuilder() {
-      return ingestDelay_ == null
-          ? com.google.protobuf.Duration.getDefaultInstance()
-          : ingestDelay_;
+      return getIngestDelay();
     }
 
     public static final int TIME_SERIES_RESOURCE_HIERARCHY_LEVEL_FIELD_NUMBER = 4;
-
-    @SuppressWarnings("serial")
     private java.util.List timeSeriesResourceHierarchyLevel_;
-
     private static final com.google.protobuf.Internal.ListAdapter.Converter<
             java.lang.Integer,
             com.google.api.MetricDescriptor.MetricDescriptorMetadata
@@ -1154,11 +1156,12 @@ public com.google.protobuf.DurationOrBuilder getIngestDelayOrBuilder() {
               public com.google.api.MetricDescriptor.MetricDescriptorMetadata
                       .TimeSeriesResourceHierarchyLevel
                   convert(java.lang.Integer from) {
+                @SuppressWarnings("deprecation")
                 com.google.api.MetricDescriptor.MetricDescriptorMetadata
                         .TimeSeriesResourceHierarchyLevel
                     result =
                         com.google.api.MetricDescriptor.MetricDescriptorMetadata
-                            .TimeSeriesResourceHierarchyLevel.forNumber(from);
+                            .TimeSeriesResourceHierarchyLevel.valueOf(from);
                 return result == null
                     ? com.google.api.MetricDescriptor.MetricDescriptorMetadata
                         .TimeSeriesResourceHierarchyLevel.UNRECOGNIZED
@@ -1289,10 +1292,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (launchStage_ != com.google.api.LaunchStage.LAUNCH_STAGE_UNSPECIFIED.getNumber()) {
         output.writeEnum(1, launchStage_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (samplePeriod_ != null) {
         output.writeMessage(2, getSamplePeriod());
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (ingestDelay_ != null) {
         output.writeMessage(3, getIngestDelay());
       }
       if (getTimeSeriesResourceHierarchyLevelList().size() > 0) {
@@ -1314,10 +1317,10 @@ public int getSerializedSize() {
       if (launchStage_ != com.google.api.LaunchStage.LAUNCH_STAGE_UNSPECIFIED.getNumber()) {
         size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, launchStage_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (samplePeriod_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getSamplePeriod());
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (ingestDelay_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getIngestDelay());
       }
       {
@@ -1519,39 +1522,31 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.api.MetricDescriptor.MetricDescriptorMetadata.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getSamplePeriodFieldBuilder();
-          getIngestDelayFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         launchStage_ = 0;
-        samplePeriod_ = null;
-        if (samplePeriodBuilder_ != null) {
-          samplePeriodBuilder_.dispose();
+
+        if (samplePeriodBuilder_ == null) {
+          samplePeriod_ = null;
+        } else {
+          samplePeriod_ = null;
           samplePeriodBuilder_ = null;
         }
-        ingestDelay_ = null;
-        if (ingestDelayBuilder_ != null) {
-          ingestDelayBuilder_.dispose();
+        if (ingestDelayBuilder_ == null) {
+          ingestDelay_ = null;
+        } else {
+          ingestDelay_ = null;
           ingestDelayBuilder_ = null;
         }
         timeSeriesResourceHierarchyLevel_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -1579,41 +1574,26 @@ public com.google.api.MetricDescriptor.MetricDescriptorMetadata build() {
       public com.google.api.MetricDescriptor.MetricDescriptorMetadata buildPartial() {
         com.google.api.MetricDescriptor.MetricDescriptorMetadata result =
             new com.google.api.MetricDescriptor.MetricDescriptorMetadata(this);
-        buildPartialRepeatedFields(result);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        int from_bitField0_ = bitField0_;
+        result.launchStage_ = launchStage_;
+        if (samplePeriodBuilder_ == null) {
+          result.samplePeriod_ = samplePeriod_;
+        } else {
+          result.samplePeriod_ = samplePeriodBuilder_.build();
         }
-        onBuilt();
-        return result;
-      }
-
-      private void buildPartialRepeatedFields(
-          com.google.api.MetricDescriptor.MetricDescriptorMetadata result) {
-        if (((bitField0_ & 0x00000008) != 0)) {
+        if (ingestDelayBuilder_ == null) {
+          result.ingestDelay_ = ingestDelay_;
+        } else {
+          result.ingestDelay_ = ingestDelayBuilder_.build();
+        }
+        if (((bitField0_ & 0x00000001) != 0)) {
           timeSeriesResourceHierarchyLevel_ =
               java.util.Collections.unmodifiableList(timeSeriesResourceHierarchyLevel_);
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.timeSeriesResourceHierarchyLevel_ = timeSeriesResourceHierarchyLevel_;
-      }
-
-      private void buildPartial0(com.google.api.MetricDescriptor.MetricDescriptorMetadata result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.launchStage_ = launchStage_;
-        }
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.samplePeriod_ =
-              samplePeriodBuilder_ == null ? samplePeriod_ : samplePeriodBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.ingestDelay_ =
-              ingestDelayBuilder_ == null ? ingestDelay_ : ingestDelayBuilder_.build();
-          to_bitField0_ |= 0x00000002;
-        }
-        result.bitField0_ |= to_bitField0_;
+        onBuilt();
+        return result;
       }
 
       @java.lang.Override
@@ -1676,7 +1656,7 @@ public Builder mergeFrom(com.google.api.MetricDescriptor.MetricDescriptorMetadat
         if (!other.timeSeriesResourceHierarchyLevel_.isEmpty()) {
           if (timeSeriesResourceHierarchyLevel_.isEmpty()) {
             timeSeriesResourceHierarchyLevel_ = other.timeSeriesResourceHierarchyLevel_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureTimeSeriesResourceHierarchyLevelIsMutable();
             timeSeriesResourceHierarchyLevel_.addAll(other.timeSeriesResourceHierarchyLevel_);
@@ -1712,19 +1692,19 @@ public Builder mergeFrom(
               case 8:
                 {
                   launchStage_ = input.readEnum();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 8
               case 18:
                 {
                   input.readMessage(getSamplePeriodFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               case 26:
                 {
                   input.readMessage(getIngestDelayFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 26
               case 32:
@@ -1806,8 +1786,8 @@ public int getLaunchStageValue() {
        */
       @java.lang.Deprecated
       public Builder setLaunchStageValue(int value) {
+
         launchStage_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1830,7 +1810,8 @@ public Builder setLaunchStageValue(int value) {
       @java.lang.Override
       @java.lang.Deprecated
       public com.google.api.LaunchStage getLaunchStage() {
-        com.google.api.LaunchStage result = com.google.api.LaunchStage.forNumber(launchStage_);
+        @SuppressWarnings("deprecation")
+        com.google.api.LaunchStage result = com.google.api.LaunchStage.valueOf(launchStage_);
         return result == null ? com.google.api.LaunchStage.UNRECOGNIZED : result;
       }
 
@@ -1855,7 +1836,7 @@ public Builder setLaunchStage(com.google.api.LaunchStage value) {
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000001;
+
         launchStage_ = value.getNumber();
         onChanged();
         return this;
@@ -1878,7 +1859,7 @@ public Builder setLaunchStage(com.google.api.LaunchStage value) {
        */
       @java.lang.Deprecated
       public Builder clearLaunchStage() {
-        bitField0_ = (bitField0_ & ~0x00000001);
+
         launchStage_ = 0;
         onChanged();
         return this;
@@ -1906,7 +1887,7 @@ public Builder clearLaunchStage() {
        * @return Whether the samplePeriod field is set.
        */
       public boolean hasSamplePeriod() {
-        return ((bitField0_ & 0x00000002) != 0);
+        return samplePeriodBuilder_ != null || samplePeriod_ != null;
       }
 
       /**
@@ -1951,11 +1932,11 @@ public Builder setSamplePeriod(com.google.protobuf.Duration value) {
             throw new NullPointerException();
           }
           samplePeriod_ = value;
+          onChanged();
         } else {
           samplePeriodBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -1974,11 +1955,11 @@ public Builder setSamplePeriod(com.google.protobuf.Duration value) {
       public Builder setSamplePeriod(com.google.protobuf.Duration.Builder builderForValue) {
         if (samplePeriodBuilder_ == null) {
           samplePeriod_ = builderForValue.build();
+          onChanged();
         } else {
           samplePeriodBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -1996,20 +1977,19 @@ public Builder setSamplePeriod(com.google.protobuf.Duration.Builder builderForVa
        */
       public Builder mergeSamplePeriod(com.google.protobuf.Duration value) {
         if (samplePeriodBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)
-              && samplePeriod_ != null
-              && samplePeriod_ != com.google.protobuf.Duration.getDefaultInstance()) {
-            getSamplePeriodBuilder().mergeFrom(value);
+          if (samplePeriod_ != null) {
+            samplePeriod_ =
+                com.google.protobuf.Duration.newBuilder(samplePeriod_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             samplePeriod_ = value;
           }
+          onChanged();
         } else {
           samplePeriodBuilder_.mergeFrom(value);
         }
-        if (samplePeriod_ != null) {
-          bitField0_ |= 0x00000002;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -2026,13 +2006,14 @@ public Builder mergeSamplePeriod(com.google.protobuf.Duration value) {
        * .google.protobuf.Duration sample_period = 2;
        */
       public Builder clearSamplePeriod() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        samplePeriod_ = null;
-        if (samplePeriodBuilder_ != null) {
-          samplePeriodBuilder_.dispose();
+        if (samplePeriodBuilder_ == null) {
+          samplePeriod_ = null;
+          onChanged();
+        } else {
+          samplePeriod_ = null;
           samplePeriodBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -2049,7 +2030,7 @@ public Builder clearSamplePeriod() {
        * .google.protobuf.Duration sample_period = 2;
        */
       public com.google.protobuf.Duration.Builder getSamplePeriodBuilder() {
-        bitField0_ |= 0x00000002;
+
         onChanged();
         return getSamplePeriodFieldBuilder().getBuilder();
       }
@@ -2126,7 +2107,7 @@ public com.google.protobuf.DurationOrBuilder getSamplePeriodOrBuilder() {
        * @return Whether the ingestDelay field is set.
        */
       public boolean hasIngestDelay() {
-        return ((bitField0_ & 0x00000004) != 0);
+        return ingestDelayBuilder_ != null || ingestDelay_ != null;
       }
 
       /**
@@ -2169,11 +2150,11 @@ public Builder setIngestDelay(com.google.protobuf.Duration value) {
             throw new NullPointerException();
           }
           ingestDelay_ = value;
+          onChanged();
         } else {
           ingestDelayBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
+
         return this;
       }
 
@@ -2191,11 +2172,11 @@ public Builder setIngestDelay(com.google.protobuf.Duration value) {
       public Builder setIngestDelay(com.google.protobuf.Duration.Builder builderForValue) {
         if (ingestDelayBuilder_ == null) {
           ingestDelay_ = builderForValue.build();
+          onChanged();
         } else {
           ingestDelayBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
+
         return this;
       }
 
@@ -2212,20 +2193,19 @@ public Builder setIngestDelay(com.google.protobuf.Duration.Builder builderForVal
        */
       public Builder mergeIngestDelay(com.google.protobuf.Duration value) {
         if (ingestDelayBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) != 0)
-              && ingestDelay_ != null
-              && ingestDelay_ != com.google.protobuf.Duration.getDefaultInstance()) {
-            getIngestDelayBuilder().mergeFrom(value);
+          if (ingestDelay_ != null) {
+            ingestDelay_ =
+                com.google.protobuf.Duration.newBuilder(ingestDelay_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             ingestDelay_ = value;
           }
+          onChanged();
         } else {
           ingestDelayBuilder_.mergeFrom(value);
         }
-        if (ingestDelay_ != null) {
-          bitField0_ |= 0x00000004;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -2241,13 +2221,14 @@ public Builder mergeIngestDelay(com.google.protobuf.Duration value) {
        * .google.protobuf.Duration ingest_delay = 3;
        */
       public Builder clearIngestDelay() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        ingestDelay_ = null;
-        if (ingestDelayBuilder_ != null) {
-          ingestDelayBuilder_.dispose();
+        if (ingestDelayBuilder_ == null) {
+          ingestDelay_ = null;
+          onChanged();
+        } else {
+          ingestDelay_ = null;
           ingestDelayBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -2263,7 +2244,7 @@ public Builder clearIngestDelay() {
        * .google.protobuf.Duration ingest_delay = 3;
        */
       public com.google.protobuf.Duration.Builder getIngestDelayBuilder() {
-        bitField0_ |= 0x00000004;
+
         onChanged();
         return getIngestDelayFieldBuilder().getBuilder();
       }
@@ -2321,10 +2302,10 @@ public com.google.protobuf.DurationOrBuilder getIngestDelayOrBuilder() {
           java.util.Collections.emptyList();
 
       private void ensureTimeSeriesResourceHierarchyLevelIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           timeSeriesResourceHierarchyLevel_ =
               new java.util.ArrayList(timeSeriesResourceHierarchyLevel_);
-          bitField0_ |= 0x00000008;
+          bitField0_ |= 0x00000001;
         }
       }
 
@@ -2489,7 +2470,7 @@ public Builder addAllTimeSeriesResourceHierarchyLevel(
        */
       public Builder clearTimeSeriesResourceHierarchyLevel() {
         timeSeriesResourceHierarchyLevel_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -2665,11 +2646,8 @@ public com.google.api.MetricDescriptor.MetricDescriptorMetadata getDefaultInstan
     }
   }
 
-  private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -2720,9 +2698,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int TYPE_FIELD_NUMBER = 8;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object type_ = "";
+  private volatile java.lang.Object type_;
 
   /**
    *
@@ -2732,7 +2708,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"
@@ -2763,7 +2738,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"
@@ -2787,8 +2761,6 @@ public com.google.protobuf.ByteString getTypeBytes() {
   }
 
   public static final int LABELS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List labels_;
 
   /**
@@ -2888,7 +2860,7 @@ public com.google.api.LabelDescriptorOrBuilder getLabelsOrBuilder(int index) {
   }
 
   public static final int METRIC_KIND_FIELD_NUMBER = 3;
-  private int metricKind_ = 0;
+  private int metricKind_;
 
   /**
    *
@@ -2921,13 +2893,14 @@ public int getMetricKindValue() {
    */
   @java.lang.Override
   public com.google.api.MetricDescriptor.MetricKind getMetricKind() {
+    @SuppressWarnings("deprecation")
     com.google.api.MetricDescriptor.MetricKind result =
-        com.google.api.MetricDescriptor.MetricKind.forNumber(metricKind_);
+        com.google.api.MetricDescriptor.MetricKind.valueOf(metricKind_);
     return result == null ? com.google.api.MetricDescriptor.MetricKind.UNRECOGNIZED : result;
   }
 
   public static final int VALUE_TYPE_FIELD_NUMBER = 4;
-  private int valueType_ = 0;
+  private int valueType_;
 
   /**
    *
@@ -2960,15 +2933,14 @@ public int getValueTypeValue() {
    */
   @java.lang.Override
   public com.google.api.MetricDescriptor.ValueType getValueType() {
+    @SuppressWarnings("deprecation")
     com.google.api.MetricDescriptor.ValueType result =
-        com.google.api.MetricDescriptor.ValueType.forNumber(valueType_);
+        com.google.api.MetricDescriptor.ValueType.valueOf(valueType_);
     return result == null ? com.google.api.MetricDescriptor.ValueType.UNRECOGNIZED : result;
   }
 
   public static final int UNIT_FIELD_NUMBER = 5;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object unit_ = "";
+  private volatile java.lang.Object unit_;
 
   /**
    *
@@ -2977,28 +2949,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
@@ -3006,9 +2972,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)
@@ -3017,7 +2981,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)
@@ -3026,37 +2989,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`.
@@ -3102,28 +3055,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
@@ -3131,9 +3078,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)
@@ -3142,7 +3087,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)
@@ -3151,37 +3095,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`.
@@ -3221,9 +3155,7 @@ public com.google.protobuf.ByteString getUnitBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 6;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object description_ = "";
+  private volatile java.lang.Object description_;
 
   /**
    *
@@ -3274,9 +3206,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 7;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object displayName_ = "";
+  private volatile java.lang.Object displayName_;
 
   /**
    *
@@ -3348,7 +3278,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
    */
   @java.lang.Override
   public boolean hasMetadata() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return metadata_ != null;
   }
 
   /**
@@ -3380,13 +3310,11 @@ public com.google.api.MetricDescriptor.MetricDescriptorMetadata getMetadata() {
    */
   @java.lang.Override
   public com.google.api.MetricDescriptor.MetricDescriptorMetadataOrBuilder getMetadataOrBuilder() {
-    return metadata_ == null
-        ? com.google.api.MetricDescriptor.MetricDescriptorMetadata.getDefaultInstance()
-        : metadata_;
+    return getMetadata();
   }
 
   public static final int LAUNCH_STAGE_FIELD_NUMBER = 12;
-  private int launchStage_ = 0;
+  private int launchStage_;
 
   /**
    *
@@ -3417,15 +3345,13 @@ public int getLaunchStageValue() {
    */
   @java.lang.Override
   public com.google.api.LaunchStage getLaunchStage() {
-    com.google.api.LaunchStage result = com.google.api.LaunchStage.forNumber(launchStage_);
+    @SuppressWarnings("deprecation")
+    com.google.api.LaunchStage result = com.google.api.LaunchStage.valueOf(launchStage_);
     return result == null ? com.google.api.LaunchStage.UNRECOGNIZED : result;
   }
 
   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_;
 
   /**
    *
@@ -3549,7 +3475,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(type_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, type_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (metadata_ != null) {
       output.writeMessage(10, getMetadata());
     }
     if (launchStage_ != com.google.api.LaunchStage.LAUNCH_STAGE_UNSPECIFIED.getNumber()) {
@@ -3594,7 +3520,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(type_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, type_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (metadata_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getMetadata());
     }
     if (launchStage_ != com.google.api.LaunchStage.LAUNCH_STAGE_UNSPECIFIED.getNumber()) {
@@ -3806,47 +3732,46 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.MetricDescriptor.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getLabelsFieldBuilder();
-        getMetadataFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       type_ = "";
+
       if (labelsBuilder_ == null) {
         labels_ = java.util.Collections.emptyList();
       } else {
         labels_ = null;
         labelsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000001);
       metricKind_ = 0;
+
       valueType_ = 0;
+
       unit_ = "";
+
       description_ = "";
+
       displayName_ = "";
-      metadata_ = null;
-      if (metadataBuilder_ != null) {
-        metadataBuilder_.dispose();
+
+      if (metadataBuilder_ == null) {
+        metadata_ = null;
+      } else {
+        metadata_ = null;
         metadataBuilder_ = null;
       }
       launchStage_ = 0;
-      monitoredResourceTypes_ = com.google.protobuf.LazyStringArrayList.emptyList();
+
+      monitoredResourceTypes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -3872,62 +3797,36 @@ public com.google.api.MetricDescriptor build() {
     @java.lang.Override
     public com.google.api.MetricDescriptor buildPartial() {
       com.google.api.MetricDescriptor result = new com.google.api.MetricDescriptor(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.MetricDescriptor result) {
+      int from_bitField0_ = bitField0_;
+      result.name_ = name_;
+      result.type_ = type_;
       if (labelsBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           labels_ = java.util.Collections.unmodifiableList(labels_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.labels_ = labels_;
       } else {
         result.labels_ = labelsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.MetricDescriptor result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.type_ = type_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.metricKind_ = metricKind_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.valueType_ = valueType_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.unit_ = unit_;
-      }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.description_ = description_;
-      }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.displayName_ = displayName_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000100) != 0)) {
-        result.metadata_ = metadataBuilder_ == null ? metadata_ : metadataBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000200) != 0)) {
-        result.launchStage_ = launchStage_;
+      result.metricKind_ = metricKind_;
+      result.valueType_ = valueType_;
+      result.unit_ = unit_;
+      result.description_ = description_;
+      result.displayName_ = displayName_;
+      if (metadataBuilder_ == null) {
+        result.metadata_ = metadata_;
+      } else {
+        result.metadata_ = metadataBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000400) != 0)) {
-        monitoredResourceTypes_.makeImmutable();
-        result.monitoredResourceTypes_ = monitoredResourceTypes_;
+      result.launchStage_ = launchStage_;
+      if (((bitField0_ & 0x00000002) != 0)) {
+        monitoredResourceTypes_ = monitoredResourceTypes_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
       }
-      result.bitField0_ |= to_bitField0_;
+      result.monitoredResourceTypes_ = monitoredResourceTypes_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -3977,19 +3876,17 @@ public Builder mergeFrom(com.google.api.MetricDescriptor other) {
       if (other == com.google.api.MetricDescriptor.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getType().isEmpty()) {
         type_ = other.type_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (labelsBuilder_ == null) {
         if (!other.labels_.isEmpty()) {
           if (labels_.isEmpty()) {
             labels_ = other.labels_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureLabelsIsMutable();
             labels_.addAll(other.labels_);
@@ -4002,7 +3899,7 @@ public Builder mergeFrom(com.google.api.MetricDescriptor other) {
             labelsBuilder_.dispose();
             labelsBuilder_ = null;
             labels_ = other.labels_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
             labelsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getLabelsFieldBuilder()
@@ -4020,17 +3917,14 @@ public Builder mergeFrom(com.google.api.MetricDescriptor other) {
       }
       if (!other.getUnit().isEmpty()) {
         unit_ = other.unit_;
-        bitField0_ |= 0x00000020;
         onChanged();
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
-        bitField0_ |= 0x00000040;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
-        bitField0_ |= 0x00000080;
         onChanged();
       }
       if (other.hasMetadata()) {
@@ -4042,7 +3936,7 @@ public Builder mergeFrom(com.google.api.MetricDescriptor other) {
       if (!other.monitoredResourceTypes_.isEmpty()) {
         if (monitoredResourceTypes_.isEmpty()) {
           monitoredResourceTypes_ = other.monitoredResourceTypes_;
-          bitField0_ |= 0x00000400;
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureMonitoredResourceTypesIsMutable();
           monitoredResourceTypes_.addAll(other.monitoredResourceTypes_);
@@ -4078,7 +3972,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -4096,49 +3990,49 @@ public Builder mergeFrom(
             case 24:
               {
                 metricKind_ = input.readEnum();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 24
             case 32:
               {
                 valueType_ = input.readEnum();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 32
             case 42:
               {
                 unit_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 42
             case 50:
               {
                 description_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 50
             case 58:
               {
                 displayName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 58
             case 66:
               {
                 type_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 66
             case 82:
               {
                 input.readMessage(getMetadataFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000100;
+
                 break;
               } // case 82
             case 96:
               {
                 launchStage_ = input.readEnum();
-                bitField0_ |= 0x00000200;
+
                 break;
               } // case 96
             case 106:
@@ -4231,8 +4125,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -4249,8 +4143,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -4272,8 +4166,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -4288,7 +4182,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"
@@ -4318,7 +4211,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"
@@ -4348,7 +4240,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"
@@ -4363,8 +4254,8 @@ public Builder setType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       type_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -4377,7 +4268,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"
@@ -4388,8 +4278,8 @@ public Builder setType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearType() {
+
       type_ = getDefaultInstance().getType();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -4402,7 +4292,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"
@@ -4418,8 +4307,8 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       type_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -4428,9 +4317,9 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureLabelsIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         labels_ = new java.util.ArrayList(labels_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -4708,7 +4597,7 @@ public Builder addAllLabels(
     public Builder clearLabels() {
       if (labelsBuilder_ == null) {
         labels_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         labelsBuilder_.clear();
@@ -4871,7 +4760,7 @@ public java.util.List getLabelsBuilderLi
                 com.google.api.LabelDescriptor,
                 com.google.api.LabelDescriptor.Builder,
                 com.google.api.LabelDescriptorOrBuilder>(
-                labels_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
+                labels_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         labels_ = null;
       }
       return labelsBuilder_;
@@ -4910,8 +4799,8 @@ public int getMetricKindValue() {
      * @return This builder for chaining.
      */
     public Builder setMetricKindValue(int value) {
+
       metricKind_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -4930,8 +4819,9 @@ public Builder setMetricKindValue(int value) {
      */
     @java.lang.Override
     public com.google.api.MetricDescriptor.MetricKind getMetricKind() {
+      @SuppressWarnings("deprecation")
       com.google.api.MetricDescriptor.MetricKind result =
-          com.google.api.MetricDescriptor.MetricKind.forNumber(metricKind_);
+          com.google.api.MetricDescriptor.MetricKind.valueOf(metricKind_);
       return result == null ? com.google.api.MetricDescriptor.MetricKind.UNRECOGNIZED : result;
     }
 
@@ -4952,7 +4842,7 @@ public Builder setMetricKind(com.google.api.MetricDescriptor.MetricKind value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000008;
+
       metricKind_ = value.getNumber();
       onChanged();
       return this;
@@ -4971,7 +4861,7 @@ public Builder setMetricKind(com.google.api.MetricDescriptor.MetricKind value) {
      * @return This builder for chaining.
      */
     public Builder clearMetricKind() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       metricKind_ = 0;
       onChanged();
       return this;
@@ -5010,8 +4900,8 @@ public int getValueTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setValueTypeValue(int value) {
+
       valueType_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -5030,8 +4920,9 @@ public Builder setValueTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.api.MetricDescriptor.ValueType getValueType() {
+      @SuppressWarnings("deprecation")
       com.google.api.MetricDescriptor.ValueType result =
-          com.google.api.MetricDescriptor.ValueType.forNumber(valueType_);
+          com.google.api.MetricDescriptor.ValueType.valueOf(valueType_);
       return result == null ? com.google.api.MetricDescriptor.ValueType.UNRECOGNIZED : result;
     }
 
@@ -5052,7 +4943,7 @@ public Builder setValueType(com.google.api.MetricDescriptor.ValueType value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000010;
+
       valueType_ = value.getNumber();
       onChanged();
       return this;
@@ -5071,7 +4962,7 @@ public Builder setValueType(com.google.api.MetricDescriptor.ValueType value) {
      * @return This builder for chaining.
      */
     public Builder clearValueType() {
-      bitField0_ = (bitField0_ & ~0x00000010);
+
       valueType_ = 0;
       onChanged();
       return this;
@@ -5086,28 +4977,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
@@ -5115,9 +5000,7 @@ public Builder clearValueType() {
      * * `h`     hour
      * * `d`     day
      * * `1`     dimensionless
-     *
      * **Prefixes (PREFIX)**
-     *
      * * `k`     kilo    (10^3)
      * * `M`     mega    (10^6)
      * * `G`     giga    (10^9)
@@ -5126,7 +5009,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)
@@ -5135,37 +5017,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`.
@@ -5210,28 +5082,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
@@ -5239,9 +5105,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)
@@ -5250,7 +5114,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)
@@ -5259,37 +5122,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`.
@@ -5334,28 +5187,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
@@ -5363,9 +5210,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)
@@ -5374,7 +5219,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)
@@ -5383,37 +5227,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`.
@@ -5444,8 +5278,8 @@ public Builder setUnit(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       unit_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -5457,28 +5291,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
@@ -5486,9 +5314,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)
@@ -5497,7 +5323,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)
@@ -5506,37 +5331,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`.
@@ -5563,8 +5378,8 @@ public Builder setUnit(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearUnit() {
+
       unit_ = getDefaultInstance().getUnit();
-      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -5576,28 +5391,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
@@ -5605,9 +5414,7 @@ public Builder clearUnit() {
      * * `h`     hour
      * * `d`     day
      * * `1`     dimensionless
-     *
      * **Prefixes (PREFIX)**
-     *
      * * `k`     kilo    (10^3)
      * * `M`     mega    (10^6)
      * * `G`     giga    (10^9)
@@ -5616,7 +5423,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)
@@ -5625,37 +5431,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`.
@@ -5687,8 +5483,8 @@ public Builder setUnitBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       unit_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -5757,8 +5553,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       description_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -5775,8 +5571,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
+
       description_ = getDefaultInstance().getDescription();
-      bitField0_ = (bitField0_ & ~0x00000040);
       onChanged();
       return this;
     }
@@ -5798,8 +5594,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       description_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -5877,8 +5673,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       displayName_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -5898,8 +5694,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
+
       displayName_ = getDefaultInstance().getDisplayName();
-      bitField0_ = (bitField0_ & ~0x00000080);
       onChanged();
       return this;
     }
@@ -5924,8 +5720,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       displayName_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -5949,7 +5745,7 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the metadata field is set.
      */
     public boolean hasMetadata() {
-      return ((bitField0_ & 0x00000100) != 0);
+      return metadataBuilder_ != null || metadata_ != null;
     }
 
     /**
@@ -5988,11 +5784,11 @@ public Builder setMetadata(com.google.api.MetricDescriptor.MetricDescriptorMetad
           throw new NullPointerException();
         }
         metadata_ = value;
+        onChanged();
       } else {
         metadataBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000100;
-      onChanged();
+
       return this;
     }
 
@@ -6009,11 +5805,11 @@ public Builder setMetadata(
         com.google.api.MetricDescriptor.MetricDescriptorMetadata.Builder builderForValue) {
       if (metadataBuilder_ == null) {
         metadata_ = builderForValue.build();
+        onChanged();
       } else {
         metadataBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000100;
-      onChanged();
+
       return this;
     }
 
@@ -6028,21 +5824,19 @@ public Builder setMetadata(
      */
     public Builder mergeMetadata(com.google.api.MetricDescriptor.MetricDescriptorMetadata value) {
       if (metadataBuilder_ == null) {
-        if (((bitField0_ & 0x00000100) != 0)
-            && metadata_ != null
-            && metadata_
-                != com.google.api.MetricDescriptor.MetricDescriptorMetadata.getDefaultInstance()) {
-          getMetadataBuilder().mergeFrom(value);
+        if (metadata_ != null) {
+          metadata_ =
+              com.google.api.MetricDescriptor.MetricDescriptorMetadata.newBuilder(metadata_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           metadata_ = value;
         }
+        onChanged();
       } else {
         metadataBuilder_.mergeFrom(value);
       }
-      if (metadata_ != null) {
-        bitField0_ |= 0x00000100;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -6056,13 +5850,14 @@ public Builder mergeMetadata(com.google.api.MetricDescriptor.MetricDescriptorMet
      * .google.api.MetricDescriptor.MetricDescriptorMetadata metadata = 10;
      */
     public Builder clearMetadata() {
-      bitField0_ = (bitField0_ & ~0x00000100);
-      metadata_ = null;
-      if (metadataBuilder_ != null) {
-        metadataBuilder_.dispose();
+      if (metadataBuilder_ == null) {
+        metadata_ = null;
+        onChanged();
+      } else {
+        metadata_ = null;
         metadataBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -6076,7 +5871,7 @@ public Builder clearMetadata() {
      * .google.api.MetricDescriptor.MetricDescriptorMetadata metadata = 10;
      */
     public com.google.api.MetricDescriptor.MetricDescriptorMetadata.Builder getMetadataBuilder() {
-      bitField0_ |= 0x00000100;
+
       onChanged();
       return getMetadataFieldBuilder().getBuilder();
     }
@@ -6158,8 +5953,8 @@ public int getLaunchStageValue() {
      * @return This builder for chaining.
      */
     public Builder setLaunchStageValue(int value) {
+
       launchStage_ = value;
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -6177,7 +5972,8 @@ public Builder setLaunchStageValue(int value) {
      */
     @java.lang.Override
     public com.google.api.LaunchStage getLaunchStage() {
-      com.google.api.LaunchStage result = com.google.api.LaunchStage.forNumber(launchStage_);
+      @SuppressWarnings("deprecation")
+      com.google.api.LaunchStage result = com.google.api.LaunchStage.valueOf(launchStage_);
       return result == null ? com.google.api.LaunchStage.UNRECOGNIZED : result;
     }
 
@@ -6197,7 +5993,7 @@ public Builder setLaunchStage(com.google.api.LaunchStage value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000200;
+
       launchStage_ = value.getNumber();
       onChanged();
       return this;
@@ -6215,21 +6011,21 @@ public Builder setLaunchStage(com.google.api.LaunchStage value) {
      * @return This builder for chaining.
      */
     public Builder clearLaunchStage() {
-      bitField0_ = (bitField0_ & ~0x00000200);
+
       launchStage_ = 0;
       onChanged();
       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_ & 0x00000002) != 0)) {
         monitoredResourceTypes_ =
             new com.google.protobuf.LazyStringArrayList(monitoredResourceTypes_);
+        bitField0_ |= 0x00000002;
       }
-      bitField0_ |= 0x00000400;
     }
 
     /**
@@ -6249,8 +6045,7 @@ private void ensureMonitoredResourceTypesIsMutable() {
      * @return A list containing the monitoredResourceTypes.
      */
     public com.google.protobuf.ProtocolStringList getMonitoredResourceTypesList() {
-      monitoredResourceTypes_.makeImmutable();
-      return monitoredResourceTypes_;
+      return monitoredResourceTypes_.getUnmodifiableView();
     }
 
     /**
@@ -6339,7 +6134,6 @@ public Builder setMonitoredResourceTypes(int index, java.lang.String value) {
       }
       ensureMonitoredResourceTypesIsMutable();
       monitoredResourceTypes_.set(index, value);
-      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -6367,7 +6161,6 @@ public Builder addMonitoredResourceTypes(java.lang.String value) {
       }
       ensureMonitoredResourceTypesIsMutable();
       monitoredResourceTypes_.add(value);
-      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -6392,7 +6185,6 @@ public Builder addMonitoredResourceTypes(java.lang.String value) {
     public Builder addAllMonitoredResourceTypes(java.lang.Iterable values) {
       ensureMonitoredResourceTypesIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, monitoredResourceTypes_);
-      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -6414,9 +6206,8 @@ public Builder addAllMonitoredResourceTypes(java.lang.Iterable
      * @return This builder for chaining.
      */
     public Builder clearMonitoredResourceTypes() {
-      monitoredResourceTypes_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000400);
-      ;
+      monitoredResourceTypes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -6445,7 +6236,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 987794aee6..a3b2055e37 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/metric.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface MetricDescriptorOrBuilder
@@ -58,7 +57,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"
@@ -78,7 +76,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"
@@ -233,28 +230,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
@@ -262,9 +253,7 @@ public interface MetricDescriptorOrBuilder
    * * `h`     hour
    * * `d`     day
    * * `1`     dimensionless
-   *
    * **Prefixes (PREFIX)**
-   *
    * * `k`     kilo    (10^3)
    * * `M`     mega    (10^6)
    * * `G`     giga    (10^9)
@@ -273,7 +262,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)
@@ -282,37 +270,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`.
@@ -347,28 +325,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
@@ -376,9 +348,7 @@ public interface MetricDescriptorOrBuilder
    * * `h`     hour
    * * `d`     day
    * * `1`     dimensionless
-   *
    * **Prefixes (PREFIX)**
-   *
    * * `k`     kilo    (10^3)
    * * `M`     mega    (10^6)
    * * `G`     giga    (10^9)
@@ -387,7 +357,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)
@@ -396,37 +365,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/MetricOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricOrBuilder.java
index b96a2cda9d..15f30137e8 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/metric.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface MetricOrBuilder
@@ -104,6 +103,7 @@ public interface MetricOrBuilder
    *
    * map<string, string> labels = 2;
    */
+
   /* nullable */
   java.lang.String getLabelsOrDefault(
       java.lang.String key,
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricProto.java
index 6b5914d728..f1ac5fc9a4 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MetricProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/metric.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class MetricProto {
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 7cb2c91dc3..e7aa3625c7 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/quota.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -50,14 +49,18 @@ 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;
   }
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 2:
         return internalGetMetricCosts();
@@ -75,16 +78,13 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object selector_ = "";
+  private volatile java.lang.Object selector_;
 
   /**
    *
    *
    * 
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -111,7 +111,6 @@ public java.lang.String getSelector() {
    *
    * 
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -146,7 +145,6 @@ private static final class MetricCostsDefaultEntryHolder {
             0L);
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField metricCosts_;
 
   private com.google.protobuf.MapField internalGetMetricCosts() {
@@ -166,7 +164,6 @@ public int getMetricCostsCount() {
    * 
    * 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.
@@ -195,7 +192,6 @@ public java.util.Map getMetricCosts() {
    * 
    * 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.
@@ -214,7 +210,6 @@ public java.util.Map getMetricCostsMap() {
    * 
    * 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.
@@ -237,7 +232,6 @@ public long getMetricCostsOrDefault(java.lang.String key, long defaultValue) {
    * 
    * 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.
@@ -451,8 +445,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 2:
           return internalGetMetricCosts();
@@ -462,8 +455,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 2:
           return internalGetMutableMetricCosts();
@@ -490,8 +482,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       selector_ = "";
+
       internalGetMutableMetricCosts().clear();
       return this;
     }
@@ -518,24 +510,14 @@ public com.google.api.MetricRule build() {
     @java.lang.Override
     public com.google.api.MetricRule buildPartial() {
       com.google.api.MetricRule result = new com.google.api.MetricRule(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      int from_bitField0_ = bitField0_;
+      result.selector_ = selector_;
+      result.metricCosts_ = internalGetMetricCosts();
+      result.metricCosts_.makeImmutable();
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.MetricRule result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.selector_ = selector_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.metricCosts_ = internalGetMetricCosts();
-        result.metricCosts_.makeImmutable();
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -583,11 +565,9 @@ public Builder mergeFrom(com.google.api.MetricRule other) {
       if (other == com.google.api.MetricRule.getDefaultInstance()) return this;
       if (!other.getSelector().isEmpty()) {
         selector_ = other.selector_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       internalGetMutableMetricCosts().mergeFrom(other.internalGetMetricCosts());
-      bitField0_ |= 0x00000002;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -617,7 +597,7 @@ public Builder mergeFrom(
             case 10:
               {
                 selector_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -629,7 +609,6 @@ public Builder mergeFrom(
                 internalGetMutableMetricCosts()
                     .getMutableMap()
                     .put(metricCosts__.getKey(), metricCosts__.getValue());
-                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -658,7 +637,6 @@ public Builder mergeFrom(
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -684,7 +662,6 @@ public java.lang.String getSelector() {
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -710,7 +687,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -724,8 +700,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -735,7 +711,6 @@ public Builder setSelector(java.lang.String value) {
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -745,8 +720,8 @@ public Builder setSelector(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSelector() {
+
       selector_ = getDefaultInstance().getSelector();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -756,7 +731,6 @@ public Builder clearSelector() {
      *
      * 
      * Selects the methods to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -771,8 +745,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -790,6 +764,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
 
     private com.google.protobuf.MapField
         internalGetMutableMetricCosts() {
+      onChanged();
+      ;
       if (metricCosts_ == null) {
         metricCosts_ =
             com.google.protobuf.MapField.newMapField(MetricCostsDefaultEntryHolder.defaultEntry);
@@ -797,8 +773,6 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
       if (!metricCosts_.isMutable()) {
         metricCosts_ = metricCosts_.copy();
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
       return metricCosts_;
     }
 
@@ -812,7 +786,6 @@ public int getMetricCostsCount() {
      * 
      * 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.
@@ -841,7 +814,6 @@ public java.util.Map getMetricCosts() {
      * 
      * 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.
@@ -860,7 +832,6 @@ public java.util.Map getMetricCostsMap() {
      * 
      * 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.
@@ -883,7 +854,6 @@ public long getMetricCostsOrDefault(java.lang.String key, long defaultValue) {
      * 
      * 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.
@@ -904,7 +874,6 @@ public long getMetricCostsOrThrow(java.lang.String key) {
     }
 
     public Builder clearMetricCosts() {
-      bitField0_ = (bitField0_ & ~0x00000002);
       internalGetMutableMetricCosts().getMutableMap().clear();
       return this;
     }
@@ -915,7 +884,6 @@ public Builder clearMetricCosts() {
      * 
      * 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.
@@ -934,7 +902,6 @@ public Builder removeMetricCosts(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableMetricCosts() {
-      bitField0_ |= 0x00000002;
       return internalGetMutableMetricCosts().getMutableMap();
     }
 
@@ -944,7 +911,6 @@ public java.util.Map getMutableMetricCosts() {
      * 
      * 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.
@@ -958,7 +924,6 @@ public Builder putMetricCosts(java.lang.String key, long value) {
       }
 
       internalGetMutableMetricCosts().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000002;
       return this;
     }
 
@@ -968,7 +933,6 @@ public Builder putMetricCosts(java.lang.String key, long value) {
      * 
      * 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.
@@ -978,7 +942,6 @@ public Builder putMetricCosts(java.lang.String key, long value) {
      */
     public Builder putAllMetricCosts(java.util.Map values) {
       internalGetMutableMetricCosts().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000002;
       return this;
     }
 
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 08ed281def..e804552b91 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/quota.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface MetricRuleOrBuilder
@@ -29,7 +28,6 @@ public interface MetricRuleOrBuilder
    *
    * 
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -45,7 +43,6 @@ public interface MetricRuleOrBuilder
    *
    * 
    * Selects the methods to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -62,7 +59,6 @@ public interface MetricRuleOrBuilder
    * 
    * 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.
@@ -78,7 +74,6 @@ public interface MetricRuleOrBuilder
    * 
    * 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.
@@ -98,7 +93,6 @@ public interface MetricRuleOrBuilder
    * 
    * 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.
@@ -114,7 +108,6 @@ public interface MetricRuleOrBuilder
    * 
    * 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.
@@ -130,7 +123,6 @@ public interface MetricRuleOrBuilder
    * 
    * 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 8e60faccef..c42ee1ecfe 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/monitored_resource.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -34,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",
@@ -64,6 +62,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;
@@ -71,8 +74,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 2:
         return internalGetLabels();
@@ -91,9 +93,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
   }
 
   public static final int TYPE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object type_ = "";
+  private volatile java.lang.Object type_;
 
   /**
    *
@@ -168,7 +168,6 @@ private static final class LabelsDefaultEntryHolder {
             "");
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField labels_;
 
   private com.google.protobuf.MapField internalGetLabels() {
@@ -236,10 +235,7 @@ public java.util.Map getLabelsMap() {
    * map<string, string> labels = 2;
    */
   @java.lang.Override
-  public /* nullable */ java.lang.String getLabelsOrDefault(
-      java.lang.String key,
-      /* nullable */
-      java.lang.String defaultValue) {
+  public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -460,7 +456,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",
@@ -479,8 +474,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 2:
           return internalGetLabels();
@@ -490,8 +484,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 2:
           return internalGetMutableLabels();
@@ -520,8 +513,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       type_ = "";
+
       internalGetMutableLabels().clear();
       return this;
     }
@@ -549,24 +542,14 @@ public com.google.api.MonitoredResource build() {
     @java.lang.Override
     public com.google.api.MonitoredResource buildPartial() {
       com.google.api.MonitoredResource result = new com.google.api.MonitoredResource(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      int from_bitField0_ = bitField0_;
+      result.type_ = type_;
+      result.labels_ = internalGetLabels();
+      result.labels_.makeImmutable();
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.MonitoredResource result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.type_ = type_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.labels_ = internalGetLabels();
-        result.labels_.makeImmutable();
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -614,11 +597,9 @@ public Builder mergeFrom(com.google.api.MonitoredResource other) {
       if (other == com.google.api.MonitoredResource.getDefaultInstance()) return this;
       if (!other.getType().isEmpty()) {
         type_ = other.type_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       internalGetMutableLabels().mergeFrom(other.internalGetLabels());
-      bitField0_ |= 0x00000002;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -648,7 +629,7 @@ public Builder mergeFrom(
             case 10:
               {
                 type_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -660,7 +641,6 @@ public Builder mergeFrom(
                 internalGetMutableLabels()
                     .getMutableMap()
                     .put(labels__.getKey(), labels__.getValue());
-                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -764,8 +744,8 @@ public Builder setType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       type_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -788,8 +768,8 @@ public Builder setType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearType() {
+
       type_ = getDefaultInstance().getType();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -817,8 +797,8 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       type_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -834,14 +814,14 @@ private com.google.protobuf.MapField interna
 
     private com.google.protobuf.MapField
         internalGetMutableLabels() {
+      onChanged();
+      ;
       if (labels_ == null) {
         labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
       }
       if (!labels_.isMutable()) {
         labels_ = labels_.copy();
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
       return labels_;
     }
 
@@ -903,10 +883,8 @@ public java.util.Map getLabelsMap() {
      * map<string, string> labels = 2;
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getLabelsOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getLabelsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -938,7 +916,6 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
     }
 
     public Builder clearLabels() {
-      bitField0_ = (bitField0_ & ~0x00000002);
       internalGetMutableLabels().getMutableMap().clear();
       return this;
     }
@@ -965,7 +942,6 @@ public Builder removeLabels(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableLabels() {
-      bitField0_ |= 0x00000002;
       return internalGetMutableLabels().getMutableMap();
     }
 
@@ -987,8 +963,8 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
+
       internalGetMutableLabels().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000002;
       return this;
     }
 
@@ -1005,7 +981,6 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllLabels(java.util.Map values) {
       internalGetMutableLabels().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000002;
       return this;
     }
 
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 5377caed2d..2cd13cb8c8 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/monitored_resource.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -29,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.
@@ -63,6 +61,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;
@@ -79,9 +82,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 5;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -142,9 +143,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int TYPE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object type_ = "";
+  private volatile java.lang.Object type_;
 
   /**
    *
@@ -205,9 +204,7 @@ public com.google.protobuf.ByteString getTypeBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object displayName_ = "";
+  private volatile java.lang.Object displayName_;
 
   /**
    *
@@ -264,9 +261,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object description_ = "";
+  private volatile java.lang.Object description_;
 
   /**
    *
@@ -319,8 +314,6 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int LABELS_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
   private java.util.List labels_;
 
   /**
@@ -405,7 +398,7 @@ public com.google.api.LabelDescriptorOrBuilder getLabelsOrBuilder(int index) {
   }
 
   public static final int LAUNCH_STAGE_FIELD_NUMBER = 7;
-  private int launchStage_ = 0;
+  private int launchStage_;
 
   /**
    *
@@ -436,7 +429,8 @@ public int getLaunchStageValue() {
    */
   @java.lang.Override
   public com.google.api.LaunchStage getLaunchStage() {
-    com.google.api.LaunchStage result = com.google.api.LaunchStage.forNumber(launchStage_);
+    @SuppressWarnings("deprecation")
+    com.google.api.LaunchStage result = com.google.api.LaunchStage.valueOf(launchStage_);
     return result == null ? com.google.api.LaunchStage.UNRECOGNIZED : result;
   }
 
@@ -657,7 +651,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.
@@ -694,19 +687,23 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       type_ = "";
+
       displayName_ = "";
+
       description_ = "";
+
       if (labelsBuilder_ == null) {
         labels_ = java.util.Collections.emptyList();
       } else {
         labels_ = null;
         labelsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000010);
+      bitField0_ = (bitField0_ & ~0x00000001);
       launchStage_ = 0;
+
       return this;
     }
 
@@ -734,43 +731,23 @@ public com.google.api.MonitoredResourceDescriptor build() {
     public com.google.api.MonitoredResourceDescriptor buildPartial() {
       com.google.api.MonitoredResourceDescriptor result =
           new com.google.api.MonitoredResourceDescriptor(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.MonitoredResourceDescriptor result) {
+      int from_bitField0_ = bitField0_;
+      result.name_ = name_;
+      result.type_ = type_;
+      result.displayName_ = displayName_;
+      result.description_ = description_;
       if (labelsBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           labels_ = java.util.Collections.unmodifiableList(labels_);
-          bitField0_ = (bitField0_ & ~0x00000010);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.labels_ = labels_;
       } else {
         result.labels_ = labelsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.MonitoredResourceDescriptor result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.type_ = type_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.displayName_ = displayName_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.description_ = description_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.launchStage_ = launchStage_;
-      }
+      result.launchStage_ = launchStage_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -820,29 +797,25 @@ public Builder mergeFrom(com.google.api.MonitoredResourceDescriptor other) {
       if (other == com.google.api.MonitoredResourceDescriptor.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getType().isEmpty()) {
         type_ = other.type_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (labelsBuilder_ == null) {
         if (!other.labels_.isEmpty()) {
           if (labels_.isEmpty()) {
             labels_ = other.labels_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureLabelsIsMutable();
             labels_.addAll(other.labels_);
@@ -855,7 +828,7 @@ public Builder mergeFrom(com.google.api.MonitoredResourceDescriptor other) {
             labelsBuilder_.dispose();
             labelsBuilder_ = null;
             labels_ = other.labels_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00000001);
             labelsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getLabelsFieldBuilder()
@@ -897,19 +870,19 @@ public Builder mergeFrom(
             case 10:
               {
                 type_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 18
             case 26:
               {
                 description_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 26
             case 34:
@@ -927,13 +900,13 @@ public Builder mergeFrom(
             case 42:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 42
             case 56:
               {
                 launchStage_ = input.readEnum();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 56
             default:
@@ -1034,8 +1007,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1057,8 +1030,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1085,8 +1058,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1170,8 +1143,8 @@ public Builder setType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       type_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1193,8 +1166,8 @@ public Builder setType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearType() {
+
       type_ = getDefaultInstance().getType();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1221,8 +1194,8 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       type_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1300,8 +1273,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       displayName_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1321,8 +1294,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
+
       displayName_ = getDefaultInstance().getDisplayName();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1347,8 +1320,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       displayName_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1420,8 +1393,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       description_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1439,8 +1412,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
+
       description_ = getDefaultInstance().getDescription();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1463,8 +1436,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       description_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1473,9 +1446,9 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureLabelsIsMutable() {
-      if (!((bitField0_ & 0x00000010) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         labels_ = new java.util.ArrayList(labels_);
-        bitField0_ |= 0x00000010;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1720,7 +1693,7 @@ public Builder addAllLabels(
     public Builder clearLabels() {
       if (labelsBuilder_ == null) {
         labels_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000010);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         labelsBuilder_.clear();
@@ -1862,7 +1835,7 @@ public java.util.List getLabelsBuilderLi
                 com.google.api.LabelDescriptor,
                 com.google.api.LabelDescriptor.Builder,
                 com.google.api.LabelDescriptorOrBuilder>(
-                labels_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
+                labels_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         labels_ = null;
       }
       return labelsBuilder_;
@@ -1899,8 +1872,8 @@ public int getLaunchStageValue() {
      * @return This builder for chaining.
      */
     public Builder setLaunchStageValue(int value) {
+
       launchStage_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1918,7 +1891,8 @@ public Builder setLaunchStageValue(int value) {
      */
     @java.lang.Override
     public com.google.api.LaunchStage getLaunchStage() {
-      com.google.api.LaunchStage result = com.google.api.LaunchStage.forNumber(launchStage_);
+      @SuppressWarnings("deprecation")
+      com.google.api.LaunchStage result = com.google.api.LaunchStage.valueOf(launchStage_);
       return result == null ? com.google.api.LaunchStage.UNRECOGNIZED : result;
     }
 
@@ -1938,7 +1912,7 @@ public Builder setLaunchStage(com.google.api.LaunchStage value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000020;
+
       launchStage_ = value.getNumber();
       onChanged();
       return this;
@@ -1956,7 +1930,7 @@ public Builder setLaunchStage(com.google.api.LaunchStage value) {
      * @return This builder for chaining.
      */
     public Builder clearLaunchStage() {
-      bitField0_ = (bitField0_ & ~0x00000020);
+
       launchStage_ = 0;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptorOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptorOrBuilder.java
index 404e8eeb46..378218a2f1 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptorOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptorOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/monitored_resource.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface MonitoredResourceDescriptorOrBuilder
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 02acbeb9c2..1a0614c578 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/monitored_resource.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -52,6 +51,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;
@@ -59,8 +63,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 2:
         return internalGetUserLabels();
@@ -79,7 +82,6 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
             com.google.api.MonitoredResourceMetadata.Builder.class);
   }
 
-  private int bitField0_;
   public static final int SYSTEM_LABELS_FIELD_NUMBER = 1;
   private com.google.protobuf.Struct systemLabels_;
 
@@ -93,7 +95,6 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
    * "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 }
@@ -105,7 +106,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
    */
   @java.lang.Override
   public boolean hasSystemLabels() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return systemLabels_ != null;
   }
 
   /**
@@ -118,7 +119,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 }
@@ -143,7 +143,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 }
@@ -153,7 +152,7 @@ public com.google.protobuf.Struct getSystemLabels() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getSystemLabelsOrBuilder() {
-    return systemLabels_ == null ? com.google.protobuf.Struct.getDefaultInstance() : systemLabels_;
+    return getSystemLabels();
   }
 
   public static final int USER_LABELS_FIELD_NUMBER = 2;
@@ -169,7 +168,6 @@ private static final class UserLabelsDefaultEntryHolder {
             "");
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField userLabels_;
 
   private com.google.protobuf.MapField internalGetUserLabels() {
@@ -231,10 +229,8 @@ public java.util.Map getUserLabelsMap() {
    * map<string, string> user_labels = 2;
    */
   @java.lang.Override
-  public /* nullable */ java.lang.String getUserLabelsOrDefault(
-      java.lang.String key,
-      /* nullable */
-      java.lang.String defaultValue) {
+  public java.lang.String getUserLabelsOrDefault(
+      java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -277,7 +273,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (systemLabels_ != null) {
       output.writeMessage(1, getSystemLabels());
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
@@ -291,7 +287,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (systemLabels_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getSystemLabels());
     }
     for (java.util.Map.Entry entry :
@@ -468,8 +464,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 2:
           return internalGetUserLabels();
@@ -479,8 +474,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 2:
           return internalGetMutableUserLabels();
@@ -500,28 +494,19 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     }
 
     // Construct using com.google.api.MonitoredResourceMetadata.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getSystemLabelsFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      systemLabels_ = null;
-      if (systemLabelsBuilder_ != null) {
-        systemLabelsBuilder_.dispose();
+      if (systemLabelsBuilder_ == null) {
+        systemLabels_ = null;
+      } else {
+        systemLabels_ = null;
         systemLabelsBuilder_ = null;
       }
       internalGetMutableUserLabels().clear();
@@ -552,28 +537,18 @@ public com.google.api.MonitoredResourceMetadata build() {
     public com.google.api.MonitoredResourceMetadata buildPartial() {
       com.google.api.MonitoredResourceMetadata result =
           new com.google.api.MonitoredResourceMetadata(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      if (systemLabelsBuilder_ == null) {
+        result.systemLabels_ = systemLabels_;
+      } else {
+        result.systemLabels_ = systemLabelsBuilder_.build();
       }
+      result.userLabels_ = internalGetUserLabels();
+      result.userLabels_.makeImmutable();
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.MonitoredResourceMetadata result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.systemLabels_ =
-            systemLabelsBuilder_ == null ? systemLabels_ : systemLabelsBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.userLabels_ = internalGetUserLabels();
-        result.userLabels_.makeImmutable();
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -623,7 +598,6 @@ public Builder mergeFrom(com.google.api.MonitoredResourceMetadata other) {
         mergeSystemLabels(other.getSystemLabels());
       }
       internalGetMutableUserLabels().mergeFrom(other.internalGetUserLabels());
-      bitField0_ |= 0x00000002;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -653,7 +627,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getSystemLabelsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -665,7 +639,6 @@ public Builder mergeFrom(
                 internalGetMutableUserLabels()
                     .getMutableMap()
                     .put(userLabels__.getKey(), userLabels__.getValue());
-                bitField0_ |= 0x00000002;
                 break;
               } // case 18
             default:
@@ -704,7 +677,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 }
@@ -715,7 +687,7 @@ public Builder mergeFrom(
      * @return Whether the systemLabels field is set.
      */
     public boolean hasSystemLabels() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return systemLabelsBuilder_ != null || systemLabels_ != null;
     }
 
     /**
@@ -728,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 }
@@ -758,7 +729,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 }
@@ -772,11 +742,11 @@ public Builder setSystemLabels(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         systemLabels_ = value;
+        onChanged();
       } else {
         systemLabelsBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -790,7 +760,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 }
@@ -801,11 +770,11 @@ public Builder setSystemLabels(com.google.protobuf.Struct value) {
     public Builder setSystemLabels(com.google.protobuf.Struct.Builder builderForValue) {
       if (systemLabelsBuilder_ == null) {
         systemLabels_ = builderForValue.build();
+        onChanged();
       } else {
         systemLabelsBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -819,7 +788,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 }
@@ -829,20 +797,17 @@ public Builder setSystemLabels(com.google.protobuf.Struct.Builder builderForValu
      */
     public Builder mergeSystemLabels(com.google.protobuf.Struct value) {
       if (systemLabelsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && systemLabels_ != null
-            && systemLabels_ != com.google.protobuf.Struct.getDefaultInstance()) {
-          getSystemLabelsBuilder().mergeFrom(value);
+        if (systemLabels_ != null) {
+          systemLabels_ =
+              com.google.protobuf.Struct.newBuilder(systemLabels_).mergeFrom(value).buildPartial();
         } else {
           systemLabels_ = value;
         }
+        onChanged();
       } else {
         systemLabelsBuilder_.mergeFrom(value);
       }
-      if (systemLabels_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -856,7 +821,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 }
@@ -865,13 +829,14 @@ public Builder mergeSystemLabels(com.google.protobuf.Struct value) {
      * .google.protobuf.Struct system_labels = 1;
      */
     public Builder clearSystemLabels() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      systemLabels_ = null;
-      if (systemLabelsBuilder_ != null) {
-        systemLabelsBuilder_.dispose();
+      if (systemLabelsBuilder_ == null) {
+        systemLabels_ = null;
+        onChanged();
+      } else {
+        systemLabels_ = null;
         systemLabelsBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -885,7 +850,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 }
@@ -894,7 +858,7 @@ public Builder clearSystemLabels() {
      * .google.protobuf.Struct system_labels = 1;
      */
     public com.google.protobuf.Struct.Builder getSystemLabelsBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getSystemLabelsFieldBuilder().getBuilder();
     }
@@ -909,7 +873,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 }
@@ -937,7 +900,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 }
@@ -975,6 +937,8 @@ public com.google.protobuf.StructOrBuilder getSystemLabelsOrBuilder() {
 
     private com.google.protobuf.MapField
         internalGetMutableUserLabels() {
+      onChanged();
+      ;
       if (userLabels_ == null) {
         userLabels_ =
             com.google.protobuf.MapField.newMapField(UserLabelsDefaultEntryHolder.defaultEntry);
@@ -982,8 +946,6 @@ public com.google.protobuf.StructOrBuilder getSystemLabelsOrBuilder() {
       if (!userLabels_.isMutable()) {
         userLabels_ = userLabels_.copy();
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
       return userLabels_;
     }
 
@@ -1039,10 +1001,8 @@ public java.util.Map getUserLabelsMap() {
      * map<string, string> user_labels = 2;
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getUserLabelsOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getUserLabelsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1072,7 +1032,6 @@ public java.lang.String getUserLabelsOrThrow(java.lang.String key) {
     }
 
     public Builder clearUserLabels() {
-      bitField0_ = (bitField0_ & ~0x00000002);
       internalGetMutableUserLabels().getMutableMap().clear();
       return this;
     }
@@ -1097,7 +1056,6 @@ public Builder removeUserLabels(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableUserLabels() {
-      bitField0_ |= 0x00000002;
       return internalGetMutableUserLabels().getMutableMap();
     }
 
@@ -1117,8 +1075,8 @@ public Builder putUserLabels(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
+
       internalGetMutableUserLabels().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000002;
       return this;
     }
 
@@ -1133,7 +1091,6 @@ public Builder putUserLabels(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllUserLabels(java.util.Map values) {
       internalGetMutableUserLabels().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000002;
       return this;
     }
 
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 3b240c083d..99630ecae5 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/monitored_resource.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface MonitoredResourceMetadataOrBuilder
@@ -34,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 }
@@ -56,7 +54,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 }
@@ -78,7 +75,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 }
@@ -134,6 +130,7 @@ public interface MonitoredResourceMetadataOrBuilder
    *
    * map<string, string> user_labels = 2;
    */
+
   /* nullable */
   java.lang.String getUserLabelsOrDefault(
       java.lang.String key,
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceOrBuilder.java
index 80d810ce68..ac80baacf9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/monitored_resource.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface MonitoredResourceOrBuilder
@@ -116,6 +115,7 @@ public interface MonitoredResourceOrBuilder
    *
    * map<string, string> labels = 2;
    */
+
   /* nullable */
   java.lang.String getLabelsOrDefault(
       java.lang.String key,
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceProto.java
index 6383026175..a6ef8ca773 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/monitored_resource.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class MonitoredResourceProto {
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 b3570ec7a1..a9270b71ee 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/monitoring.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -24,14 +23,12 @@
  *
  * 
  * 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"
@@ -101,6 +98,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;
   }
@@ -234,7 +236,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
@@ -243,6 +245,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;
@@ -259,9 +266,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int MONITORED_RESOURCE_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object monitoredResource_ = "";
+    private volatile java.lang.Object monitoredResource_;
 
     /**
      *
@@ -316,10 +321,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_;
 
     /**
      *
@@ -608,9 +610,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         monitoredResource_ = "";
-        metrics_ = com.google.protobuf.LazyStringArrayList.emptyList();
+
+        metrics_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -638,24 +641,17 @@ 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);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        int from_bitField0_ = bitField0_;
+        result.monitoredResource_ = monitoredResource_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          metrics_ = metrics_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
+        result.metrics_ = metrics_;
         onBuilt();
         return result;
       }
 
-      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();
@@ -706,13 +702,12 @@ public Builder mergeFrom(com.google.api.Monitoring.MonitoringDestination other)
           return this;
         if (!other.getMonitoredResource().isEmpty()) {
           monitoredResource_ = other.monitoredResource_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.metrics_.isEmpty()) {
           if (metrics_.isEmpty()) {
             metrics_ = other.metrics_;
-            bitField0_ |= 0x00000002;
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureMetricsIsMutable();
             metrics_.addAll(other.metrics_);
@@ -748,7 +743,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   monitoredResource_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
@@ -847,8 +842,8 @@ public Builder setMonitoredResource(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         monitoredResource_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -867,8 +862,8 @@ public Builder setMonitoredResource(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearMonitoredResource() {
+
         monitoredResource_ = getDefaultInstance().getMonitoredResource();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -892,20 +887,20 @@ public Builder setMonitoredResourceBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         monitoredResource_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         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_ & 0x00000001) != 0)) {
           metrics_ = new com.google.protobuf.LazyStringArrayList(metrics_);
+          bitField0_ |= 0x00000001;
         }
-        bitField0_ |= 0x00000002;
       }
 
       /**
@@ -922,8 +917,7 @@ private void ensureMetricsIsMutable() {
        * @return A list containing the metrics.
        */
       public com.google.protobuf.ProtocolStringList getMetricsList() {
-        metrics_.makeImmutable();
-        return metrics_;
+        return metrics_.getUnmodifiableView();
       }
 
       /**
@@ -1000,7 +994,6 @@ public Builder setMetrics(int index, java.lang.String value) {
         }
         ensureMetricsIsMutable();
         metrics_.set(index, value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1025,7 +1018,6 @@ public Builder addMetrics(java.lang.String value) {
         }
         ensureMetricsIsMutable();
         metrics_.add(value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1047,7 +1039,6 @@ public Builder addMetrics(java.lang.String value) {
       public Builder addAllMetrics(java.lang.Iterable values) {
         ensureMetricsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, metrics_);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1066,9 +1057,8 @@ public Builder addAllMetrics(java.lang.Iterable values) {
        * @return This builder for chaining.
        */
       public Builder clearMetrics() {
-        metrics_ = com.google.protobuf.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        ;
+        metrics_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1094,7 +1084,6 @@ public Builder addMetricsBytes(com.google.protobuf.ByteString value) {
         checkByteStringIsUtf8(value);
         ensureMetricsIsMutable();
         metrics_.add(value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1164,8 +1153,6 @@ public com.google.api.Monitoring.MonitoringDestination getDefaultInstanceForType
   }
 
   public static final int PRODUCER_DESTINATIONS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List producerDestinations_;
 
   /**
@@ -1267,8 +1254,6 @@ public com.google.api.Monitoring.MonitoringDestinationOrBuilder getProducerDesti
   }
 
   public static final int CONSUMER_DESTINATIONS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List consumerDestinations_;
 
   /**
@@ -1547,14 +1532,12 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * 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"
@@ -1628,7 +1611,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (producerDestinationsBuilder_ == null) {
         producerDestinations_ = java.util.Collections.emptyList();
       } else {
@@ -1668,15 +1650,7 @@ public com.google.api.Monitoring build() {
     @java.lang.Override
     public com.google.api.Monitoring buildPartial() {
       com.google.api.Monitoring result = new com.google.api.Monitoring(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.Monitoring result) {
+      int from_bitField0_ = bitField0_;
       if (producerDestinationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           producerDestinations_ = java.util.Collections.unmodifiableList(producerDestinations_);
@@ -1695,10 +1669,8 @@ private void buildPartialRepeatedFields(com.google.api.Monitoring result) {
       } else {
         result.consumerDestinations_ = consumerDestinationsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.Monitoring result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoringOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoringOrBuilder.java
index ebbd4c28d5..6886a0af7b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoringOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoringOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/monitoring.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface MonitoringOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoringProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoringProto.java
index 51e928451c..6e06be7136 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoringProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoringProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/monitoring.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class MonitoringProto {
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 834ea57c72..38a1bbd4d5 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -47,6 +46,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;
   }
@@ -59,7 +63,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.api.NodeSettings.class, com.google.api.NodeSettings.Builder.class);
   }
 
-  private int bitField0_;
   public static final int COMMON_FIELD_NUMBER = 1;
   private com.google.api.CommonLanguageSettings common_;
 
@@ -76,7 +79,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasCommon() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return common_ != null;
   }
 
   /**
@@ -106,7 +109,7 @@ public com.google.api.CommonLanguageSettings getCommon() {
    */
   @java.lang.Override
   public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
-    return common_ == null ? com.google.api.CommonLanguageSettings.getDefaultInstance() : common_;
+    return getCommon();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -123,7 +126,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (common_ != null) {
       output.writeMessage(1, getCommon());
     }
     getUnknownFields().writeTo(output);
@@ -135,7 +138,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (common_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCommon());
     }
     size += getUnknownFields().getSerializedSize();
@@ -298,28 +301,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.NodeSettings.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCommonFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      common_ = null;
-      if (commonBuilder_ != null) {
-        commonBuilder_.dispose();
+      if (commonBuilder_ == null) {
+        common_ = null;
+      } else {
+        common_ = null;
         commonBuilder_ = null;
       }
       return this;
@@ -347,23 +341,15 @@ public com.google.api.NodeSettings build() {
     @java.lang.Override
     public com.google.api.NodeSettings buildPartial() {
       com.google.api.NodeSettings result = new com.google.api.NodeSettings(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (commonBuilder_ == null) {
+        result.common_ = common_;
+      } else {
+        result.common_ = commonBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.NodeSettings result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -441,7 +427,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -461,8 +447,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.api.CommonLanguageSettings common_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.api.CommonLanguageSettings,
@@ -482,7 +466,7 @@ public Builder mergeFrom(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return commonBuilder_ != null || common_ != null;
     }
 
     /**
@@ -521,11 +505,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
           throw new NullPointerException();
         }
         common_ = value;
+        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -541,11 +525,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
     public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderForValue) {
       if (commonBuilder_ == null) {
         common_ = builderForValue.build();
+        onChanged();
       } else {
         commonBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -560,20 +544,19 @@ public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderFo
      */
     public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
       if (commonBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && common_ != null
-            && common_ != com.google.api.CommonLanguageSettings.getDefaultInstance()) {
-          getCommonBuilder().mergeFrom(value);
+        if (common_ != null) {
+          common_ =
+              com.google.api.CommonLanguageSettings.newBuilder(common_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           common_ = value;
         }
+        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-      if (common_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -587,13 +570,14 @@ public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
      * .google.api.CommonLanguageSettings common = 1;
      */
     public Builder clearCommon() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      common_ = null;
-      if (commonBuilder_ != null) {
-        commonBuilder_.dispose();
+      if (commonBuilder_ == null) {
+        common_ = null;
+        onChanged();
+      } else {
+        common_ = null;
         commonBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -607,7 +591,7 @@ public Builder clearCommon() {
      * .google.api.CommonLanguageSettings common = 1;
      */
     public com.google.api.CommonLanguageSettings.Builder getCommonBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getCommonFieldBuilder().getBuilder();
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/NodeSettingsOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/NodeSettingsOrBuilder.java
index 7f08c9b89d..d80410c6c2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/NodeSettingsOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/NodeSettingsOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface NodeSettingsOrBuilder
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 c0a38bb5ae..ffc701606f 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/auth.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -27,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.
@@ -66,6 +61,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;
   }
@@ -79,9 +79,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CANONICAL_SCOPES_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object canonicalScopes_ = "";
+  private volatile java.lang.Object canonicalScopes_;
 
   /**
    *
@@ -89,9 +87,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * 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
    * 

@@ -119,9 +115,7 @@ public java.lang.String getCanonicalScopes() {
    * 
    * 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
    * 

@@ -309,17 +303,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.
@@ -355,8 +345,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       canonicalScopes_ = "";
+
       return this;
     }
 
@@ -382,20 +372,11 @@ public com.google.api.OAuthRequirements build() {
     @java.lang.Override
     public com.google.api.OAuthRequirements buildPartial() {
       com.google.api.OAuthRequirements result = new com.google.api.OAuthRequirements(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.canonicalScopes_ = canonicalScopes_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.OAuthRequirements result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.canonicalScopes_ = canonicalScopes_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -443,7 +424,6 @@ public Builder mergeFrom(com.google.api.OAuthRequirements other) {
       if (other == com.google.api.OAuthRequirements.getDefaultInstance()) return this;
       if (!other.getCanonicalScopes().isEmpty()) {
         canonicalScopes_ = other.canonicalScopes_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -475,7 +455,7 @@ public Builder mergeFrom(
             case 10:
               {
                 canonicalScopes_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -495,8 +475,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object canonicalScopes_ = "";
 
     /**
@@ -505,9 +483,7 @@ public Builder mergeFrom(
      * 
      * 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
      * 

@@ -534,9 +510,7 @@ public java.lang.String getCanonicalScopes() {
      * 
      * 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
      * 

@@ -563,9 +537,7 @@ public com.google.protobuf.ByteString getCanonicalScopesBytes() {
      * 
      * 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
      * 

@@ -579,8 +551,8 @@ public Builder setCanonicalScopes(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       canonicalScopes_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -591,9 +563,7 @@ public Builder setCanonicalScopes(java.lang.String value) {
      * 
      * 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
      * 

@@ -603,8 +573,8 @@ public Builder setCanonicalScopes(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearCanonicalScopes() {
+
       canonicalScopes_ = getDefaultInstance().getCanonicalScopes();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -615,9 +585,7 @@ public Builder clearCanonicalScopes() {
      * 
      * 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
      * 

@@ -632,8 +600,8 @@ public Builder setCanonicalScopesBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       canonicalScopes_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
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 b135771598..7c3eef4fe3 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/auth.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface OAuthRequirementsOrBuilder
@@ -30,9 +29,7 @@ public interface OAuthRequirementsOrBuilder
    * 
    * 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
    * 

@@ -49,9 +46,7 @@ public interface OAuthRequirementsOrBuilder
    * 
    * 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
    * 

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 084718d8fd..2fe1232896 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/documentation.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -52,6 +51,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;
   }
@@ -65,9 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -144,9 +146,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int CONTENT_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object content_ = "";
+  private volatile java.lang.Object content_;
 
   /**
    *
@@ -201,8 +201,6 @@ public com.google.protobuf.ByteString getContentBytes() {
   }
 
   public static final int SUBPAGES_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
   private java.util.List subpages_;
 
   /**
@@ -494,16 +492,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       content_ = "";
+
       if (subpagesBuilder_ == null) {
         subpages_ = java.util.Collections.emptyList();
       } else {
         subpages_ = null;
         subpagesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -529,34 +528,20 @@ public com.google.api.Page build() {
     @java.lang.Override
     public com.google.api.Page buildPartial() {
       com.google.api.Page result = new com.google.api.Page(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.Page result) {
+      int from_bitField0_ = bitField0_;
+      result.name_ = name_;
+      result.content_ = content_;
       if (subpagesBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           subpages_ = java.util.Collections.unmodifiableList(subpages_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.subpages_ = subpages_;
       } else {
         result.subpages_ = subpagesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.Page result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.content_ = content_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -606,19 +591,17 @@ public Builder mergeFrom(com.google.api.Page other) {
       if (other == com.google.api.Page.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getContent().isEmpty()) {
         content_ = other.content_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (subpagesBuilder_ == null) {
         if (!other.subpages_.isEmpty()) {
           if (subpages_.isEmpty()) {
             subpages_ = other.subpages_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureSubpagesIsMutable();
             subpages_.addAll(other.subpages_);
@@ -631,7 +614,7 @@ public Builder mergeFrom(com.google.api.Page other) {
             subpagesBuilder_.dispose();
             subpagesBuilder_ = null;
             subpages_ = other.subpages_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
             subpagesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getSubpagesFieldBuilder()
@@ -670,13 +653,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 content_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
@@ -813,8 +796,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -844,8 +827,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -880,8 +863,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -956,8 +939,8 @@ public Builder setContent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       content_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -976,8 +959,8 @@ public Builder setContent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearContent() {
+
       content_ = getDefaultInstance().getContent();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1001,8 +984,8 @@ public Builder setContentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       content_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1010,9 +993,9 @@ public Builder setContentBytes(com.google.protobuf.ByteString value) {
     private java.util.List subpages_ = java.util.Collections.emptyList();
 
     private void ensureSubpagesIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         subpages_ = new java.util.ArrayList(subpages_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1243,7 +1226,7 @@ public Builder addAllSubpages(java.lang.Iterable
     public Builder clearSubpages() {
       if (subpagesBuilder_ == null) {
         subpages_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         subpagesBuilder_.clear();
@@ -1371,7 +1354,7 @@ public java.util.List getSubpagesBuilderList() {
         subpagesBuilder_ =
             new com.google.protobuf.RepeatedFieldBuilderV3<
                 com.google.api.Page, com.google.api.Page.Builder, com.google.api.PageOrBuilder>(
-                subpages_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
+                subpages_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         subpages_ = null;
       }
       return subpagesBuilder_;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PageOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PageOrBuilder.java
index 3edefc3aaa..60560c9e27 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PageOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PageOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/documentation.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface PageOrBuilder
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 2bbe5ed276..94904d8280 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -47,6 +46,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;
   }
@@ -59,7 +63,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.api.PhpSettings.class, com.google.api.PhpSettings.Builder.class);
   }
 
-  private int bitField0_;
   public static final int COMMON_FIELD_NUMBER = 1;
   private com.google.api.CommonLanguageSettings common_;
 
@@ -76,7 +79,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasCommon() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return common_ != null;
   }
 
   /**
@@ -106,7 +109,7 @@ public com.google.api.CommonLanguageSettings getCommon() {
    */
   @java.lang.Override
   public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
-    return common_ == null ? com.google.api.CommonLanguageSettings.getDefaultInstance() : common_;
+    return getCommon();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -123,7 +126,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (common_ != null) {
       output.writeMessage(1, getCommon());
     }
     getUnknownFields().writeTo(output);
@@ -135,7 +138,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (common_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCommon());
     }
     size += getUnknownFields().getSerializedSize();
@@ -298,28 +301,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.PhpSettings.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCommonFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      common_ = null;
-      if (commonBuilder_ != null) {
-        commonBuilder_.dispose();
+      if (commonBuilder_ == null) {
+        common_ = null;
+      } else {
+        common_ = null;
         commonBuilder_ = null;
       }
       return this;
@@ -347,23 +341,15 @@ public com.google.api.PhpSettings build() {
     @java.lang.Override
     public com.google.api.PhpSettings buildPartial() {
       com.google.api.PhpSettings result = new com.google.api.PhpSettings(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (commonBuilder_ == null) {
+        result.common_ = common_;
+      } else {
+        result.common_ = commonBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.PhpSettings result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -441,7 +427,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -461,8 +447,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.api.CommonLanguageSettings common_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.api.CommonLanguageSettings,
@@ -482,7 +466,7 @@ public Builder mergeFrom(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return commonBuilder_ != null || common_ != null;
     }
 
     /**
@@ -521,11 +505,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
           throw new NullPointerException();
         }
         common_ = value;
+        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -541,11 +525,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
     public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderForValue) {
       if (commonBuilder_ == null) {
         common_ = builderForValue.build();
+        onChanged();
       } else {
         commonBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -560,20 +544,19 @@ public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderFo
      */
     public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
       if (commonBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && common_ != null
-            && common_ != com.google.api.CommonLanguageSettings.getDefaultInstance()) {
-          getCommonBuilder().mergeFrom(value);
+        if (common_ != null) {
+          common_ =
+              com.google.api.CommonLanguageSettings.newBuilder(common_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           common_ = value;
         }
+        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-      if (common_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -587,13 +570,14 @@ public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
      * .google.api.CommonLanguageSettings common = 1;
      */
     public Builder clearCommon() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      common_ = null;
-      if (commonBuilder_ != null) {
-        commonBuilder_.dispose();
+      if (commonBuilder_ == null) {
+        common_ = null;
+        onChanged();
+      } else {
+        common_ = null;
         commonBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -607,7 +591,7 @@ public Builder clearCommon() {
      * .google.api.CommonLanguageSettings common = 1;
      */
     public com.google.api.CommonLanguageSettings.Builder getCommonBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getCommonFieldBuilder().getBuilder();
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PhpSettingsOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PhpSettingsOrBuilder.java
index 5d83a39bdb..3ce81d283b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PhpSettingsOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PhpSettingsOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface PhpSettingsOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PolicyProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PolicyProto.java
index cfd058413e..ff277bcfb6 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PolicyProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PolicyProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class PolicyProto {
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 a1615e6383..5ae43c66b3 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/consumer.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -29,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
@@ -64,6 +61,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;
   }
@@ -78,8 +80,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PROPERTIES_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List properties_;
 
   /**
@@ -322,9 +322,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
@@ -364,7 +362,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (propertiesBuilder_ == null) {
         properties_ = java.util.Collections.emptyList();
       } else {
@@ -397,15 +394,7 @@ public com.google.api.ProjectProperties build() {
     @java.lang.Override
     public com.google.api.ProjectProperties buildPartial() {
       com.google.api.ProjectProperties result = new com.google.api.ProjectProperties(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.ProjectProperties result) {
+      int from_bitField0_ = bitField0_;
       if (propertiesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           properties_ = java.util.Collections.unmodifiableList(properties_);
@@ -415,10 +404,8 @@ private void buildPartialRepeatedFields(com.google.api.ProjectProperties result)
       } else {
         result.properties_ = propertiesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.ProjectProperties result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ProjectPropertiesOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ProjectPropertiesOrBuilder.java
index c8c1eb6f2d..16940a28d7 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ProjectPropertiesOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ProjectPropertiesOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/consumer.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface ProjectPropertiesOrBuilder
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 359e9e6a21..9617562236 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/consumer.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -24,13 +23,11 @@
  *
  * 
  * 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.
  * 

@@ -60,6 +57,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;
   }
@@ -278,9 +280,7 @@ private PropertyType(int value) {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -331,7 +331,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int TYPE_FIELD_NUMBER = 2;
-  private int type_ = 0;
+  private int type_;
 
   /**
    *
@@ -362,15 +362,14 @@ public int getTypeValue() {
    */
   @java.lang.Override
   public com.google.api.Property.PropertyType getType() {
+    @SuppressWarnings("deprecation")
     com.google.api.Property.PropertyType result =
-        com.google.api.Property.PropertyType.forNumber(type_);
+        com.google.api.Property.PropertyType.valueOf(type_);
     return result == null ? com.google.api.Property.PropertyType.UNRECOGNIZED : result;
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object description_ = "";
+  private volatile java.lang.Object description_;
 
   /**
    *
@@ -601,13 +600,11 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * 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.
    * 

@@ -640,10 +637,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       type_ = 0;
+
       description_ = "";
+
       return this;
     }
 
@@ -669,26 +668,13 @@ public com.google.api.Property build() {
     @java.lang.Override
     public com.google.api.Property buildPartial() {
       com.google.api.Property result = new com.google.api.Property(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
+      result.type_ = type_;
+      result.description_ = description_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.Property result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.type_ = type_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.description_ = description_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -736,7 +722,6 @@ public Builder mergeFrom(com.google.api.Property other) {
       if (other == com.google.api.Property.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.type_ != 0) {
@@ -744,7 +729,6 @@ public Builder mergeFrom(com.google.api.Property other) {
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -776,19 +760,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 type_ = input.readEnum();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 description_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -808,8 +792,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -874,8 +856,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -892,8 +874,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -915,8 +897,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -952,8 +934,8 @@ public int getTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setTypeValue(int value) {
+
       type_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -971,8 +953,9 @@ public Builder setTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.api.Property.PropertyType getType() {
+      @SuppressWarnings("deprecation")
       com.google.api.Property.PropertyType result =
-          com.google.api.Property.PropertyType.forNumber(type_);
+          com.google.api.Property.PropertyType.valueOf(type_);
       return result == null ? com.google.api.Property.PropertyType.UNRECOGNIZED : result;
     }
 
@@ -992,7 +975,7 @@ public Builder setType(com.google.api.Property.PropertyType value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000002;
+
       type_ = value.getNumber();
       onChanged();
       return this;
@@ -1010,7 +993,7 @@ public Builder setType(com.google.api.Property.PropertyType value) {
      * @return This builder for chaining.
      */
     public Builder clearType() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       type_ = 0;
       onChanged();
       return this;
@@ -1080,8 +1063,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       description_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1098,8 +1081,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
+
       description_ = getDefaultInstance().getDescription();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1121,8 +1104,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       description_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PropertyOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PropertyOrBuilder.java
index e0933c5aea..23f88c4faf 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PropertyOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PropertyOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/consumer.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface PropertyOrBuilder
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 e855ca9c4d..524a41b502 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -47,7 +46,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();
@@ -61,6 +60,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;
   }
@@ -74,8 +78,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int METHOD_SETTINGS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List methodSettings_;
 
   /**
@@ -155,9 +157,7 @@ public com.google.api.MethodSettingsOrBuilder getMethodSettingsOrBuilder(int ind
   }
 
   public static final int NEW_ISSUE_URI_FIELD_NUMBER = 101;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object newIssueUri_ = "";
+  private volatile java.lang.Object newIssueUri_;
 
   /**
    *
@@ -210,9 +210,7 @@ public com.google.protobuf.ByteString getNewIssueUriBytes() {
   }
 
   public static final int DOCUMENTATION_URI_FIELD_NUMBER = 102;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object documentationUri_ = "";
+  private volatile java.lang.Object documentationUri_;
 
   /**
    *
@@ -265,9 +263,7 @@ public com.google.protobuf.ByteString getDocumentationUriBytes() {
   }
 
   public static final int API_SHORT_NAME_FIELD_NUMBER = 103;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object apiShortName_ = "";
+  private volatile java.lang.Object apiShortName_;
 
   /**
    *
@@ -322,9 +318,7 @@ public com.google.protobuf.ByteString getApiShortNameBytes() {
   }
 
   public static final int GITHUB_LABEL_FIELD_NUMBER = 104;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object githubLabel_ = "";
+  private volatile java.lang.Object githubLabel_;
 
   /**
    *
@@ -375,10 +369,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_;
 
   /**
    *
@@ -447,9 +438,7 @@ public com.google.protobuf.ByteString getCodeownerGithubTeamsBytes(int index) {
   }
 
   public static final int DOC_TAG_PREFIX_FIELD_NUMBER = 106;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object docTagPrefix_ = "";
+  private volatile java.lang.Object docTagPrefix_;
 
   /**
    *
@@ -502,7 +491,7 @@ public com.google.protobuf.ByteString getDocTagPrefixBytes() {
   }
 
   public static final int ORGANIZATION_FIELD_NUMBER = 107;
-  private int organization_ = 0;
+  private int organization_;
 
   /**
    *
@@ -533,14 +522,13 @@ public int getOrganizationValue() {
    */
   @java.lang.Override
   public com.google.api.ClientLibraryOrganization getOrganization() {
+    @SuppressWarnings("deprecation")
     com.google.api.ClientLibraryOrganization result =
-        com.google.api.ClientLibraryOrganization.forNumber(organization_);
+        com.google.api.ClientLibraryOrganization.valueOf(organization_);
     return result == null ? com.google.api.ClientLibraryOrganization.UNRECOGNIZED : result;
   }
 
   public static final int LIBRARY_SETTINGS_FIELD_NUMBER = 109;
-
-  @SuppressWarnings("serial")
   private java.util.List librarySettings_;
 
   /**
@@ -625,9 +613,7 @@ public com.google.api.ClientLibrarySettingsOrBuilder getLibrarySettingsOrBuilder
   }
 
   public static final int PROTO_REFERENCE_DOCUMENTATION_URI_FIELD_NUMBER = 110;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object protoReferenceDocumentationUri_ = "";
+  private volatile java.lang.Object protoReferenceDocumentationUri_;
 
   /**
    *
@@ -680,9 +666,7 @@ public com.google.protobuf.ByteString getProtoReferenceDocumentationUriBytes() {
   }
 
   public static final int REST_REFERENCE_DOCUMENTATION_URI_FIELD_NUMBER = 111;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object restReferenceDocumentationUri_ = "";
+  private volatile java.lang.Object restReferenceDocumentationUri_;
 
   /**
    *
@@ -1044,7 +1028,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (methodSettingsBuilder_ == null) {
         methodSettings_ = java.util.Collections.emptyList();
       } else {
@@ -1053,21 +1036,30 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       newIssueUri_ = "";
+
       documentationUri_ = "";
+
       apiShortName_ = "";
+
       githubLabel_ = "";
-      codeownerGithubTeams_ = com.google.protobuf.LazyStringArrayList.emptyList();
+
+      codeownerGithubTeams_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
       docTagPrefix_ = "";
+
       organization_ = 0;
+
       if (librarySettingsBuilder_ == null) {
         librarySettings_ = java.util.Collections.emptyList();
       } else {
         librarySettings_ = null;
         librarySettingsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000100);
+      bitField0_ = (bitField0_ & ~0x00000004);
       protoReferenceDocumentationUri_ = "";
+
       restReferenceDocumentationUri_ = "";
+
       return this;
     }
 
@@ -1093,15 +1085,7 @@ public com.google.api.Publishing build() {
     @java.lang.Override
     public com.google.api.Publishing buildPartial() {
       com.google.api.Publishing result = new com.google.api.Publishing(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.Publishing result) {
+      int from_bitField0_ = bitField0_;
       if (methodSettingsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           methodSettings_ = java.util.Collections.unmodifiableList(methodSettings_);
@@ -1111,47 +1095,30 @@ private void buildPartialRepeatedFields(com.google.api.Publishing result) {
       } else {
         result.methodSettings_ = methodSettingsBuilder_.build();
       }
+      result.newIssueUri_ = newIssueUri_;
+      result.documentationUri_ = documentationUri_;
+      result.apiShortName_ = apiShortName_;
+      result.githubLabel_ = githubLabel_;
+      if (((bitField0_ & 0x00000002) != 0)) {
+        codeownerGithubTeams_ = codeownerGithubTeams_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
+      }
+      result.codeownerGithubTeams_ = codeownerGithubTeams_;
+      result.docTagPrefix_ = docTagPrefix_;
+      result.organization_ = organization_;
       if (librarySettingsBuilder_ == null) {
-        if (((bitField0_ & 0x00000100) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           librarySettings_ = java.util.Collections.unmodifiableList(librarySettings_);
-          bitField0_ = (bitField0_ & ~0x00000100);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.librarySettings_ = librarySettings_;
       } else {
         result.librarySettings_ = librarySettingsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.Publishing result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.newIssueUri_ = newIssueUri_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.documentationUri_ = documentationUri_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.apiShortName_ = apiShortName_;
-      }
-      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_;
-      }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.organization_ = organization_;
-      }
-      if (((from_bitField0_ & 0x00000200) != 0)) {
-        result.protoReferenceDocumentationUri_ = protoReferenceDocumentationUri_;
-      }
-      if (((from_bitField0_ & 0x00000400) != 0)) {
-        result.restReferenceDocumentationUri_ = restReferenceDocumentationUri_;
-      }
+      result.protoReferenceDocumentationUri_ = protoReferenceDocumentationUri_;
+      result.restReferenceDocumentationUri_ = restReferenceDocumentationUri_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1228,28 +1195,24 @@ public Builder mergeFrom(com.google.api.Publishing other) {
       }
       if (!other.getNewIssueUri().isEmpty()) {
         newIssueUri_ = other.newIssueUri_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getDocumentationUri().isEmpty()) {
         documentationUri_ = other.documentationUri_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getApiShortName().isEmpty()) {
         apiShortName_ = other.apiShortName_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (!other.getGithubLabel().isEmpty()) {
         githubLabel_ = other.githubLabel_;
-        bitField0_ |= 0x00000010;
         onChanged();
       }
       if (!other.codeownerGithubTeams_.isEmpty()) {
         if (codeownerGithubTeams_.isEmpty()) {
           codeownerGithubTeams_ = other.codeownerGithubTeams_;
-          bitField0_ |= 0x00000020;
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureCodeownerGithubTeamsIsMutable();
           codeownerGithubTeams_.addAll(other.codeownerGithubTeams_);
@@ -1258,7 +1221,6 @@ public Builder mergeFrom(com.google.api.Publishing other) {
       }
       if (!other.getDocTagPrefix().isEmpty()) {
         docTagPrefix_ = other.docTagPrefix_;
-        bitField0_ |= 0x00000040;
         onChanged();
       }
       if (other.organization_ != 0) {
@@ -1268,7 +1230,7 @@ public Builder mergeFrom(com.google.api.Publishing other) {
         if (!other.librarySettings_.isEmpty()) {
           if (librarySettings_.isEmpty()) {
             librarySettings_ = other.librarySettings_;
-            bitField0_ = (bitField0_ & ~0x00000100);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureLibrarySettingsIsMutable();
             librarySettings_.addAll(other.librarySettings_);
@@ -1281,7 +1243,7 @@ public Builder mergeFrom(com.google.api.Publishing other) {
             librarySettingsBuilder_.dispose();
             librarySettingsBuilder_ = null;
             librarySettings_ = other.librarySettings_;
-            bitField0_ = (bitField0_ & ~0x00000100);
+            bitField0_ = (bitField0_ & ~0x00000004);
             librarySettingsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getLibrarySettingsFieldBuilder()
@@ -1293,12 +1255,10 @@ public Builder mergeFrom(com.google.api.Publishing other) {
       }
       if (!other.getProtoReferenceDocumentationUri().isEmpty()) {
         protoReferenceDocumentationUri_ = other.protoReferenceDocumentationUri_;
-        bitField0_ |= 0x00000200;
         onChanged();
       }
       if (!other.getRestReferenceDocumentationUri().isEmpty()) {
         restReferenceDocumentationUri_ = other.restReferenceDocumentationUri_;
-        bitField0_ |= 0x00000400;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -1342,25 +1302,25 @@ public Builder mergeFrom(
             case 810:
               {
                 newIssueUri_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 810
             case 818:
               {
                 documentationUri_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 818
             case 826:
               {
                 apiShortName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 826
             case 834:
               {
                 githubLabel_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 834
             case 842:
@@ -1373,13 +1333,13 @@ public Builder mergeFrom(
             case 850:
               {
                 docTagPrefix_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 850
             case 856:
               {
                 organization_ = input.readEnum();
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 856
             case 874:
@@ -1398,13 +1358,13 @@ public Builder mergeFrom(
             case 882:
               {
                 protoReferenceDocumentationUri_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000200;
+
                 break;
               } // case 882
             case 890:
               {
                 restReferenceDocumentationUri_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000400;
+
                 break;
               } // case 890
             default:
@@ -1879,8 +1839,8 @@ public Builder setNewIssueUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       newIssueUri_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1898,8 +1858,8 @@ public Builder setNewIssueUri(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNewIssueUri() {
+
       newIssueUri_ = getDefaultInstance().getNewIssueUri();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1922,8 +1882,8 @@ public Builder setNewIssueUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       newIssueUri_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1995,8 +1955,8 @@ public Builder setDocumentationUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       documentationUri_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2014,8 +1974,8 @@ public Builder setDocumentationUri(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDocumentationUri() {
+
       documentationUri_ = getDefaultInstance().getDocumentationUri();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -2038,8 +1998,8 @@ public Builder setDocumentationUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       documentationUri_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2114,8 +2074,8 @@ public Builder setApiShortName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       apiShortName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2134,8 +2094,8 @@ public Builder setApiShortName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearApiShortName() {
+
       apiShortName_ = getDefaultInstance().getApiShortName();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -2159,8 +2119,8 @@ public Builder setApiShortNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       apiShortName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2229,8 +2189,8 @@ public Builder setGithubLabel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       githubLabel_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2247,8 +2207,8 @@ public Builder setGithubLabel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearGithubLabel() {
+
       githubLabel_ = getDefaultInstance().getGithubLabel();
-      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -2270,20 +2230,20 @@ public Builder setGithubLabelBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       githubLabel_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       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_ & 0x00000002) != 0)) {
         codeownerGithubTeams_ = new com.google.protobuf.LazyStringArrayList(codeownerGithubTeams_);
+        bitField0_ |= 0x00000002;
       }
-      bitField0_ |= 0x00000020;
     }
 
     /**
@@ -2299,8 +2259,7 @@ private void ensureCodeownerGithubTeamsIsMutable() {
      * @return A list containing the codeownerGithubTeams.
      */
     public com.google.protobuf.ProtocolStringList getCodeownerGithubTeamsList() {
-      codeownerGithubTeams_.makeImmutable();
-      return codeownerGithubTeams_;
+      return codeownerGithubTeams_.getUnmodifiableView();
     }
 
     /**
@@ -2373,7 +2332,6 @@ public Builder setCodeownerGithubTeams(int index, java.lang.String value) {
       }
       ensureCodeownerGithubTeamsIsMutable();
       codeownerGithubTeams_.set(index, value);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2397,7 +2355,6 @@ public Builder addCodeownerGithubTeams(java.lang.String value) {
       }
       ensureCodeownerGithubTeamsIsMutable();
       codeownerGithubTeams_.add(value);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2418,7 +2375,6 @@ public Builder addCodeownerGithubTeams(java.lang.String value) {
     public Builder addAllCodeownerGithubTeams(java.lang.Iterable values) {
       ensureCodeownerGithubTeamsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, codeownerGithubTeams_);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2436,9 +2392,8 @@ public Builder addAllCodeownerGithubTeams(java.lang.Iterable v
      * @return This builder for chaining.
      */
     public Builder clearCodeownerGithubTeams() {
-      codeownerGithubTeams_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000020);
-      ;
+      codeownerGithubTeams_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -2463,7 +2418,6 @@ public Builder addCodeownerGithubTeamsBytes(com.google.protobuf.ByteString value
       checkByteStringIsUtf8(value);
       ensureCodeownerGithubTeamsIsMutable();
       codeownerGithubTeams_.add(value);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2535,8 +2489,8 @@ public Builder setDocTagPrefix(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       docTagPrefix_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2554,8 +2508,8 @@ public Builder setDocTagPrefix(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDocTagPrefix() {
+
       docTagPrefix_ = getDefaultInstance().getDocTagPrefix();
-      bitField0_ = (bitField0_ & ~0x00000040);
       onChanged();
       return this;
     }
@@ -2578,8 +2532,8 @@ public Builder setDocTagPrefixBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       docTagPrefix_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2615,8 +2569,8 @@ public int getOrganizationValue() {
      * @return This builder for chaining.
      */
     public Builder setOrganizationValue(int value) {
+
       organization_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2634,8 +2588,9 @@ public Builder setOrganizationValue(int value) {
      */
     @java.lang.Override
     public com.google.api.ClientLibraryOrganization getOrganization() {
+      @SuppressWarnings("deprecation")
       com.google.api.ClientLibraryOrganization result =
-          com.google.api.ClientLibraryOrganization.forNumber(organization_);
+          com.google.api.ClientLibraryOrganization.valueOf(organization_);
       return result == null ? com.google.api.ClientLibraryOrganization.UNRECOGNIZED : result;
     }
 
@@ -2655,7 +2610,7 @@ public Builder setOrganization(com.google.api.ClientLibraryOrganization value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000080;
+
       organization_ = value.getNumber();
       onChanged();
       return this;
@@ -2673,7 +2628,7 @@ public Builder setOrganization(com.google.api.ClientLibraryOrganization value) {
      * @return This builder for chaining.
      */
     public Builder clearOrganization() {
-      bitField0_ = (bitField0_ & ~0x00000080);
+
       organization_ = 0;
       onChanged();
       return this;
@@ -2683,10 +2638,10 @@ public Builder clearOrganization() {
         java.util.Collections.emptyList();
 
     private void ensureLibrarySettingsIsMutable() {
-      if (!((bitField0_ & 0x00000100) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         librarySettings_ =
             new java.util.ArrayList(librarySettings_);
-        bitField0_ |= 0x00000100;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -2934,7 +2889,7 @@ public Builder addAllLibrarySettings(
     public Builder clearLibrarySettings() {
       if (librarySettingsBuilder_ == null) {
         librarySettings_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000100);
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
       } else {
         librarySettingsBuilder_.clear();
@@ -3078,7 +3033,7 @@ public com.google.api.ClientLibrarySettings.Builder addLibrarySettingsBuilder(in
                 com.google.api.ClientLibrarySettings.Builder,
                 com.google.api.ClientLibrarySettingsOrBuilder>(
                 librarySettings_,
-                ((bitField0_ & 0x00000100) != 0),
+                ((bitField0_ & 0x00000004) != 0),
                 getParentForChildren(),
                 isClean());
         librarySettings_ = null;
@@ -3153,8 +3108,8 @@ public Builder setProtoReferenceDocumentationUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       protoReferenceDocumentationUri_ = value;
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -3172,8 +3127,8 @@ public Builder setProtoReferenceDocumentationUri(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProtoReferenceDocumentationUri() {
+
       protoReferenceDocumentationUri_ = getDefaultInstance().getProtoReferenceDocumentationUri();
-      bitField0_ = (bitField0_ & ~0x00000200);
       onChanged();
       return this;
     }
@@ -3196,8 +3151,8 @@ public Builder setProtoReferenceDocumentationUriBytes(com.google.protobuf.ByteSt
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       protoReferenceDocumentationUri_ = value;
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -3269,8 +3224,8 @@ public Builder setRestReferenceDocumentationUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       restReferenceDocumentationUri_ = value;
-      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -3288,8 +3243,8 @@ public Builder setRestReferenceDocumentationUri(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearRestReferenceDocumentationUri() {
+
       restReferenceDocumentationUri_ = getDefaultInstance().getRestReferenceDocumentationUri();
-      bitField0_ = (bitField0_ & ~0x00000400);
       onChanged();
       return this;
     }
@@ -3312,8 +3267,8 @@ public Builder setRestReferenceDocumentationUriBytes(com.google.protobuf.ByteStr
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       restReferenceDocumentationUri_ = value;
-      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PublishingOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PublishingOrBuilder.java
index ce1926b552..1e18e11032 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PublishingOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PublishingOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface PublishingOrBuilder
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 f6866a9684..632d75f281 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -47,6 +46,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;
   }
@@ -143,6 +147,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new ExperimentalFeatures();
     }
 
+    @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_ExperimentalFeatures_descriptor;
@@ -159,7 +168,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int REST_ASYNC_IO_ENABLED_FIELD_NUMBER = 1;
-    private boolean restAsyncIoEnabled_ = false;
+    private boolean restAsyncIoEnabled_;
 
     /**
      *
@@ -181,7 +190,7 @@ public boolean getRestAsyncIoEnabled() {
     }
 
     public static final int PROTOBUF_PYTHONIC_TYPES_ENABLED_FIELD_NUMBER = 2;
-    private boolean protobufPythonicTypesEnabled_ = false;
+    private boolean protobufPythonicTypesEnabled_;
 
     /**
      *
@@ -203,7 +212,7 @@ public boolean getProtobufPythonicTypesEnabled() {
     }
 
     public static final int UNVERSIONED_PACKAGE_DISABLED_FIELD_NUMBER = 3;
-    private boolean unversionedPackageDisabled_ = false;
+    private boolean unversionedPackageDisabled_;
 
     /**
      *
@@ -449,10 +458,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         restAsyncIoEnabled_ = false;
+
         protobufPythonicTypesEnabled_ = false;
+
         unversionedPackageDisabled_ = false;
+
         return this;
       }
 
@@ -480,26 +491,13 @@ public com.google.api.PythonSettings.ExperimentalFeatures build() {
       public com.google.api.PythonSettings.ExperimentalFeatures buildPartial() {
         com.google.api.PythonSettings.ExperimentalFeatures result =
             new com.google.api.PythonSettings.ExperimentalFeatures(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        result.restAsyncIoEnabled_ = restAsyncIoEnabled_;
+        result.protobufPythonicTypesEnabled_ = protobufPythonicTypesEnabled_;
+        result.unversionedPackageDisabled_ = unversionedPackageDisabled_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.api.PythonSettings.ExperimentalFeatures result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.restAsyncIoEnabled_ = restAsyncIoEnabled_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.protobufPythonicTypesEnabled_ = protobufPythonicTypesEnabled_;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.unversionedPackageDisabled_ = unversionedPackageDisabled_;
-        }
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -586,19 +584,19 @@ public Builder mergeFrom(
               case 8:
                 {
                   restAsyncIoEnabled_ = input.readBool();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 8
               case 16:
                 {
                   protobufPythonicTypesEnabled_ = input.readBool();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 16
               case 24:
                 {
                   unversionedPackageDisabled_ = input.readBool();
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 24
               default:
@@ -618,8 +616,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private boolean restAsyncIoEnabled_;
 
       /**
@@ -659,7 +655,6 @@ public boolean getRestAsyncIoEnabled() {
       public Builder setRestAsyncIoEnabled(boolean value) {
 
         restAsyncIoEnabled_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -679,7 +674,7 @@ public Builder setRestAsyncIoEnabled(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearRestAsyncIoEnabled() {
-        bitField0_ = (bitField0_ & ~0x00000001);
+
         restAsyncIoEnabled_ = false;
         onChanged();
         return this;
@@ -724,7 +719,6 @@ public boolean getProtobufPythonicTypesEnabled() {
       public Builder setProtobufPythonicTypesEnabled(boolean value) {
 
         protobufPythonicTypesEnabled_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -744,7 +738,7 @@ public Builder setProtobufPythonicTypesEnabled(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearProtobufPythonicTypesEnabled() {
-        bitField0_ = (bitField0_ & ~0x00000002);
+
         protobufPythonicTypesEnabled_ = false;
         onChanged();
         return this;
@@ -789,7 +783,6 @@ public boolean getUnversionedPackageDisabled() {
       public Builder setUnversionedPackageDisabled(boolean value) {
 
         unversionedPackageDisabled_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -809,7 +802,7 @@ public Builder setUnversionedPackageDisabled(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearUnversionedPackageDisabled() {
-        bitField0_ = (bitField0_ & ~0x00000004);
+
         unversionedPackageDisabled_ = false;
         onChanged();
         return this;
@@ -879,7 +872,6 @@ public com.google.api.PythonSettings.ExperimentalFeatures getDefaultInstanceForT
     }
   }
 
-  private int bitField0_;
   public static final int COMMON_FIELD_NUMBER = 1;
   private com.google.api.CommonLanguageSettings common_;
 
@@ -896,7 +888,7 @@ public com.google.api.PythonSettings.ExperimentalFeatures getDefaultInstanceForT
    */
   @java.lang.Override
   public boolean hasCommon() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return common_ != null;
   }
 
   /**
@@ -926,7 +918,7 @@ public com.google.api.CommonLanguageSettings getCommon() {
    */
   @java.lang.Override
   public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
-    return common_ == null ? com.google.api.CommonLanguageSettings.getDefaultInstance() : common_;
+    return getCommon();
   }
 
   public static final int EXPERIMENTAL_FEATURES_FIELD_NUMBER = 2;
@@ -945,7 +937,7 @@ public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
    */
   @java.lang.Override
   public boolean hasExperimentalFeatures() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return experimentalFeatures_ != null;
   }
 
   /**
@@ -978,9 +970,7 @@ public com.google.api.PythonSettings.ExperimentalFeatures getExperimentalFeature
   @java.lang.Override
   public com.google.api.PythonSettings.ExperimentalFeaturesOrBuilder
       getExperimentalFeaturesOrBuilder() {
-    return experimentalFeatures_ == null
-        ? com.google.api.PythonSettings.ExperimentalFeatures.getDefaultInstance()
-        : experimentalFeatures_;
+    return getExperimentalFeatures();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -997,10 +987,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (common_ != null) {
       output.writeMessage(1, getCommon());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (experimentalFeatures_ != null) {
       output.writeMessage(2, getExperimentalFeatures());
     }
     getUnknownFields().writeTo(output);
@@ -1012,10 +1002,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (common_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCommon());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (experimentalFeatures_ != null) {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(2, getExperimentalFeatures());
     }
@@ -1187,34 +1177,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.PythonSettings.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCommonFieldBuilder();
-        getExperimentalFeaturesFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      common_ = null;
-      if (commonBuilder_ != null) {
-        commonBuilder_.dispose();
+      if (commonBuilder_ == null) {
+        common_ = null;
+      } else {
+        common_ = null;
         commonBuilder_ = null;
       }
-      experimentalFeatures_ = null;
-      if (experimentalFeaturesBuilder_ != null) {
-        experimentalFeaturesBuilder_.dispose();
+      if (experimentalFeaturesBuilder_ == null) {
+        experimentalFeatures_ = null;
+      } else {
+        experimentalFeatures_ = null;
         experimentalFeaturesBuilder_ = null;
       }
       return this;
@@ -1242,30 +1223,20 @@ public com.google.api.PythonSettings build() {
     @java.lang.Override
     public com.google.api.PythonSettings buildPartial() {
       com.google.api.PythonSettings result = new com.google.api.PythonSettings(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (commonBuilder_ == null) {
+        result.common_ = common_;
+      } else {
+        result.common_ = commonBuilder_.build();
+      }
+      if (experimentalFeaturesBuilder_ == null) {
+        result.experimentalFeatures_ = experimentalFeatures_;
+      } else {
+        result.experimentalFeatures_ = experimentalFeaturesBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.PythonSettings result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.experimentalFeatures_ =
-            experimentalFeaturesBuilder_ == null
-                ? experimentalFeatures_
-                : experimentalFeaturesBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1346,14 +1317,14 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(
                     getExperimentalFeaturesFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1373,8 +1344,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.api.CommonLanguageSettings common_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.api.CommonLanguageSettings,
@@ -1394,7 +1363,7 @@ public Builder mergeFrom(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return commonBuilder_ != null || common_ != null;
     }
 
     /**
@@ -1433,11 +1402,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
           throw new NullPointerException();
         }
         common_ = value;
+        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -1453,11 +1422,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
     public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderForValue) {
       if (commonBuilder_ == null) {
         common_ = builderForValue.build();
+        onChanged();
       } else {
         commonBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -1472,20 +1441,19 @@ public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderFo
      */
     public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
       if (commonBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && common_ != null
-            && common_ != com.google.api.CommonLanguageSettings.getDefaultInstance()) {
-          getCommonBuilder().mergeFrom(value);
+        if (common_ != null) {
+          common_ =
+              com.google.api.CommonLanguageSettings.newBuilder(common_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           common_ = value;
         }
+        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-      if (common_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1499,13 +1467,14 @@ public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
      * .google.api.CommonLanguageSettings common = 1;
      */
     public Builder clearCommon() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      common_ = null;
-      if (commonBuilder_ != null) {
-        commonBuilder_.dispose();
+      if (commonBuilder_ == null) {
+        common_ = null;
+        onChanged();
+      } else {
+        common_ = null;
         commonBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1519,7 +1488,7 @@ public Builder clearCommon() {
      * .google.api.CommonLanguageSettings common = 1;
      */
     public com.google.api.CommonLanguageSettings.Builder getCommonBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getCommonFieldBuilder().getBuilder();
     }
@@ -1588,7 +1557,7 @@ public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
      * @return Whether the experimentalFeatures field is set.
      */
     public boolean hasExperimentalFeatures() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return experimentalFeaturesBuilder_ != null || experimentalFeatures_ != null;
     }
 
     /**
@@ -1628,11 +1597,11 @@ public Builder setExperimentalFeatures(
           throw new NullPointerException();
         }
         experimentalFeatures_ = value;
+        onChanged();
       } else {
         experimentalFeaturesBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -1649,11 +1618,11 @@ public Builder setExperimentalFeatures(
         com.google.api.PythonSettings.ExperimentalFeatures.Builder builderForValue) {
       if (experimentalFeaturesBuilder_ == null) {
         experimentalFeatures_ = builderForValue.build();
+        onChanged();
       } else {
         experimentalFeaturesBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -1669,21 +1638,19 @@ public Builder setExperimentalFeatures(
     public Builder mergeExperimentalFeatures(
         com.google.api.PythonSettings.ExperimentalFeatures value) {
       if (experimentalFeaturesBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && experimentalFeatures_ != null
-            && experimentalFeatures_
-                != com.google.api.PythonSettings.ExperimentalFeatures.getDefaultInstance()) {
-          getExperimentalFeaturesBuilder().mergeFrom(value);
+        if (experimentalFeatures_ != null) {
+          experimentalFeatures_ =
+              com.google.api.PythonSettings.ExperimentalFeatures.newBuilder(experimentalFeatures_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           experimentalFeatures_ = value;
         }
+        onChanged();
       } else {
         experimentalFeaturesBuilder_.mergeFrom(value);
       }
-      if (experimentalFeatures_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1697,13 +1664,14 @@ public Builder mergeExperimentalFeatures(
      * .google.api.PythonSettings.ExperimentalFeatures experimental_features = 2;
      */
     public Builder clearExperimentalFeatures() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      experimentalFeatures_ = null;
-      if (experimentalFeaturesBuilder_ != null) {
-        experimentalFeaturesBuilder_.dispose();
+      if (experimentalFeaturesBuilder_ == null) {
+        experimentalFeatures_ = null;
+        onChanged();
+      } else {
+        experimentalFeatures_ = null;
         experimentalFeaturesBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1718,7 +1686,7 @@ public Builder clearExperimentalFeatures() {
      */
     public com.google.api.PythonSettings.ExperimentalFeatures.Builder
         getExperimentalFeaturesBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getExperimentalFeaturesFieldBuilder().getBuilder();
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PythonSettingsOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PythonSettingsOrBuilder.java
index e6e4ec46cd..e76ce30434 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PythonSettingsOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PythonSettingsOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface PythonSettingsOrBuilder
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 9669edd108..f118ed6949 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/quota.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -25,26 +24,20 @@
  * 
  * 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
@@ -59,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
@@ -98,6 +88,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;
   }
@@ -111,8 +106,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int LIMITS_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
   private java.util.List limits_;
 
   /**
@@ -186,8 +179,6 @@ public com.google.api.QuotaLimitOrBuilder getLimitsOrBuilder(int index) {
   }
 
   public static final int METRIC_RULES_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
   private java.util.List metricRules_;
 
   /**
@@ -443,26 +434,20 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * 
    * 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
@@ -477,15 +462,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
@@ -520,7 +502,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (limitsBuilder_ == null) {
         limits_ = java.util.Collections.emptyList();
       } else {
@@ -560,15 +541,7 @@ public com.google.api.Quota build() {
     @java.lang.Override
     public com.google.api.Quota buildPartial() {
       com.google.api.Quota result = new com.google.api.Quota(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.Quota result) {
+      int from_bitField0_ = bitField0_;
       if (limitsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           limits_ = java.util.Collections.unmodifiableList(limits_);
@@ -587,10 +560,8 @@ private void buildPartialRepeatedFields(com.google.api.Quota result) {
       } else {
         result.metricRules_ = metricRulesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.Quota result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
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 48c95fd0d0..ef48ef5dc6 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/quota.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -56,14 +55,18 @@ 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;
   }
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 10:
         return internalGetValues();
@@ -81,19 +84,15 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
   }
 
   public static final int NAME_FIELD_NUMBER = 6;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
    *
    * 
    * 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.
    * 

    *
@@ -119,10 +118,8 @@ public java.lang.String getName() {
    *
    * 
    * 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.
    * 

    *
@@ -144,9 +141,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object description_ = "";
+  private volatile java.lang.Object description_;
 
   /**
    *
@@ -201,7 +196,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int DEFAULT_LIMIT_FIELD_NUMBER = 3;
-  private long defaultLimit_ = 0L;
+  private long defaultLimit_;
 
   /**
    *
@@ -210,12 +205,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.
    * 

    *
@@ -229,7 +222,7 @@ public long getDefaultLimit() {
   }
 
   public static final int MAX_LIMIT_FIELD_NUMBER = 4;
-  private long maxLimit_ = 0L;
+  private long maxLimit_;
 
   /**
    *
@@ -239,10 +232,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.
    * 

    *
@@ -256,7 +247,7 @@ public long getMaxLimit() {
   }
 
   public static final int FREE_TIER_FIELD_NUMBER = 7;
-  private long freeTier_ = 0L;
+  private long freeTier_;
 
   /**
    *
@@ -268,7 +259,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.
    * 

    *
@@ -282,16 +272,13 @@ public long getFreeTier() {
   }
 
   public static final int DURATION_FIELD_NUMBER = 5;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object duration_ = "";
+  private volatile java.lang.Object duration_;
 
   /**
    *
    *
    * 
    * Duration of this limit in textual notation. Must be "100s" or "1d".
-   *
    * Used by group-based quotas only.
    * 

    *
@@ -317,7 +304,6 @@ public java.lang.String getDuration() {
    *
    * 
    * Duration of this limit in textual notation. Must be "100s" or "1d".
-   *
    * Used by group-based quotas only.
    * 

    *
@@ -339,9 +325,7 @@ public com.google.protobuf.ByteString getDurationBytes() {
   }
 
   public static final int METRIC_FIELD_NUMBER = 8;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object metric_ = "";
+  private volatile java.lang.Object metric_;
 
   /**
    *
@@ -396,9 +380,7 @@ public com.google.protobuf.ByteString getMetricBytes() {
   }
 
   public static final int UNIT_FIELD_NUMBER = 9;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object unit_ = "";
+  private volatile java.lang.Object unit_;
 
   /**
    *
@@ -407,10 +389,8 @@ public com.google.protobuf.ByteString getMetricBytes() {
    * Specify the unit of the quota limit. It uses the same syntax as
    * [MetricDescriptor.unit][google.api.MetricDescriptor.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.
    * 

@@ -439,10 +419,8 @@ public java.lang.String getUnit() {
    * Specify the unit of the quota limit. It uses the same syntax as
    * [MetricDescriptor.unit][google.api.MetricDescriptor.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.
    * 

@@ -476,7 +454,6 @@ private static final class ValuesDefaultEntryHolder {
             0L);
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField values_;
 
   private com.google.protobuf.MapField internalGetValues() {
@@ -576,9 +553,7 @@ public long getValuesOrThrow(java.lang.String key) {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 12;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object displayName_ = "";
+  private volatile java.lang.Object displayName_;
 
   /**
    *
@@ -901,8 +876,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 10:
           return internalGetValues();
@@ -912,8 +886,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 10:
           return internalGetMutableValues();
@@ -940,17 +913,25 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       description_ = "";
+
       defaultLimit_ = 0L;
+
       maxLimit_ = 0L;
+
       freeTier_ = 0L;
+
       duration_ = "";
+
       metric_ = "";
+
       unit_ = "";
+
       internalGetMutableValues().clear();
       displayName_ = "";
+
       return this;
     }
 
@@ -976,48 +957,22 @@ public com.google.api.QuotaLimit build() {
     @java.lang.Override
     public com.google.api.QuotaLimit buildPartial() {
       com.google.api.QuotaLimit result = new com.google.api.QuotaLimit(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      int from_bitField0_ = bitField0_;
+      result.name_ = name_;
+      result.description_ = description_;
+      result.defaultLimit_ = defaultLimit_;
+      result.maxLimit_ = maxLimit_;
+      result.freeTier_ = freeTier_;
+      result.duration_ = duration_;
+      result.metric_ = metric_;
+      result.unit_ = unit_;
+      result.values_ = internalGetValues();
+      result.values_.makeImmutable();
+      result.displayName_ = displayName_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.QuotaLimit result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.description_ = description_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.defaultLimit_ = defaultLimit_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.maxLimit_ = maxLimit_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.freeTier_ = freeTier_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.duration_ = duration_;
-      }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.metric_ = metric_;
-      }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.unit_ = unit_;
-      }
-      if (((from_bitField0_ & 0x00000100) != 0)) {
-        result.values_ = internalGetValues();
-        result.values_.makeImmutable();
-      }
-      if (((from_bitField0_ & 0x00000200) != 0)) {
-        result.displayName_ = displayName_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1065,12 +1020,10 @@ public Builder mergeFrom(com.google.api.QuotaLimit other) {
       if (other == com.google.api.QuotaLimit.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getDefaultLimit() != 0L) {
@@ -1084,24 +1037,19 @@ public Builder mergeFrom(com.google.api.QuotaLimit other) {
       }
       if (!other.getDuration().isEmpty()) {
         duration_ = other.duration_;
-        bitField0_ |= 0x00000020;
         onChanged();
       }
       if (!other.getMetric().isEmpty()) {
         metric_ = other.metric_;
-        bitField0_ |= 0x00000040;
         onChanged();
       }
       if (!other.getUnit().isEmpty()) {
         unit_ = other.unit_;
-        bitField0_ |= 0x00000080;
         onChanged();
       }
       internalGetMutableValues().mergeFrom(other.internalGetValues());
-      bitField0_ |= 0x00000100;
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
-        bitField0_ |= 0x00000200;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -1133,49 +1081,49 @@ public Builder mergeFrom(
             case 18:
               {
                 description_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 24:
               {
                 defaultLimit_ = input.readInt64();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 32:
               {
                 maxLimit_ = input.readInt64();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             case 42:
               {
                 duration_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 42
             case 50:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 50
             case 56:
               {
                 freeTier_ = input.readInt64();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 56
             case 66:
               {
                 metric_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 66
             case 74:
               {
                 unit_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 74
             case 82:
@@ -1187,13 +1135,12 @@ public Builder mergeFrom(
                 internalGetMutableValues()
                     .getMutableMap()
                     .put(values__.getKey(), values__.getValue());
-                bitField0_ |= 0x00000100;
                 break;
               } // case 82
             case 98:
               {
                 displayName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000200;
+
                 break;
               } // case 98
             default:
@@ -1222,10 +1169,8 @@ public Builder mergeFrom(
      *
      * 
      * 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.
      * 

      *
@@ -1250,10 +1195,8 @@ public java.lang.String getName() {
      *
      * 
      * 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.
      * 

      *
@@ -1278,10 +1221,8 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * 
      * 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.
      * 

      *
@@ -1294,8 +1235,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1305,10 +1246,8 @@ public Builder setName(java.lang.String value) {
      *
      * 
      * 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.
      * 

      *
@@ -1317,8 +1256,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1328,10 +1267,8 @@ public Builder clearName() {
      *
      * 
      * 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.
      * 

      *
@@ -1345,8 +1282,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1421,8 +1358,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       description_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1441,8 +1378,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
+
       description_ = getDefaultInstance().getDescription();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1466,8 +1403,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       description_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1481,12 +1418,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.
      * 

      *
@@ -1506,12 +1441,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.
      * 

      *
@@ -1523,7 +1456,6 @@ public long getDefaultLimit() {
     public Builder setDefaultLimit(long value) {
 
       defaultLimit_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1535,12 +1467,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.
      * 

      *
@@ -1549,7 +1479,7 @@ public Builder setDefaultLimit(long value) {
      * @return This builder for chaining.
      */
     public Builder clearDefaultLimit() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       defaultLimit_ = 0L;
       onChanged();
       return this;
@@ -1565,10 +1495,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.
      * 

      *
@@ -1589,10 +1517,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.
      * 

      *
@@ -1604,7 +1530,6 @@ public long getMaxLimit() {
     public Builder setMaxLimit(long value) {
 
       maxLimit_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1617,10 +1542,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.
      * 

      *
@@ -1629,7 +1552,7 @@ public Builder setMaxLimit(long value) {
      * @return This builder for chaining.
      */
     public Builder clearMaxLimit() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       maxLimit_ = 0L;
       onChanged();
       return this;
@@ -1647,7 +1570,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.
      * 

      *
@@ -1670,7 +1592,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.
      * 

      *
@@ -1682,7 +1603,6 @@ public long getFreeTier() {
     public Builder setFreeTier(long value) {
 
       freeTier_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1697,7 +1617,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.
      * 

      *
@@ -1706,7 +1625,7 @@ public Builder setFreeTier(long value) {
      * @return This builder for chaining.
      */
     public Builder clearFreeTier() {
-      bitField0_ = (bitField0_ & ~0x00000010);
+
       freeTier_ = 0L;
       onChanged();
       return this;
@@ -1719,7 +1638,6 @@ public Builder clearFreeTier() {
      *
      * 
      * Duration of this limit in textual notation. Must be "100s" or "1d".
-     *
      * Used by group-based quotas only.
      * 

      *
@@ -1744,7 +1662,6 @@ public java.lang.String getDuration() {
      *
      * 
      * Duration of this limit in textual notation. Must be "100s" or "1d".
-     *
      * Used by group-based quotas only.
      * 

      *
@@ -1769,7 +1686,6 @@ public com.google.protobuf.ByteString getDurationBytes() {
      *
      * 
      * Duration of this limit in textual notation. Must be "100s" or "1d".
-     *
      * Used by group-based quotas only.
      * 

      *
@@ -1782,8 +1698,8 @@ public Builder setDuration(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       duration_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1793,7 +1709,6 @@ public Builder setDuration(java.lang.String value) {
      *
      * 
      * Duration of this limit in textual notation. Must be "100s" or "1d".
-     *
      * Used by group-based quotas only.
      * 

      *
@@ -1802,8 +1717,8 @@ public Builder setDuration(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDuration() {
+
       duration_ = getDefaultInstance().getDuration();
-      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -1813,7 +1728,6 @@ public Builder clearDuration() {
      *
      * 
      * Duration of this limit in textual notation. Must be "100s" or "1d".
-     *
      * Used by group-based quotas only.
      * 

      *
@@ -1827,8 +1741,8 @@ public Builder setDurationBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       duration_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1903,8 +1817,8 @@ public Builder setMetric(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       metric_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1923,8 +1837,8 @@ public Builder setMetric(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearMetric() {
+
       metric_ = getDefaultInstance().getMetric();
-      bitField0_ = (bitField0_ & ~0x00000040);
       onChanged();
       return this;
     }
@@ -1948,8 +1862,8 @@ public Builder setMetricBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       metric_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1963,10 +1877,8 @@ public Builder setMetricBytes(com.google.protobuf.ByteString value) {
      * Specify the unit of the quota limit. It uses the same syntax as
      * [MetricDescriptor.unit][google.api.MetricDescriptor.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.
      * 

@@ -1994,10 +1906,8 @@ public java.lang.String getUnit() {
      * Specify the unit of the quota limit. It uses the same syntax as
      * [MetricDescriptor.unit][google.api.MetricDescriptor.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.
      * 

@@ -2025,10 +1935,8 @@ public com.google.protobuf.ByteString getUnitBytes() {
      * Specify the unit of the quota limit. It uses the same syntax as
      * [MetricDescriptor.unit][google.api.MetricDescriptor.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.
      * 

@@ -2042,8 +1950,8 @@ public Builder setUnit(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       unit_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2055,10 +1963,8 @@ public Builder setUnit(java.lang.String value) {
      * Specify the unit of the quota limit. It uses the same syntax as
      * [MetricDescriptor.unit][google.api.MetricDescriptor.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.
      * 

@@ -2068,8 +1974,8 @@ public Builder setUnit(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearUnit() {
+
       unit_ = getDefaultInstance().getUnit();
-      bitField0_ = (bitField0_ & ~0x00000080);
       onChanged();
       return this;
     }
@@ -2081,10 +1987,8 @@ public Builder clearUnit() {
      * Specify the unit of the quota limit. It uses the same syntax as
      * [MetricDescriptor.unit][google.api.MetricDescriptor.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.
      * 

@@ -2099,8 +2003,8 @@ public Builder setUnitBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       unit_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2116,14 +2020,14 @@ private com.google.protobuf.MapField internalG
 
     private com.google.protobuf.MapField
         internalGetMutableValues() {
+      onChanged();
+      ;
       if (values_ == null) {
         values_ = com.google.protobuf.MapField.newMapField(ValuesDefaultEntryHolder.defaultEntry);
       }
       if (!values_.isMutable()) {
         values_ = values_.copy();
       }
-      bitField0_ |= 0x00000100;
-      onChanged();
       return values_;
     }
 
@@ -2217,7 +2121,6 @@ public long getValuesOrThrow(java.lang.String key) {
     }
 
     public Builder clearValues() {
-      bitField0_ = (bitField0_ & ~0x00000100);
       internalGetMutableValues().getMutableMap().clear();
       return this;
     }
@@ -2244,7 +2147,6 @@ public Builder removeValues(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableValues() {
-      bitField0_ |= 0x00000100;
       return internalGetMutableValues().getMutableMap();
     }
 
@@ -2265,7 +2167,6 @@ public Builder putValues(java.lang.String key, long value) {
       }
 
       internalGetMutableValues().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000100;
       return this;
     }
 
@@ -2282,7 +2183,6 @@ public Builder putValues(java.lang.String key, long value) {
      */
     public Builder putAllValues(java.util.Map values) {
       internalGetMutableValues().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000100;
       return this;
     }
 
@@ -2359,8 +2259,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       displayName_ = value;
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -2380,8 +2280,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
+
       displayName_ = getDefaultInstance().getDisplayName();
-      bitField0_ = (bitField0_ & ~0x00000200);
       onChanged();
       return this;
     }
@@ -2406,8 +2306,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       displayName_ = value;
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
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 2b1280e097..8d3197a59f 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/quota.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface QuotaLimitOrBuilder
@@ -29,10 +28,8 @@ public interface QuotaLimitOrBuilder
    *
    * 
    * 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.
    * 

    *
@@ -47,10 +44,8 @@ public interface QuotaLimitOrBuilder
    *
    * 
    * 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.
    * 

    *
@@ -97,12 +92,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.
    * 

    *
@@ -120,10 +113,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.
    * 

    *
@@ -143,7 +134,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.
    * 

    *
@@ -158,7 +148,6 @@ public interface QuotaLimitOrBuilder
    *
    * 
    * Duration of this limit in textual notation. Must be "100s" or "1d".
-   *
    * Used by group-based quotas only.
    * 

    *
@@ -173,7 +162,6 @@ public interface QuotaLimitOrBuilder
    *
    * 
    * Duration of this limit in textual notation. Must be "100s" or "1d".
-   *
    * Used by group-based quotas only.
    * 

    *
@@ -220,10 +208,8 @@ public interface QuotaLimitOrBuilder
    * Specify the unit of the quota limit. It uses the same syntax as
    * [MetricDescriptor.unit][google.api.MetricDescriptor.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.
    * 

@@ -241,10 +227,8 @@ public interface QuotaLimitOrBuilder
    * Specify the unit of the quota limit. It uses the same syntax as
    * [MetricDescriptor.unit][google.api.MetricDescriptor.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.
    * 

diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaOrBuilder.java
index e704228ad5..3a23c9e19c 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/quota.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface QuotaOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaProto.java
index ee46b34fd6..9a34a94f05 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/quota.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class QuotaProto {
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 d9c4e593a3..b611035509 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/resource.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -24,13 +23,10 @@
  *
  * 
  * 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}.
@@ -40,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"
@@ -61,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}"
@@ -87,7 +76,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_ = "";
@@ -101,6 +90,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;
   }
@@ -306,11 +300,9 @@ public enum Style implements com.google.protobuf.ProtocolMessageEnum {
      *
      * 
      * 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.
      * 

@@ -337,11 +329,9 @@ public enum Style implements com.google.protobuf.ProtocolMessageEnum {
      *
      * 
      * 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.
      * 

@@ -432,9 +422,7 @@ private Style(int value) {
   }
 
   public static final int TYPE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object type_ = "";
+  private volatile java.lang.Object type_;
 
   /**
    *
@@ -443,9 +431,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
@@ -476,9 +462,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
@@ -503,10 +487,7 @@ 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_;
 
   /**
    *
@@ -514,19 +495,14 @@ public com.google.protobuf.ByteString getTypeBytes() {
    * 
    * 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
@@ -547,19 +523,14 @@ public com.google.protobuf.ProtocolStringList getPatternList() {
    * 
    * 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
@@ -580,19 +551,14 @@ public int getPatternCount() {
    * 
    * 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
@@ -614,19 +580,14 @@ public java.lang.String getPattern(int index) {
    * 
    * 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
@@ -643,9 +604,7 @@ public com.google.protobuf.ByteString getPatternBytes(int index) {
   }
 
   public static final int NAME_FIELD_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nameField_ = "";
+  private volatile java.lang.Object nameField_;
 
   /**
    *
@@ -698,16 +657,14 @@ public com.google.protobuf.ByteString getNameFieldBytes() {
   }
 
   public static final int HISTORY_FIELD_NUMBER = 4;
-  private int history_ = 0;
+  private int history_;
 
   /**
    *
    *
    * 
    * 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 {
@@ -735,9 +692,7 @@ public int getHistoryValue() {
    *
    * 
    * 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 {
@@ -757,15 +712,14 @@ public int getHistoryValue() {
    */
   @java.lang.Override
   public com.google.api.ResourceDescriptor.History getHistory() {
+    @SuppressWarnings("deprecation")
     com.google.api.ResourceDescriptor.History result =
-        com.google.api.ResourceDescriptor.History.forNumber(history_);
+        com.google.api.ResourceDescriptor.History.valueOf(history_);
     return result == null ? com.google.api.ResourceDescriptor.History.UNRECOGNIZED : result;
   }
 
   public static final int PLURAL_FIELD_NUMBER = 5;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object plural_ = "";
+  private volatile java.lang.Object plural_;
 
   /**
    *
@@ -778,10 +732,8 @@ public com.google.api.ResourceDescriptor.History getHistory() {
    * in [AIP-122](https://google.aip.dev/122#nested-collections), where the
    * collection ID in the resource name pattern does not necessarily directly
    * match the `plural` value.
-   *
    * 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
    * 

@@ -814,10 +766,8 @@ public java.lang.String getPlural() {
    * in [AIP-122](https://google.aip.dev/122#nested-collections), where the
    * collection ID in the resource name pattern does not necessarily directly
    * match the `plural` value.
-   *
    * 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
    * 

@@ -840,9 +790,7 @@ public com.google.protobuf.ByteString getPluralBytes() {
   }
 
   public static final int SINGULAR_FIELD_NUMBER = 6;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object singular_ = "";
+  private volatile java.lang.Object singular_;
 
   /**
    *
@@ -897,18 +845,16 @@ public com.google.protobuf.ByteString getSingularBytes() {
   }
 
   public static final int STYLE_FIELD_NUMBER = 10;
-
-  @SuppressWarnings("serial")
   private java.util.List style_;
-
   private static final com.google.protobuf.Internal.ListAdapter.Converter<
           java.lang.Integer, com.google.api.ResourceDescriptor.Style>
       style_converter_ =
           new com.google.protobuf.Internal.ListAdapter.Converter<
               java.lang.Integer, com.google.api.ResourceDescriptor.Style>() {
             public com.google.api.ResourceDescriptor.Style convert(java.lang.Integer from) {
+              @SuppressWarnings("deprecation")
               com.google.api.ResourceDescriptor.Style result =
-                  com.google.api.ResourceDescriptor.Style.forNumber(from);
+                  com.google.api.ResourceDescriptor.Style.valueOf(from);
               return result == null ? com.google.api.ResourceDescriptor.Style.UNRECOGNIZED : result;
             }
           };
@@ -1248,13 +1194,10 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * 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}.
@@ -1264,18 +1207,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"
@@ -1285,9 +1223,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}"
@@ -1326,15 +1262,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       type_ = "";
-      pattern_ = com.google.protobuf.LazyStringArrayList.emptyList();
+
+      pattern_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       nameField_ = "";
+
       history_ = 0;
+
       plural_ = "";
+
       singular_ = "";
+
       style_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000040);
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -1360,43 +1301,24 @@ public com.google.api.ResourceDescriptor build() {
     @java.lang.Override
     public com.google.api.ResourceDescriptor buildPartial() {
       com.google.api.ResourceDescriptor result = new com.google.api.ResourceDescriptor(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      result.type_ = type_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        pattern_ = pattern_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.ResourceDescriptor result) {
-      if (((bitField0_ & 0x00000040) != 0)) {
+      result.pattern_ = pattern_;
+      result.nameField_ = nameField_;
+      result.history_ = history_;
+      result.plural_ = plural_;
+      result.singular_ = singular_;
+      if (((bitField0_ & 0x00000002) != 0)) {
         style_ = java.util.Collections.unmodifiableList(style_);
-        bitField0_ = (bitField0_ & ~0x00000040);
+        bitField0_ = (bitField0_ & ~0x00000002);
       }
       result.style_ = style_;
-    }
-
-    private void buildPartial0(com.google.api.ResourceDescriptor result) {
-      int from_bitField0_ = bitField0_;
-      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_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.history_ = history_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.plural_ = plural_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.singular_ = singular_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1446,13 +1368,12 @@ public Builder mergeFrom(com.google.api.ResourceDescriptor other) {
       if (other == com.google.api.ResourceDescriptor.getDefaultInstance()) return this;
       if (!other.getType().isEmpty()) {
         type_ = other.type_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.pattern_.isEmpty()) {
         if (pattern_.isEmpty()) {
           pattern_ = other.pattern_;
-          bitField0_ |= 0x00000002;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensurePatternIsMutable();
           pattern_.addAll(other.pattern_);
@@ -1461,7 +1382,6 @@ public Builder mergeFrom(com.google.api.ResourceDescriptor other) {
       }
       if (!other.getNameField().isEmpty()) {
         nameField_ = other.nameField_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.history_ != 0) {
@@ -1469,18 +1389,16 @@ public Builder mergeFrom(com.google.api.ResourceDescriptor other) {
       }
       if (!other.getPlural().isEmpty()) {
         plural_ = other.plural_;
-        bitField0_ |= 0x00000010;
         onChanged();
       }
       if (!other.getSingular().isEmpty()) {
         singular_ = other.singular_;
-        bitField0_ |= 0x00000020;
         onChanged();
       }
       if (!other.style_.isEmpty()) {
         if (style_.isEmpty()) {
           style_ = other.style_;
-          bitField0_ = (bitField0_ & ~0x00000040);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureStyleIsMutable();
           style_.addAll(other.style_);
@@ -1516,7 +1434,7 @@ public Builder mergeFrom(
             case 10:
               {
                 type_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -1529,25 +1447,25 @@ public Builder mergeFrom(
             case 26:
               {
                 nameField_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 32:
               {
                 history_ = input.readEnum();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             case 42:
               {
                 plural_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 42
             case 50:
               {
                 singular_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 50
             case 80:
@@ -1597,9 +1515,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
@@ -1629,9 +1545,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
@@ -1661,9 +1575,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
@@ -1679,8 +1591,8 @@ public Builder setType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       type_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1692,9 +1604,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
@@ -1706,8 +1616,8 @@ public Builder setType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearType() {
+
       type_ = getDefaultInstance().getType();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1719,9 +1629,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
@@ -1738,20 +1646,20 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       type_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       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_ & 0x00000001) != 0)) {
         pattern_ = new com.google.protobuf.LazyStringArrayList(pattern_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000002;
     }
 
     /**
@@ -1760,19 +1668,14 @@ private void ensurePatternIsMutable() {
      * 
      * 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,8 +1687,7 @@ private void ensurePatternIsMutable() {
      * @return A list containing the pattern.
      */
     public com.google.protobuf.ProtocolStringList getPatternList() {
-      pattern_.makeImmutable();
-      return pattern_;
+      return pattern_.getUnmodifiableView();
     }
 
     /**
@@ -1794,19 +1696,14 @@ public com.google.protobuf.ProtocolStringList getPatternList() {
      * 
      * 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
@@ -1827,19 +1724,14 @@ public int getPatternCount() {
      * 
      * 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
@@ -1861,19 +1753,14 @@ public java.lang.String getPattern(int index) {
      * 
      * 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
@@ -1895,19 +1782,14 @@ public com.google.protobuf.ByteString getPatternBytes(int index) {
      * 
      * 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
@@ -1926,7 +1808,6 @@ public Builder setPattern(int index, java.lang.String value) {
       }
       ensurePatternIsMutable();
       pattern_.set(index, value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1937,19 +1818,14 @@ public Builder setPattern(int index, java.lang.String value) {
      * 
      * 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
@@ -1967,7 +1843,6 @@ public Builder addPattern(java.lang.String value) {
       }
       ensurePatternIsMutable();
       pattern_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1978,19 +1853,14 @@ public Builder addPattern(java.lang.String value) {
      * 
      * 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
@@ -2005,7 +1875,6 @@ public Builder addPattern(java.lang.String value) {
     public Builder addAllPattern(java.lang.Iterable values) {
       ensurePatternIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, pattern_);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2016,19 +1885,14 @@ public Builder addAllPattern(java.lang.Iterable values) {
      * 
      * 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
@@ -2040,9 +1904,8 @@ public Builder addAllPattern(java.lang.Iterable values) {
      * @return This builder for chaining.
      */
     public Builder clearPattern() {
-      pattern_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000002);
-      ;
+      pattern_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -2053,19 +1916,14 @@ public Builder clearPattern() {
      * 
      * 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
@@ -2084,7 +1942,6 @@ public Builder addPatternBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensurePatternIsMutable();
       pattern_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2156,8 +2013,8 @@ public Builder setNameField(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nameField_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2175,8 +2032,8 @@ public Builder setNameField(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNameField() {
+
       nameField_ = getDefaultInstance().getNameField();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -2199,8 +2056,8 @@ public Builder setNameFieldBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nameField_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2212,9 +2069,7 @@ public Builder setNameFieldBytes(com.google.protobuf.ByteString value) {
      *
      * 
      * 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 {
@@ -2242,9 +2097,7 @@ public int getHistoryValue() {
      *
      * 
      * 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 {
@@ -2264,8 +2117,8 @@ public int getHistoryValue() {
      * @return This builder for chaining.
      */
     public Builder setHistoryValue(int value) {
+
       history_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2275,9 +2128,7 @@ public Builder setHistoryValue(int value) {
      *
      * 
      * 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 {
@@ -2297,8 +2148,9 @@ public Builder setHistoryValue(int value) {
      */
     @java.lang.Override
     public com.google.api.ResourceDescriptor.History getHistory() {
+      @SuppressWarnings("deprecation")
       com.google.api.ResourceDescriptor.History result =
-          com.google.api.ResourceDescriptor.History.forNumber(history_);
+          com.google.api.ResourceDescriptor.History.valueOf(history_);
       return result == null ? com.google.api.ResourceDescriptor.History.UNRECOGNIZED : result;
     }
 
@@ -2307,9 +2159,7 @@ public com.google.api.ResourceDescriptor.History getHistory() {
      *
      * 
      * 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 {
@@ -2332,7 +2182,7 @@ public Builder setHistory(com.google.api.ResourceDescriptor.History value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000008;
+
       history_ = value.getNumber();
       onChanged();
       return this;
@@ -2343,9 +2193,7 @@ public Builder setHistory(com.google.api.ResourceDescriptor.History value) {
      *
      * 
      * 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 {
@@ -2364,7 +2212,7 @@ public Builder setHistory(com.google.api.ResourceDescriptor.History value) {
      * @return This builder for chaining.
      */
     public Builder clearHistory() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       history_ = 0;
       onChanged();
       return this;
@@ -2383,10 +2231,8 @@ public Builder clearHistory() {
      * in [AIP-122](https://google.aip.dev/122#nested-collections), where the
      * collection ID in the resource name pattern does not necessarily directly
      * match the `plural` value.
-     *
      * 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
      * 

@@ -2418,10 +2264,8 @@ public java.lang.String getPlural() {
      * in [AIP-122](https://google.aip.dev/122#nested-collections), where the
      * collection ID in the resource name pattern does not necessarily directly
      * match the `plural` value.
-     *
      * 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
      * 

@@ -2453,10 +2297,8 @@ public com.google.protobuf.ByteString getPluralBytes() {
      * in [AIP-122](https://google.aip.dev/122#nested-collections), where the
      * collection ID in the resource name pattern does not necessarily directly
      * match the `plural` value.
-     *
      * 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
      * 

@@ -2470,8 +2312,8 @@ public Builder setPlural(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       plural_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2487,10 +2329,8 @@ public Builder setPlural(java.lang.String value) {
      * in [AIP-122](https://google.aip.dev/122#nested-collections), where the
      * collection ID in the resource name pattern does not necessarily directly
      * match the `plural` value.
-     *
      * 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
      * 

@@ -2500,8 +2340,8 @@ public Builder setPlural(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPlural() {
+
       plural_ = getDefaultInstance().getPlural();
-      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -2517,10 +2357,8 @@ public Builder clearPlural() {
      * in [AIP-122](https://google.aip.dev/122#nested-collections), where the
      * collection ID in the resource name pattern does not necessarily directly
      * match the `plural` value.
-     *
      * 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
      * 

@@ -2535,8 +2373,8 @@ public Builder setPluralBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       plural_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2611,8 +2449,8 @@ public Builder setSingular(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       singular_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2631,8 +2469,8 @@ public Builder setSingular(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSingular() {
+
       singular_ = getDefaultInstance().getSingular();
-      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -2656,8 +2494,8 @@ public Builder setSingularBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       singular_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2665,9 +2503,9 @@ public Builder setSingularBytes(com.google.protobuf.ByteString value) {
     private java.util.List style_ = java.util.Collections.emptyList();
 
     private void ensureStyleIsMutable() {
-      if (!((bitField0_ & 0x00000040) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         style_ = new java.util.ArrayList(style_);
-        bitField0_ |= 0x00000040;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -2812,7 +2650,7 @@ public Builder addAllStyle(
      */
     public Builder clearStyle() {
       style_ = java.util.Collections.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000040);
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
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 62b8262774..add08cabda 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/resource.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface ResourceDescriptorOrBuilder
@@ -31,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
@@ -53,9 +50,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
@@ -74,19 +69,14 @@ public interface ResourceDescriptorOrBuilder
    * 
    * 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
@@ -105,19 +95,14 @@ public interface ResourceDescriptorOrBuilder
    * 
    * 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
@@ -136,19 +121,14 @@ public interface ResourceDescriptorOrBuilder
    * 
    * 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
@@ -168,19 +148,14 @@ public interface ResourceDescriptorOrBuilder
    * 
    * 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
@@ -227,9 +202,7 @@ public interface ResourceDescriptorOrBuilder
    *
    * 
    * 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 {
@@ -254,9 +227,7 @@ public interface ResourceDescriptorOrBuilder
    *
    * 
    * 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 {
@@ -287,10 +258,8 @@ public interface ResourceDescriptorOrBuilder
    * in [AIP-122](https://google.aip.dev/122#nested-collections), where the
    * collection ID in the resource name pattern does not necessarily directly
    * match the `plural` value.
-   *
    * 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
    * 

@@ -312,10 +281,8 @@ public interface ResourceDescriptorOrBuilder
    * in [AIP-122](https://google.aip.dev/122#nested-collections), where the
    * collection ID in the resource name pattern does not necessarily directly
    * match the `plural` value.
-   *
    * 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
    * 

diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceProto.java
index 1fd4395aec..35ad93a633 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ResourceProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/resource.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class ResourceProto {
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 bd847c2dc4..345d0101b2 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/resource.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -51,6 +50,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;
   }
@@ -65,29 +69,22 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int TYPE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object type_ = "";
+  private volatile java.lang.Object type_;
 
   /**
    *
    *
    * 
    * 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: "*"
@@ -117,20 +114,15 @@ public java.lang.String getType() {
    *
    * 
    * 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: "*"
@@ -156,9 +148,7 @@ public com.google.protobuf.ByteString getTypeBytes() {
   }
 
   public static final int CHILD_TYPE_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object childType_ = "";
+  private volatile java.lang.Object childType_;
 
   /**
    *
@@ -167,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"
@@ -201,9 +189,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"
@@ -433,9 +419,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       type_ = "";
+
       childType_ = "";
+
       return this;
     }
 
@@ -461,23 +448,12 @@ public com.google.api.ResourceReference build() {
     @java.lang.Override
     public com.google.api.ResourceReference buildPartial() {
       com.google.api.ResourceReference result = new com.google.api.ResourceReference(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.type_ = type_;
+      result.childType_ = childType_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.ResourceReference result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.type_ = type_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.childType_ = childType_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -525,12 +501,10 @@ public Builder mergeFrom(com.google.api.ResourceReference other) {
       if (other == com.google.api.ResourceReference.getDefaultInstance()) return this;
       if (!other.getType().isEmpty()) {
         type_ = other.type_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getChildType().isEmpty()) {
         childType_ = other.childType_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -562,13 +536,13 @@ public Builder mergeFrom(
             case 10:
               {
                 type_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 childType_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -588,8 +562,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object type_ = "";
 
     /**
@@ -597,20 +569,15 @@ public Builder mergeFrom(
      *
      * 
      * 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: "*"
@@ -639,20 +606,15 @@ public java.lang.String getType() {
      *
      * 
      * 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: "*"
@@ -681,20 +643,15 @@ public com.google.protobuf.ByteString getTypeBytes() {
      *
      * 
      * 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: "*"
@@ -711,8 +668,8 @@ public Builder setType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       type_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -722,20 +679,15 @@ public Builder setType(java.lang.String value) {
      *
      * 
      * 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: "*"
@@ -748,8 +700,8 @@ public Builder setType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearType() {
+
       type_ = getDefaultInstance().getType();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -759,20 +711,15 @@ public Builder clearType() {
      *
      * 
      * 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: "*"
@@ -790,8 +737,8 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       type_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -805,9 +752,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"
@@ -838,9 +783,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"
@@ -871,9 +814,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"
@@ -890,8 +831,8 @@ public Builder setChildType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       childType_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -903,9 +844,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"
@@ -918,8 +857,8 @@ public Builder setChildType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearChildType() {
+
       childType_ = getDefaultInstance().getChildType();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -931,9 +870,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"
@@ -951,8 +888,8 @@ public Builder setChildTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       childType_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
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 b9f4f515b7..1468605157 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/resource.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface ResourceReferenceOrBuilder
@@ -29,20 +28,15 @@ public interface ResourceReferenceOrBuilder
    *
    * 
    * 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: "*"
@@ -61,20 +55,15 @@ public interface ResourceReferenceOrBuilder
    *
    * 
    * 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: "*"
@@ -95,9 +84,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"
@@ -118,9 +105,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 401e127012..370e39de94 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/routing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -50,6 +49,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;
   }
@@ -64,9 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int FIELD_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object field_ = "";
+  private volatile java.lang.Object field_;
 
   /**
    *
@@ -117,9 +119,7 @@ public com.google.protobuf.ByteString getFieldBytes() {
   }
 
   public static final int PATH_TEMPLATE_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pathTemplate_ = "";
+  private volatile java.lang.Object pathTemplate_;
 
   /**
    *
@@ -134,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.
    *              |
@@ -153,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/*` should be added
@@ -161,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/*/instances/*/tables/*`.
-   *
    * **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.
    * 

    *
@@ -211,9 +203,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.
    *              |
@@ -230,7 +220,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/*` should be added
@@ -238,23 +227,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/*/instances/*/tables/*`.
-   *
    * **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.
    * 

    *
@@ -478,9 +462,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       field_ = "";
+
       pathTemplate_ = "";
+
       return this;
     }
 
@@ -506,23 +491,12 @@ public com.google.api.RoutingParameter build() {
     @java.lang.Override
     public com.google.api.RoutingParameter buildPartial() {
       com.google.api.RoutingParameter result = new com.google.api.RoutingParameter(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.field_ = field_;
+      result.pathTemplate_ = pathTemplate_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.RoutingParameter result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.field_ = field_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.pathTemplate_ = pathTemplate_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -570,12 +544,10 @@ public Builder mergeFrom(com.google.api.RoutingParameter other) {
       if (other == com.google.api.RoutingParameter.getDefaultInstance()) return this;
       if (!other.getField().isEmpty()) {
         field_ = other.field_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getPathTemplate().isEmpty()) {
         pathTemplate_ = other.pathTemplate_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -607,13 +579,13 @@ public Builder mergeFrom(
             case 10:
               {
                 field_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 pathTemplate_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -633,8 +605,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object field_ = "";
 
     /**
@@ -699,8 +669,8 @@ public Builder setField(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       field_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -717,8 +687,8 @@ public Builder setField(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearField() {
+
       field_ = getDefaultInstance().getField();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -740,8 +710,8 @@ public Builder setFieldBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       field_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -761,9 +731,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.
      *              |
@@ -780,7 +748,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/*` should be added
@@ -788,23 +755,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/*/instances/*/tables/*`.
-     *
      * **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.
      * 

      *
@@ -837,9 +799,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.
      *              |
@@ -856,7 +816,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/*` should be added
@@ -864,23 +823,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/*/instances/*/tables/*`.
-     *
      * **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.
      * 

      *
@@ -913,9 +867,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.
      *              |
@@ -932,7 +884,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/*` should be added
@@ -940,23 +891,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/*/instances/*/tables/*`.
-     *
      * **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.
      * 

      *
@@ -969,8 +915,8 @@ public Builder setPathTemplate(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pathTemplate_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -988,9 +934,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.
      *              |
@@ -1007,7 +951,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/*` should be added
@@ -1015,23 +958,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/*/instances/*/tables/*`.
-     *
      * **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.
      * 

      *
@@ -1040,8 +978,8 @@ public Builder setPathTemplate(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPathTemplate() {
+
       pathTemplate_ = getDefaultInstance().getPathTemplate();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1059,9 +997,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.
      *              |
@@ -1078,7 +1014,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/*` should be added
@@ -1086,23 +1021,18 @@ public Builder clearPathTemplate() {
      * - The value is extracted from the request message's `table_name` field
      *   if it matches the full pattern specified:
      *   `projects/*/instances/*/tables/*`.
-     *
      * **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.
      * 

      *
@@ -1116,8 +1046,8 @@ public Builder setPathTemplateBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pathTemplate_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
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 1ce27e7a94..69912a0ff4 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/routing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface RoutingParameterOrBuilder
@@ -63,9 +62,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.
    *              |
@@ -82,7 +79,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/*` should be added
@@ -90,23 +86,18 @@ public interface RoutingParameterOrBuilder
    * - The value is extracted from the request message's `table_name` field
    *   if it matches the full pattern specified:
    *   `projects/*/instances/*/tables/*`.
-   *
    * **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.
    * 

    *
@@ -129,9 +120,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.
    *              |
@@ -148,7 +137,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/*` should be added
@@ -156,23 +144,18 @@ public interface RoutingParameterOrBuilder
    * - The value is extracted from the request message's `table_name` field
    *   if it matches the full pattern specified:
    *   `projects/*/instances/*/tables/*`.
-   *
    * **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.
    * 

    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingProto.java
index 886af1a9b4..81e839ef07 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/routing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class RoutingProto {
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 097229fd4d..6f81ccf659 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/routing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -26,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:
@@ -38,51 +34,37 @@
  *       // - `projects/<project>/instances/<instance>/tables/<table>`
  *       // - `region/<region>/zones/<zone>/tables/<table>`
  *       string table_name = 1;
- *
  *       // This value specifies routing for replication.
  *       // It can be in the following formats:
  *       // - `profiles/<profile_id>`
  *       // - 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&key2=value2`.
  * The examples below skip the percent-encoding for readability.
- *
  * 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 {
@@ -90,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).
@@ -117,18 +90,12 @@
  *         path_template: "{table_name=projects/*/instances/*/**}"
  *       }
  *     };
- *
  * 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).
@@ -137,22 +104,15 @@
  *         path_template: "{table_name=regions/*/zones/*/**}"
  *       }
  *     };
- *
  * result:
- *
  *     <no routing header will be sent>
- *
  * 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/*/zones/*/**}"
@@ -162,19 +122,13 @@
  *         path_template: "{table_name=projects/*/instances/*/**}"
  *       }
  *     };
- *
  * 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 {
@@ -182,24 +136,17 @@
  *         path_template: "{routing_id=projects/*}/**"
  *       }
  *     };
- *
  * 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/*}/**"
@@ -209,29 +156,20 @@
  *         path_template: "{routing_id=projects/*/instances/*}/**"
  *       }
  *     };
- *
  * 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/*}/instances/*/**"
@@ -241,24 +179,17 @@
  *         path_template: "projects/*/{instance_id=instances/*}/**"
  *       }
  *     };
- *
  * result:
- *
  *     x-goog-request-params:
  *     project_id=projects/proj_foo&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/*}/**"
@@ -268,30 +199,22 @@
  *         path_template: "projects/*/{instance_id=instances/*}/**"
  *       }
  *     };
- *
  * 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&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/*}/**"
@@ -301,25 +224,18 @@
  *         path_template: "{routing_id=**}"
  *       }
  *     };
- *
  * result:
- *
  *     x-goog-request-params:
  *     project_id=projects/proj_foo&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/*}/**"
@@ -333,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.
  *       //
@@ -355,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/*/{table_location=instances/*}/tables/*"
@@ -377,9 +286,7 @@
  *         path_template: "profiles/{routing_id=*}"
  *       }
  *     };
- *
  * result:
- *
  *     x-goog-request-params:
  *     table_location=instances/instance_bar&routing_id=prof_qux
  * 

@@ -407,6 +314,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;
   }
@@ -420,8 +332,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ROUTING_PARAMETERS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List routingParameters_;
 
   /**
@@ -688,11 +598,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:
@@ -700,51 +607,37 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *       // - `projects/<project>/instances/<instance>/tables/<table>`
    *       // - `region/<region>/zones/<zone>/tables/<table>`
    *       string table_name = 1;
-   *
    *       // This value specifies routing for replication.
    *       // It can be in the following formats:
    *       // - `profiles/<profile_id>`
    *       // - 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&key2=value2`.
    * The examples below skip the percent-encoding for readability.
-   *
    * 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 {
@@ -752,25 +645,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).
@@ -779,18 +663,12 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "{table_name=projects/*/instances/*/**}"
    *       }
    *     };
-   *
    * 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).
@@ -799,22 +677,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "{table_name=regions/*/zones/*/**}"
    *       }
    *     };
-   *
    * result:
-   *
    *     <no routing header will be sent>
-   *
    * 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/*/zones/*/**}"
@@ -824,19 +695,13 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "{table_name=projects/*/instances/*/**}"
    *       }
    *     };
-   *
    * 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 {
@@ -844,24 +709,17 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "{routing_id=projects/*}/**"
    *       }
    *     };
-   *
    * 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/*}/**"
@@ -871,29 +729,20 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "{routing_id=projects/*/instances/*}/**"
    *       }
    *     };
-   *
    * 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/*}/instances/*/**"
@@ -903,24 +752,17 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "projects/*/{instance_id=instances/*}/**"
    *       }
    *     };
-   *
    * result:
-   *
    *     x-goog-request-params:
    *     project_id=projects/proj_foo&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/*}/**"
@@ -930,30 +772,22 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "projects/*/{instance_id=instances/*}/**"
    *       }
    *     };
-   *
    * 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&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/*}/**"
@@ -963,25 +797,18 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "{routing_id=**}"
    *       }
    *     };
-   *
    * result:
-   *
    *     x-goog-request-params:
    *     project_id=projects/proj_foo&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/*}/**"
@@ -995,17 +822,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.
    *       //
@@ -1017,7 +838,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/*/{table_location=instances/*}/tables/*"
@@ -1039,9 +859,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         path_template: "profiles/{routing_id=*}"
    *       }
    *     };
-   *
    * result:
-   *
    *     x-goog-request-params:
    *     table_location=instances/instance_bar&routing_id=prof_qux
    * 

@@ -1074,7 +892,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (routingParametersBuilder_ == null) {
         routingParameters_ = java.util.Collections.emptyList();
       } else {
@@ -1107,15 +924,7 @@ public com.google.api.RoutingRule build() {
     @java.lang.Override
     public com.google.api.RoutingRule buildPartial() {
       com.google.api.RoutingRule result = new com.google.api.RoutingRule(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.RoutingRule result) {
+      int from_bitField0_ = bitField0_;
       if (routingParametersBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           routingParameters_ = java.util.Collections.unmodifiableList(routingParameters_);
@@ -1125,10 +934,8 @@ private void buildPartialRepeatedFields(com.google.api.RoutingRule result) {
       } else {
         result.routingParameters_ = routingParametersBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.RoutingRule result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingRuleOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingRuleOrBuilder.java
index d3307deb28..51b6cb2f53 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingRuleOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RoutingRuleOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/routing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface RoutingRuleOrBuilder
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 61254d551c..efc1a83000 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -47,6 +46,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;
   }
@@ -59,7 +63,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.api.RubySettings.class, com.google.api.RubySettings.Builder.class);
   }
 
-  private int bitField0_;
   public static final int COMMON_FIELD_NUMBER = 1;
   private com.google.api.CommonLanguageSettings common_;
 
@@ -76,7 +79,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasCommon() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return common_ != null;
   }
 
   /**
@@ -106,7 +109,7 @@ public com.google.api.CommonLanguageSettings getCommon() {
    */
   @java.lang.Override
   public com.google.api.CommonLanguageSettingsOrBuilder getCommonOrBuilder() {
-    return common_ == null ? com.google.api.CommonLanguageSettings.getDefaultInstance() : common_;
+    return getCommon();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -123,7 +126,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (common_ != null) {
       output.writeMessage(1, getCommon());
     }
     getUnknownFields().writeTo(output);
@@ -135,7 +138,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (common_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCommon());
     }
     size += getUnknownFields().getSerializedSize();
@@ -298,28 +301,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.RubySettings.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCommonFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      common_ = null;
-      if (commonBuilder_ != null) {
-        commonBuilder_.dispose();
+      if (commonBuilder_ == null) {
+        common_ = null;
+      } else {
+        common_ = null;
         commonBuilder_ = null;
       }
       return this;
@@ -347,23 +341,15 @@ public com.google.api.RubySettings build() {
     @java.lang.Override
     public com.google.api.RubySettings buildPartial() {
       com.google.api.RubySettings result = new com.google.api.RubySettings(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (commonBuilder_ == null) {
+        result.common_ = common_;
+      } else {
+        result.common_ = commonBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.RubySettings result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.common_ = commonBuilder_ == null ? common_ : commonBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -441,7 +427,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -461,8 +447,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.api.CommonLanguageSettings common_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.api.CommonLanguageSettings,
@@ -482,7 +466,7 @@ public Builder mergeFrom(
      * @return Whether the common field is set.
      */
     public boolean hasCommon() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return commonBuilder_ != null || common_ != null;
     }
 
     /**
@@ -521,11 +505,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
           throw new NullPointerException();
         }
         common_ = value;
+        onChanged();
       } else {
         commonBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -541,11 +525,11 @@ public Builder setCommon(com.google.api.CommonLanguageSettings value) {
     public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderForValue) {
       if (commonBuilder_ == null) {
         common_ = builderForValue.build();
+        onChanged();
       } else {
         commonBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -560,20 +544,19 @@ public Builder setCommon(com.google.api.CommonLanguageSettings.Builder builderFo
      */
     public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
       if (commonBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && common_ != null
-            && common_ != com.google.api.CommonLanguageSettings.getDefaultInstance()) {
-          getCommonBuilder().mergeFrom(value);
+        if (common_ != null) {
+          common_ =
+              com.google.api.CommonLanguageSettings.newBuilder(common_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           common_ = value;
         }
+        onChanged();
       } else {
         commonBuilder_.mergeFrom(value);
       }
-      if (common_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -587,13 +570,14 @@ public Builder mergeCommon(com.google.api.CommonLanguageSettings value) {
      * .google.api.CommonLanguageSettings common = 1;
      */
     public Builder clearCommon() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      common_ = null;
-      if (commonBuilder_ != null) {
-        commonBuilder_.dispose();
+      if (commonBuilder_ == null) {
+        common_ = null;
+        onChanged();
+      } else {
+        common_ = null;
         commonBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -607,7 +591,7 @@ public Builder clearCommon() {
      * .google.api.CommonLanguageSettings common = 1;
      */
     public com.google.api.CommonLanguageSettings.Builder getCommonBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getCommonFieldBuilder().getBuilder();
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RubySettingsOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RubySettingsOrBuilder.java
index fc1abfb8a7..46db0d3a90 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RubySettingsOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/RubySettingsOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface RubySettingsOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGeneration.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGeneration.java
index 0aa6fcc9e0..360f86fd43 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGeneration.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGeneration.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -41,7 +40,7 @@ private SelectiveGapicGeneration(com.google.protobuf.GeneratedMessageV3.Builder<
   }
 
   private SelectiveGapicGeneration() {
-    methods_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    methods_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
   @java.lang.Override
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SelectiveGapicGeneration();
   }
 
+  @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_SelectiveGapicGeneration_descriptor;
@@ -66,10 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int METHODS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList methods_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList methods_;
 
   /**
    *
@@ -138,7 +139,7 @@ public com.google.protobuf.ByteString getMethodsBytes(int index) {
   }
 
   public static final int GENERATE_OMITTED_AS_INTERNAL_FIELD_NUMBER = 2;
-  private boolean generateOmittedAsInternal_ = false;
+  private boolean generateOmittedAsInternal_;
 
   /**
    *
@@ -375,9 +376,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      methods_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      methods_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       generateOmittedAsInternal_ = false;
+
       return this;
     }
 
@@ -405,24 +407,17 @@ public com.google.api.SelectiveGapicGeneration build() {
     public com.google.api.SelectiveGapicGeneration buildPartial() {
       com.google.api.SelectiveGapicGeneration result =
           new com.google.api.SelectiveGapicGeneration(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        methods_ = methods_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
+      result.methods_ = methods_;
+      result.generateOmittedAsInternal_ = generateOmittedAsInternal_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.SelectiveGapicGeneration result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        methods_.makeImmutable();
-        result.methods_ = methods_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.generateOmittedAsInternal_ = generateOmittedAsInternal_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -471,7 +466,7 @@ public Builder mergeFrom(com.google.api.SelectiveGapicGeneration other) {
       if (!other.methods_.isEmpty()) {
         if (methods_.isEmpty()) {
           methods_ = other.methods_;
-          bitField0_ |= 0x00000001;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureMethodsIsMutable();
           methods_.addAll(other.methods_);
@@ -517,7 +512,7 @@ public Builder mergeFrom(
             case 16:
               {
                 generateOmittedAsInternal_ = input.readBool();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             default:
@@ -539,14 +534,14 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private com.google.protobuf.LazyStringArrayList methods_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList methods_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureMethodsIsMutable() {
-      if (!methods_.isModifiable()) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         methods_ = new com.google.protobuf.LazyStringArrayList(methods_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000001;
     }
 
     /**
@@ -562,8 +557,7 @@ private void ensureMethodsIsMutable() {
      * @return A list containing the methods.
      */
     public com.google.protobuf.ProtocolStringList getMethodsList() {
-      methods_.makeImmutable();
-      return methods_;
+      return methods_.getUnmodifiableView();
     }
 
     /**
@@ -636,7 +630,6 @@ public Builder setMethods(int index, java.lang.String value) {
       }
       ensureMethodsIsMutable();
       methods_.set(index, value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -660,7 +653,6 @@ public Builder addMethods(java.lang.String value) {
       }
       ensureMethodsIsMutable();
       methods_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -681,7 +673,6 @@ public Builder addMethods(java.lang.String value) {
     public Builder addAllMethods(java.lang.Iterable values) {
       ensureMethodsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, methods_);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -699,9 +690,8 @@ public Builder addAllMethods(java.lang.Iterable values) {
      * @return This builder for chaining.
      */
     public Builder clearMethods() {
-      methods_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      methods_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000001);
-      ;
       onChanged();
       return this;
     }
@@ -726,7 +716,6 @@ public Builder addMethodsBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureMethodsIsMutable();
       methods_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -774,7 +763,6 @@ public boolean getGenerateOmittedAsInternal() {
     public Builder setGenerateOmittedAsInternal(boolean value) {
 
       generateOmittedAsInternal_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -796,7 +784,7 @@ public Builder setGenerateOmittedAsInternal(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearGenerateOmittedAsInternal() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       generateOmittedAsInternal_ = false;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGenerationOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGenerationOrBuilder.java
index f26250c751..17303f1ca7 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGenerationOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGenerationOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface SelectiveGapicGenerationOrBuilder
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 99f133e957..17f457d867 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -29,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.*"
@@ -46,7 +42,6 @@
  *       rules:
  *       - selector: "google.calendar.v3.*"
  *         address: calendar.example.com
- *
  *     authentication:
  *       providers:
  *       - id: google_calendar_auth
@@ -91,6 +86,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;
   }
@@ -103,11 +103,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.api.Service.class, com.google.api.Service.Builder.class);
   }
 
-  private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -164,9 +161,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int TITLE_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object title_ = "";
+  private volatile java.lang.Object title_;
 
   /**
    *
@@ -219,9 +214,7 @@ public com.google.protobuf.ByteString getTitleBytes() {
   }
 
   public static final int PRODUCER_PROJECT_ID_FIELD_NUMBER = 22;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object producerProjectId_ = "";
+  private volatile java.lang.Object producerProjectId_;
 
   /**
    *
@@ -272,9 +265,7 @@ public com.google.protobuf.ByteString getProducerProjectIdBytes() {
   }
 
   public static final int ID_FIELD_NUMBER = 33;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object id_ = "";
+  private volatile java.lang.Object id_;
 
   /**
    *
@@ -331,8 +322,6 @@ public com.google.protobuf.ByteString getIdBytes() {
   }
 
   public static final int APIS_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
   private java.util.List apis_;
 
   /**
@@ -426,8 +415,6 @@ public com.google.protobuf.ApiOrBuilder getApisOrBuilder(int index) {
   }
 
   public static final int TYPES_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
   private java.util.List types_;
 
   /**
@@ -439,7 +426,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
    * 

@@ -460,7 +446,6 @@ public java.util.List 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
    * 

@@ -481,7 +466,6 @@ public java.util.List 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
    * 

@@ -502,7 +486,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
    * 

@@ -523,7 +506,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
    * 

@@ -536,8 +518,6 @@ public com.google.protobuf.TypeOrBuilder getTypesOrBuilder(int index) {
   }
 
   public static final int ENUMS_FIELD_NUMBER = 5;
-
-  @SuppressWarnings("serial")
   private java.util.List enums_;
 
   /**
@@ -548,7 +528,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
    * 

@@ -568,7 +547,6 @@ public java.util.List 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
    * 

@@ -588,7 +566,6 @@ public java.util.List 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
    * 

@@ -608,7 +585,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
    * 

@@ -628,7 +604,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
    * 

@@ -656,7 +631,7 @@ public com.google.protobuf.EnumOrBuilder getEnumsOrBuilder(int index) {
    */
   @java.lang.Override
   public boolean hasDocumentation() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return documentation_ != null;
   }
 
   /**
@@ -688,9 +663,7 @@ public com.google.api.Documentation getDocumentation() {
    */
   @java.lang.Override
   public com.google.api.DocumentationOrBuilder getDocumentationOrBuilder() {
-    return documentation_ == null
-        ? com.google.api.Documentation.getDefaultInstance()
-        : documentation_;
+    return getDocumentation();
   }
 
   public static final int BACKEND_FIELD_NUMBER = 8;
@@ -709,7 +682,7 @@ public com.google.api.DocumentationOrBuilder getDocumentationOrBuilder() {
    */
   @java.lang.Override
   public boolean hasBackend() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return backend_ != null;
   }
 
   /**
@@ -739,7 +712,7 @@ public com.google.api.Backend getBackend() {
    */
   @java.lang.Override
   public com.google.api.BackendOrBuilder getBackendOrBuilder() {
-    return backend_ == null ? com.google.api.Backend.getDefaultInstance() : backend_;
+    return getBackend();
   }
 
   public static final int HTTP_FIELD_NUMBER = 9;
@@ -758,7 +731,7 @@ public com.google.api.BackendOrBuilder getBackendOrBuilder() {
    */
   @java.lang.Override
   public boolean hasHttp() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return http_ != null;
   }
 
   /**
@@ -788,7 +761,7 @@ public com.google.api.Http getHttp() {
    */
   @java.lang.Override
   public com.google.api.HttpOrBuilder getHttpOrBuilder() {
-    return http_ == null ? com.google.api.Http.getDefaultInstance() : http_;
+    return getHttp();
   }
 
   public static final int QUOTA_FIELD_NUMBER = 10;
@@ -807,7 +780,7 @@ public com.google.api.HttpOrBuilder getHttpOrBuilder() {
    */
   @java.lang.Override
   public boolean hasQuota() {
-    return ((bitField0_ & 0x00000008) != 0);
+    return quota_ != null;
   }
 
   /**
@@ -837,7 +810,7 @@ public com.google.api.Quota getQuota() {
    */
   @java.lang.Override
   public com.google.api.QuotaOrBuilder getQuotaOrBuilder() {
-    return quota_ == null ? com.google.api.Quota.getDefaultInstance() : quota_;
+    return getQuota();
   }
 
   public static final int AUTHENTICATION_FIELD_NUMBER = 11;
@@ -856,7 +829,7 @@ public com.google.api.QuotaOrBuilder getQuotaOrBuilder() {
    */
   @java.lang.Override
   public boolean hasAuthentication() {
-    return ((bitField0_ & 0x00000010) != 0);
+    return authentication_ != null;
   }
 
   /**
@@ -888,9 +861,7 @@ public com.google.api.Authentication getAuthentication() {
    */
   @java.lang.Override
   public com.google.api.AuthenticationOrBuilder getAuthenticationOrBuilder() {
-    return authentication_ == null
-        ? com.google.api.Authentication.getDefaultInstance()
-        : authentication_;
+    return getAuthentication();
   }
 
   public static final int CONTEXT_FIELD_NUMBER = 12;
@@ -909,7 +880,7 @@ public com.google.api.AuthenticationOrBuilder getAuthenticationOrBuilder() {
    */
   @java.lang.Override
   public boolean hasContext() {
-    return ((bitField0_ & 0x00000020) != 0);
+    return context_ != null;
   }
 
   /**
@@ -939,7 +910,7 @@ public com.google.api.Context getContext() {
    */
   @java.lang.Override
   public com.google.api.ContextOrBuilder getContextOrBuilder() {
-    return context_ == null ? com.google.api.Context.getDefaultInstance() : context_;
+    return getContext();
   }
 
   public static final int USAGE_FIELD_NUMBER = 15;
@@ -958,7 +929,7 @@ public com.google.api.ContextOrBuilder getContextOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUsage() {
-    return ((bitField0_ & 0x00000040) != 0);
+    return usage_ != null;
   }
 
   /**
@@ -988,12 +959,10 @@ public com.google.api.Usage getUsage() {
    */
   @java.lang.Override
   public com.google.api.UsageOrBuilder getUsageOrBuilder() {
-    return usage_ == null ? com.google.api.Usage.getDefaultInstance() : usage_;
+    return getUsage();
   }
 
   public static final int ENDPOINTS_FIELD_NUMBER = 18;
-
-  @SuppressWarnings("serial")
   private java.util.List endpoints_;
 
   /**
@@ -1092,7 +1061,7 @@ public com.google.api.EndpointOrBuilder getEndpointsOrBuilder(int index) {
    */
   @java.lang.Override
   public boolean hasControl() {
-    return ((bitField0_ & 0x00000080) != 0);
+    return control_ != null;
   }
 
   /**
@@ -1122,12 +1091,10 @@ public com.google.api.Control getControl() {
    */
   @java.lang.Override
   public com.google.api.ControlOrBuilder getControlOrBuilder() {
-    return control_ == null ? com.google.api.Control.getDefaultInstance() : control_;
+    return getControl();
   }
 
   public static final int LOGS_FIELD_NUMBER = 23;
-
-  @SuppressWarnings("serial")
   private java.util.List logs_;
 
   /**
@@ -1201,8 +1168,6 @@ public com.google.api.LogDescriptorOrBuilder getLogsOrBuilder(int index) {
   }
 
   public static final int METRICS_FIELD_NUMBER = 24;
-
-  @SuppressWarnings("serial")
   private java.util.List metrics_;
 
   /**
@@ -1277,8 +1242,6 @@ public com.google.api.MetricDescriptorOrBuilder getMetricsOrBuilder(int index) {
   }
 
   public static final int MONITORED_RESOURCES_FIELD_NUMBER = 25;
-
-  @SuppressWarnings("serial")
   private java.util.List monitoredResources_;
 
   /**
@@ -1379,7 +1342,7 @@ public com.google.api.MonitoredResourceDescriptorOrBuilder getMonitoredResources
    */
   @java.lang.Override
   public boolean hasBilling() {
-    return ((bitField0_ & 0x00000100) != 0);
+    return billing_ != null;
   }
 
   /**
@@ -1409,7 +1372,7 @@ public com.google.api.Billing getBilling() {
    */
   @java.lang.Override
   public com.google.api.BillingOrBuilder getBillingOrBuilder() {
-    return billing_ == null ? com.google.api.Billing.getDefaultInstance() : billing_;
+    return getBilling();
   }
 
   public static final int LOGGING_FIELD_NUMBER = 27;
@@ -1428,7 +1391,7 @@ public com.google.api.BillingOrBuilder getBillingOrBuilder() {
    */
   @java.lang.Override
   public boolean hasLogging() {
-    return ((bitField0_ & 0x00000200) != 0);
+    return logging_ != null;
   }
 
   /**
@@ -1458,7 +1421,7 @@ public com.google.api.Logging getLogging() {
    */
   @java.lang.Override
   public com.google.api.LoggingOrBuilder getLoggingOrBuilder() {
-    return logging_ == null ? com.google.api.Logging.getDefaultInstance() : logging_;
+    return getLogging();
   }
 
   public static final int MONITORING_FIELD_NUMBER = 28;
@@ -1477,7 +1440,7 @@ public com.google.api.LoggingOrBuilder getLoggingOrBuilder() {
    */
   @java.lang.Override
   public boolean hasMonitoring() {
-    return ((bitField0_ & 0x00000400) != 0);
+    return monitoring_ != null;
   }
 
   /**
@@ -1507,7 +1470,7 @@ public com.google.api.Monitoring getMonitoring() {
    */
   @java.lang.Override
   public com.google.api.MonitoringOrBuilder getMonitoringOrBuilder() {
-    return monitoring_ == null ? com.google.api.Monitoring.getDefaultInstance() : monitoring_;
+    return getMonitoring();
   }
 
   public static final int SYSTEM_PARAMETERS_FIELD_NUMBER = 29;
@@ -1526,7 +1489,7 @@ public com.google.api.MonitoringOrBuilder getMonitoringOrBuilder() {
    */
   @java.lang.Override
   public boolean hasSystemParameters() {
-    return ((bitField0_ & 0x00000800) != 0);
+    return systemParameters_ != null;
   }
 
   /**
@@ -1558,9 +1521,7 @@ public com.google.api.SystemParameters getSystemParameters() {
    */
   @java.lang.Override
   public com.google.api.SystemParametersOrBuilder getSystemParametersOrBuilder() {
-    return systemParameters_ == null
-        ? com.google.api.SystemParameters.getDefaultInstance()
-        : systemParameters_;
+    return getSystemParameters();
   }
 
   public static final int SOURCE_INFO_FIELD_NUMBER = 37;
@@ -1579,7 +1540,7 @@ public com.google.api.SystemParametersOrBuilder getSystemParametersOrBuilder() {
    */
   @java.lang.Override
   public boolean hasSourceInfo() {
-    return ((bitField0_ & 0x00001000) != 0);
+    return sourceInfo_ != null;
   }
 
   /**
@@ -1609,7 +1570,7 @@ public com.google.api.SourceInfo getSourceInfo() {
    */
   @java.lang.Override
   public com.google.api.SourceInfoOrBuilder getSourceInfoOrBuilder() {
-    return sourceInfo_ == null ? com.google.api.SourceInfo.getDefaultInstance() : sourceInfo_;
+    return getSourceInfo();
   }
 
   public static final int PUBLISHING_FIELD_NUMBER = 45;
@@ -1630,7 +1591,7 @@ public com.google.api.SourceInfoOrBuilder getSourceInfoOrBuilder() {
    */
   @java.lang.Override
   public boolean hasPublishing() {
-    return ((bitField0_ & 0x00002000) != 0);
+    return publishing_ != null;
   }
 
   /**
@@ -1664,7 +1625,7 @@ public com.google.api.Publishing getPublishing() {
    */
   @java.lang.Override
   public com.google.api.PublishingOrBuilder getPublishingOrBuilder() {
-    return publishing_ == null ? com.google.api.Publishing.getDefaultInstance() : publishing_;
+    return getPublishing();
   }
 
   public static final int CONFIG_VERSION_FIELD_NUMBER = 20;
@@ -1675,7 +1636,6 @@ public com.google.api.PublishingOrBuilder getPublishingOrBuilder() {
    *
    * 
    * Obsolete. Do not use.
-   *
    * This field has no semantic meaning. The service config compiler always
    * sets this field to `3`.
    * 

@@ -1686,7 +1646,7 @@ public com.google.api.PublishingOrBuilder getPublishingOrBuilder() {
    */
   @java.lang.Override
   public boolean hasConfigVersion() {
-    return ((bitField0_ & 0x00004000) != 0);
+    return configVersion_ != null;
   }
 
   /**
@@ -1694,7 +1654,6 @@ public boolean hasConfigVersion() {
    *
    * 
    * Obsolete. Do not use.
-   *
    * This field has no semantic meaning. The service config compiler always
    * sets this field to `3`.
    * 

@@ -1715,7 +1674,6 @@ public com.google.protobuf.UInt32Value getConfigVersion() {
    *
    * 
    * Obsolete. Do not use.
-   *
    * This field has no semantic meaning. The service config compiler always
    * sets this field to `3`.
    * 

@@ -1724,9 +1682,7 @@ public com.google.protobuf.UInt32Value getConfigVersion() {
    */
   @java.lang.Override
   public com.google.protobuf.UInt32ValueOrBuilder getConfigVersionOrBuilder() {
-    return configVersion_ == null
-        ? com.google.protobuf.UInt32Value.getDefaultInstance()
-        : configVersion_;
+    return getConfigVersion();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -1758,34 +1714,34 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < enums_.size(); i++) {
       output.writeMessage(5, enums_.get(i));
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (documentation_ != null) {
       output.writeMessage(6, getDocumentation());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (backend_ != null) {
       output.writeMessage(8, getBackend());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (http_ != null) {
       output.writeMessage(9, getHttp());
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (quota_ != null) {
       output.writeMessage(10, getQuota());
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (authentication_ != null) {
       output.writeMessage(11, getAuthentication());
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (context_ != null) {
       output.writeMessage(12, getContext());
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
+    if (usage_ != null) {
       output.writeMessage(15, getUsage());
     }
     for (int i = 0; i < endpoints_.size(); i++) {
       output.writeMessage(18, endpoints_.get(i));
     }
-    if (((bitField0_ & 0x00004000) != 0)) {
+    if (configVersion_ != null) {
       output.writeMessage(20, getConfigVersion());
     }
-    if (((bitField0_ & 0x00000080) != 0)) {
+    if (control_ != null) {
       output.writeMessage(21, getControl());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(producerProjectId_)) {
@@ -1800,25 +1756,25 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < monitoredResources_.size(); i++) {
       output.writeMessage(25, monitoredResources_.get(i));
     }
-    if (((bitField0_ & 0x00000100) != 0)) {
+    if (billing_ != null) {
       output.writeMessage(26, getBilling());
     }
-    if (((bitField0_ & 0x00000200) != 0)) {
+    if (logging_ != null) {
       output.writeMessage(27, getLogging());
     }
-    if (((bitField0_ & 0x00000400) != 0)) {
+    if (monitoring_ != null) {
       output.writeMessage(28, getMonitoring());
     }
-    if (((bitField0_ & 0x00000800) != 0)) {
+    if (systemParameters_ != null) {
       output.writeMessage(29, getSystemParameters());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 33, id_);
     }
-    if (((bitField0_ & 0x00001000) != 0)) {
+    if (sourceInfo_ != null) {
       output.writeMessage(37, getSourceInfo());
     }
-    if (((bitField0_ & 0x00002000) != 0)) {
+    if (publishing_ != null) {
       output.writeMessage(45, getPublishing());
     }
     getUnknownFields().writeTo(output);
@@ -1845,34 +1801,34 @@ public int getSerializedSize() {
     for (int i = 0; i < enums_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, enums_.get(i));
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (documentation_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getDocumentation());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (backend_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getBackend());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (http_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getHttp());
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (quota_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getQuota());
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (authentication_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(11, getAuthentication());
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (context_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(12, getContext());
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
+    if (usage_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(15, getUsage());
     }
     for (int i = 0; i < endpoints_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(18, endpoints_.get(i));
     }
-    if (((bitField0_ & 0x00004000) != 0)) {
+    if (configVersion_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(20, getConfigVersion());
     }
-    if (((bitField0_ & 0x00000080) != 0)) {
+    if (control_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(21, getControl());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(producerProjectId_)) {
@@ -1888,25 +1844,25 @@ public int getSerializedSize() {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(25, monitoredResources_.get(i));
     }
-    if (((bitField0_ & 0x00000100) != 0)) {
+    if (billing_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(26, getBilling());
     }
-    if (((bitField0_ & 0x00000200) != 0)) {
+    if (logging_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(27, getLogging());
     }
-    if (((bitField0_ & 0x00000400) != 0)) {
+    if (monitoring_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(28, getMonitoring());
     }
-    if (((bitField0_ & 0x00000800) != 0)) {
+    if (systemParameters_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(29, getSystemParameters());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(33, id_);
     }
-    if (((bitField0_ & 0x00001000) != 0)) {
+    if (sourceInfo_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(37, getSourceInfo());
     }
-    if (((bitField0_ & 0x00002000) != 0)) {
+    if (publishing_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(45, getPublishing());
     }
     size += getUnknownFields().getSerializedSize();
@@ -2212,15 +2168,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.*"
@@ -2229,7 +2182,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *       rules:
    *       - selector: "google.calendar.v3.*"
    *         address: calendar.example.com
-   *
    *     authentication:
    *       providers:
    *       - id: google_calendar_auth
@@ -2260,104 +2212,84 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Service.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getApisFieldBuilder();
-        getTypesFieldBuilder();
-        getEnumsFieldBuilder();
-        getDocumentationFieldBuilder();
-        getBackendFieldBuilder();
-        getHttpFieldBuilder();
-        getQuotaFieldBuilder();
-        getAuthenticationFieldBuilder();
-        getContextFieldBuilder();
-        getUsageFieldBuilder();
-        getEndpointsFieldBuilder();
-        getControlFieldBuilder();
-        getLogsFieldBuilder();
-        getMetricsFieldBuilder();
-        getMonitoredResourcesFieldBuilder();
-        getBillingFieldBuilder();
-        getLoggingFieldBuilder();
-        getMonitoringFieldBuilder();
-        getSystemParametersFieldBuilder();
-        getSourceInfoFieldBuilder();
-        getPublishingFieldBuilder();
-        getConfigVersionFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       title_ = "";
+
       producerProjectId_ = "";
+
       id_ = "";
+
       if (apisBuilder_ == null) {
         apis_ = java.util.Collections.emptyList();
       } else {
         apis_ = null;
         apisBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000010);
+      bitField0_ = (bitField0_ & ~0x00000001);
       if (typesBuilder_ == null) {
         types_ = java.util.Collections.emptyList();
       } else {
         types_ = null;
         typesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000020);
+      bitField0_ = (bitField0_ & ~0x00000002);
       if (enumsBuilder_ == null) {
         enums_ = java.util.Collections.emptyList();
       } else {
         enums_ = null;
         enumsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000040);
-      documentation_ = null;
-      if (documentationBuilder_ != null) {
-        documentationBuilder_.dispose();
+      bitField0_ = (bitField0_ & ~0x00000004);
+      if (documentationBuilder_ == null) {
+        documentation_ = null;
+      } else {
+        documentation_ = null;
         documentationBuilder_ = null;
       }
-      backend_ = null;
-      if (backendBuilder_ != null) {
-        backendBuilder_.dispose();
+      if (backendBuilder_ == null) {
+        backend_ = null;
+      } else {
+        backend_ = null;
         backendBuilder_ = null;
       }
-      http_ = null;
-      if (httpBuilder_ != null) {
-        httpBuilder_.dispose();
+      if (httpBuilder_ == null) {
+        http_ = null;
+      } else {
+        http_ = null;
         httpBuilder_ = null;
       }
-      quota_ = null;
-      if (quotaBuilder_ != null) {
-        quotaBuilder_.dispose();
+      if (quotaBuilder_ == null) {
+        quota_ = null;
+      } else {
+        quota_ = null;
         quotaBuilder_ = null;
       }
-      authentication_ = null;
-      if (authenticationBuilder_ != null) {
-        authenticationBuilder_.dispose();
+      if (authenticationBuilder_ == null) {
+        authentication_ = null;
+      } else {
+        authentication_ = null;
         authenticationBuilder_ = null;
       }
-      context_ = null;
-      if (contextBuilder_ != null) {
-        contextBuilder_.dispose();
+      if (contextBuilder_ == null) {
+        context_ = null;
+      } else {
+        context_ = null;
         contextBuilder_ = null;
       }
-      usage_ = null;
-      if (usageBuilder_ != null) {
-        usageBuilder_.dispose();
+      if (usageBuilder_ == null) {
+        usage_ = null;
+      } else {
+        usage_ = null;
         usageBuilder_ = null;
       }
       if (endpointsBuilder_ == null) {
@@ -2366,10 +2298,11 @@ public Builder clear() {
         endpoints_ = null;
         endpointsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00004000);
-      control_ = null;
-      if (controlBuilder_ != null) {
-        controlBuilder_.dispose();
+      bitField0_ = (bitField0_ & ~0x00000008);
+      if (controlBuilder_ == null) {
+        control_ = null;
+      } else {
+        control_ = null;
         controlBuilder_ = null;
       }
       if (logsBuilder_ == null) {
@@ -2378,54 +2311,61 @@ public Builder clear() {
         logs_ = null;
         logsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00010000);
+      bitField0_ = (bitField0_ & ~0x00000010);
       if (metricsBuilder_ == null) {
         metrics_ = java.util.Collections.emptyList();
       } else {
         metrics_ = null;
         metricsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00020000);
+      bitField0_ = (bitField0_ & ~0x00000020);
       if (monitoredResourcesBuilder_ == null) {
         monitoredResources_ = java.util.Collections.emptyList();
       } else {
         monitoredResources_ = null;
         monitoredResourcesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00040000);
-      billing_ = null;
-      if (billingBuilder_ != null) {
-        billingBuilder_.dispose();
+      bitField0_ = (bitField0_ & ~0x00000040);
+      if (billingBuilder_ == null) {
+        billing_ = null;
+      } else {
+        billing_ = null;
         billingBuilder_ = null;
       }
-      logging_ = null;
-      if (loggingBuilder_ != null) {
-        loggingBuilder_.dispose();
+      if (loggingBuilder_ == null) {
+        logging_ = null;
+      } else {
+        logging_ = null;
         loggingBuilder_ = null;
       }
-      monitoring_ = null;
-      if (monitoringBuilder_ != null) {
-        monitoringBuilder_.dispose();
+      if (monitoringBuilder_ == null) {
+        monitoring_ = null;
+      } else {
+        monitoring_ = null;
         monitoringBuilder_ = null;
       }
-      systemParameters_ = null;
-      if (systemParametersBuilder_ != null) {
-        systemParametersBuilder_.dispose();
+      if (systemParametersBuilder_ == null) {
+        systemParameters_ = null;
+      } else {
+        systemParameters_ = null;
         systemParametersBuilder_ = null;
       }
-      sourceInfo_ = null;
-      if (sourceInfoBuilder_ != null) {
-        sourceInfoBuilder_.dispose();
+      if (sourceInfoBuilder_ == null) {
+        sourceInfo_ = null;
+      } else {
+        sourceInfo_ = null;
         sourceInfoBuilder_ = null;
       }
-      publishing_ = null;
-      if (publishingBuilder_ != null) {
-        publishingBuilder_.dispose();
+      if (publishingBuilder_ == null) {
+        publishing_ = null;
+      } else {
+        publishing_ = null;
         publishingBuilder_ = null;
       }
-      configVersion_ = null;
-      if (configVersionBuilder_ != null) {
-        configVersionBuilder_.dispose();
+      if (configVersionBuilder_ == null) {
+        configVersion_ = null;
+      } else {
+        configVersion_ = null;
         configVersionBuilder_ = null;
       }
       return this;
@@ -2453,160 +2393,151 @@ public com.google.api.Service build() {
     @java.lang.Override
     public com.google.api.Service buildPartial() {
       com.google.api.Service result = new com.google.api.Service(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.Service result) {
+      int from_bitField0_ = bitField0_;
+      result.name_ = name_;
+      result.title_ = title_;
+      result.producerProjectId_ = producerProjectId_;
+      result.id_ = id_;
       if (apisBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           apis_ = java.util.Collections.unmodifiableList(apis_);
-          bitField0_ = (bitField0_ & ~0x00000010);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.apis_ = apis_;
       } else {
         result.apis_ = apisBuilder_.build();
       }
       if (typesBuilder_ == null) {
-        if (((bitField0_ & 0x00000020) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           types_ = java.util.Collections.unmodifiableList(types_);
-          bitField0_ = (bitField0_ & ~0x00000020);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.types_ = types_;
       } else {
         result.types_ = typesBuilder_.build();
       }
       if (enumsBuilder_ == null) {
-        if (((bitField0_ & 0x00000040) != 0)) {
+        if (((bitField0_ & 0x00000004) != 0)) {
           enums_ = java.util.Collections.unmodifiableList(enums_);
-          bitField0_ = (bitField0_ & ~0x00000040);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.enums_ = enums_;
       } else {
         result.enums_ = enumsBuilder_.build();
       }
+      if (documentationBuilder_ == null) {
+        result.documentation_ = documentation_;
+      } else {
+        result.documentation_ = documentationBuilder_.build();
+      }
+      if (backendBuilder_ == null) {
+        result.backend_ = backend_;
+      } else {
+        result.backend_ = backendBuilder_.build();
+      }
+      if (httpBuilder_ == null) {
+        result.http_ = http_;
+      } else {
+        result.http_ = httpBuilder_.build();
+      }
+      if (quotaBuilder_ == null) {
+        result.quota_ = quota_;
+      } else {
+        result.quota_ = quotaBuilder_.build();
+      }
+      if (authenticationBuilder_ == null) {
+        result.authentication_ = authentication_;
+      } else {
+        result.authentication_ = authenticationBuilder_.build();
+      }
+      if (contextBuilder_ == null) {
+        result.context_ = context_;
+      } else {
+        result.context_ = contextBuilder_.build();
+      }
+      if (usageBuilder_ == null) {
+        result.usage_ = usage_;
+      } else {
+        result.usage_ = usageBuilder_.build();
+      }
       if (endpointsBuilder_ == null) {
-        if (((bitField0_ & 0x00004000) != 0)) {
+        if (((bitField0_ & 0x00000008) != 0)) {
           endpoints_ = java.util.Collections.unmodifiableList(endpoints_);
-          bitField0_ = (bitField0_ & ~0x00004000);
+          bitField0_ = (bitField0_ & ~0x00000008);
         }
         result.endpoints_ = endpoints_;
       } else {
         result.endpoints_ = endpointsBuilder_.build();
       }
+      if (controlBuilder_ == null) {
+        result.control_ = control_;
+      } else {
+        result.control_ = controlBuilder_.build();
+      }
       if (logsBuilder_ == null) {
-        if (((bitField0_ & 0x00010000) != 0)) {
+        if (((bitField0_ & 0x00000010) != 0)) {
           logs_ = java.util.Collections.unmodifiableList(logs_);
-          bitField0_ = (bitField0_ & ~0x00010000);
+          bitField0_ = (bitField0_ & ~0x00000010);
         }
         result.logs_ = logs_;
       } else {
         result.logs_ = logsBuilder_.build();
       }
       if (metricsBuilder_ == null) {
-        if (((bitField0_ & 0x00020000) != 0)) {
+        if (((bitField0_ & 0x00000020) != 0)) {
           metrics_ = java.util.Collections.unmodifiableList(metrics_);
-          bitField0_ = (bitField0_ & ~0x00020000);
+          bitField0_ = (bitField0_ & ~0x00000020);
         }
         result.metrics_ = metrics_;
       } else {
         result.metrics_ = metricsBuilder_.build();
       }
       if (monitoredResourcesBuilder_ == null) {
-        if (((bitField0_ & 0x00040000) != 0)) {
+        if (((bitField0_ & 0x00000040) != 0)) {
           monitoredResources_ = java.util.Collections.unmodifiableList(monitoredResources_);
-          bitField0_ = (bitField0_ & ~0x00040000);
+          bitField0_ = (bitField0_ & ~0x00000040);
         }
         result.monitoredResources_ = monitoredResources_;
       } else {
         result.monitoredResources_ = monitoredResourcesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.Service result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.title_ = title_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.producerProjectId_ = producerProjectId_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.id_ = id_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.documentation_ =
-            documentationBuilder_ == null ? documentation_ : documentationBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000100) != 0)) {
-        result.backend_ = backendBuilder_ == null ? backend_ : backendBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      if (((from_bitField0_ & 0x00000200) != 0)) {
-        result.http_ = httpBuilder_ == null ? http_ : httpBuilder_.build();
-        to_bitField0_ |= 0x00000004;
-      }
-      if (((from_bitField0_ & 0x00000400) != 0)) {
-        result.quota_ = quotaBuilder_ == null ? quota_ : quotaBuilder_.build();
-        to_bitField0_ |= 0x00000008;
-      }
-      if (((from_bitField0_ & 0x00000800) != 0)) {
-        result.authentication_ =
-            authenticationBuilder_ == null ? authentication_ : authenticationBuilder_.build();
-        to_bitField0_ |= 0x00000010;
-      }
-      if (((from_bitField0_ & 0x00001000) != 0)) {
-        result.context_ = contextBuilder_ == null ? context_ : contextBuilder_.build();
-        to_bitField0_ |= 0x00000020;
-      }
-      if (((from_bitField0_ & 0x00002000) != 0)) {
-        result.usage_ = usageBuilder_ == null ? usage_ : usageBuilder_.build();
-        to_bitField0_ |= 0x00000040;
-      }
-      if (((from_bitField0_ & 0x00008000) != 0)) {
-        result.control_ = controlBuilder_ == null ? control_ : controlBuilder_.build();
-        to_bitField0_ |= 0x00000080;
-      }
-      if (((from_bitField0_ & 0x00080000) != 0)) {
-        result.billing_ = billingBuilder_ == null ? billing_ : billingBuilder_.build();
-        to_bitField0_ |= 0x00000100;
+      if (billingBuilder_ == null) {
+        result.billing_ = billing_;
+      } else {
+        result.billing_ = billingBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00100000) != 0)) {
-        result.logging_ = loggingBuilder_ == null ? logging_ : loggingBuilder_.build();
-        to_bitField0_ |= 0x00000200;
+      if (loggingBuilder_ == null) {
+        result.logging_ = logging_;
+      } else {
+        result.logging_ = loggingBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00200000) != 0)) {
-        result.monitoring_ = monitoringBuilder_ == null ? monitoring_ : monitoringBuilder_.build();
-        to_bitField0_ |= 0x00000400;
+      if (monitoringBuilder_ == null) {
+        result.monitoring_ = monitoring_;
+      } else {
+        result.monitoring_ = monitoringBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00400000) != 0)) {
-        result.systemParameters_ =
-            systemParametersBuilder_ == null ? systemParameters_ : systemParametersBuilder_.build();
-        to_bitField0_ |= 0x00000800;
+      if (systemParametersBuilder_ == null) {
+        result.systemParameters_ = systemParameters_;
+      } else {
+        result.systemParameters_ = systemParametersBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00800000) != 0)) {
-        result.sourceInfo_ = sourceInfoBuilder_ == null ? sourceInfo_ : sourceInfoBuilder_.build();
-        to_bitField0_ |= 0x00001000;
+      if (sourceInfoBuilder_ == null) {
+        result.sourceInfo_ = sourceInfo_;
+      } else {
+        result.sourceInfo_ = sourceInfoBuilder_.build();
       }
-      if (((from_bitField0_ & 0x01000000) != 0)) {
-        result.publishing_ = publishingBuilder_ == null ? publishing_ : publishingBuilder_.build();
-        to_bitField0_ |= 0x00002000;
+      if (publishingBuilder_ == null) {
+        result.publishing_ = publishing_;
+      } else {
+        result.publishing_ = publishingBuilder_.build();
       }
-      if (((from_bitField0_ & 0x02000000) != 0)) {
-        result.configVersion_ =
-            configVersionBuilder_ == null ? configVersion_ : configVersionBuilder_.build();
-        to_bitField0_ |= 0x00004000;
+      if (configVersionBuilder_ == null) {
+        result.configVersion_ = configVersion_;
+      } else {
+        result.configVersion_ = configVersionBuilder_.build();
       }
-      result.bitField0_ |= to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -2656,29 +2587,25 @@ public Builder mergeFrom(com.google.api.Service other) {
       if (other == com.google.api.Service.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getTitle().isEmpty()) {
         title_ = other.title_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getProducerProjectId().isEmpty()) {
         producerProjectId_ = other.producerProjectId_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getId().isEmpty()) {
         id_ = other.id_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (apisBuilder_ == null) {
         if (!other.apis_.isEmpty()) {
           if (apis_.isEmpty()) {
             apis_ = other.apis_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureApisIsMutable();
             apis_.addAll(other.apis_);
@@ -2691,7 +2618,7 @@ public Builder mergeFrom(com.google.api.Service other) {
             apisBuilder_.dispose();
             apisBuilder_ = null;
             apis_ = other.apis_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00000001);
             apisBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getApisFieldBuilder()
@@ -2705,7 +2632,7 @@ public Builder mergeFrom(com.google.api.Service other) {
         if (!other.types_.isEmpty()) {
           if (types_.isEmpty()) {
             types_ = other.types_;
-            bitField0_ = (bitField0_ & ~0x00000020);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureTypesIsMutable();
             types_.addAll(other.types_);
@@ -2718,7 +2645,7 @@ public Builder mergeFrom(com.google.api.Service other) {
             typesBuilder_.dispose();
             typesBuilder_ = null;
             types_ = other.types_;
-            bitField0_ = (bitField0_ & ~0x00000020);
+            bitField0_ = (bitField0_ & ~0x00000002);
             typesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getTypesFieldBuilder()
@@ -2732,7 +2659,7 @@ public Builder mergeFrom(com.google.api.Service other) {
         if (!other.enums_.isEmpty()) {
           if (enums_.isEmpty()) {
             enums_ = other.enums_;
-            bitField0_ = (bitField0_ & ~0x00000040);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureEnumsIsMutable();
             enums_.addAll(other.enums_);
@@ -2745,7 +2672,7 @@ public Builder mergeFrom(com.google.api.Service other) {
             enumsBuilder_.dispose();
             enumsBuilder_ = null;
             enums_ = other.enums_;
-            bitField0_ = (bitField0_ & ~0x00000040);
+            bitField0_ = (bitField0_ & ~0x00000004);
             enumsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEnumsFieldBuilder()
@@ -2780,7 +2707,7 @@ public Builder mergeFrom(com.google.api.Service other) {
         if (!other.endpoints_.isEmpty()) {
           if (endpoints_.isEmpty()) {
             endpoints_ = other.endpoints_;
-            bitField0_ = (bitField0_ & ~0x00004000);
+            bitField0_ = (bitField0_ & ~0x00000008);
           } else {
             ensureEndpointsIsMutable();
             endpoints_.addAll(other.endpoints_);
@@ -2793,7 +2720,7 @@ public Builder mergeFrom(com.google.api.Service other) {
             endpointsBuilder_.dispose();
             endpointsBuilder_ = null;
             endpoints_ = other.endpoints_;
-            bitField0_ = (bitField0_ & ~0x00004000);
+            bitField0_ = (bitField0_ & ~0x00000008);
             endpointsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getEndpointsFieldBuilder()
@@ -2810,7 +2737,7 @@ public Builder mergeFrom(com.google.api.Service other) {
         if (!other.logs_.isEmpty()) {
           if (logs_.isEmpty()) {
             logs_ = other.logs_;
-            bitField0_ = (bitField0_ & ~0x00010000);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureLogsIsMutable();
             logs_.addAll(other.logs_);
@@ -2823,7 +2750,7 @@ public Builder mergeFrom(com.google.api.Service other) {
             logsBuilder_.dispose();
             logsBuilder_ = null;
             logs_ = other.logs_;
-            bitField0_ = (bitField0_ & ~0x00010000);
+            bitField0_ = (bitField0_ & ~0x00000010);
             logsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getLogsFieldBuilder()
@@ -2837,7 +2764,7 @@ public Builder mergeFrom(com.google.api.Service other) {
         if (!other.metrics_.isEmpty()) {
           if (metrics_.isEmpty()) {
             metrics_ = other.metrics_;
-            bitField0_ = (bitField0_ & ~0x00020000);
+            bitField0_ = (bitField0_ & ~0x00000020);
           } else {
             ensureMetricsIsMutable();
             metrics_.addAll(other.metrics_);
@@ -2850,7 +2777,7 @@ public Builder mergeFrom(com.google.api.Service other) {
             metricsBuilder_.dispose();
             metricsBuilder_ = null;
             metrics_ = other.metrics_;
-            bitField0_ = (bitField0_ & ~0x00020000);
+            bitField0_ = (bitField0_ & ~0x00000020);
             metricsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getMetricsFieldBuilder()
@@ -2864,7 +2791,7 @@ public Builder mergeFrom(com.google.api.Service other) {
         if (!other.monitoredResources_.isEmpty()) {
           if (monitoredResources_.isEmpty()) {
             monitoredResources_ = other.monitoredResources_;
-            bitField0_ = (bitField0_ & ~0x00040000);
+            bitField0_ = (bitField0_ & ~0x00000040);
           } else {
             ensureMonitoredResourcesIsMutable();
             monitoredResources_.addAll(other.monitoredResources_);
@@ -2877,7 +2804,7 @@ public Builder mergeFrom(com.google.api.Service other) {
             monitoredResourcesBuilder_.dispose();
             monitoredResourcesBuilder_ = null;
             monitoredResources_ = other.monitoredResources_;
-            bitField0_ = (bitField0_ & ~0x00040000);
+            bitField0_ = (bitField0_ & ~0x00000040);
             monitoredResourcesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getMonitoredResourcesFieldBuilder()
@@ -2937,13 +2864,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 title_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
@@ -2985,43 +2912,43 @@ public Builder mergeFrom(
             case 50:
               {
                 input.readMessage(getDocumentationFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 50
             case 66:
               {
                 input.readMessage(getBackendFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000100;
+
                 break;
               } // case 66
             case 74:
               {
                 input.readMessage(getHttpFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000200;
+
                 break;
               } // case 74
             case 82:
               {
                 input.readMessage(getQuotaFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000400;
+
                 break;
               } // case 82
             case 90:
               {
                 input.readMessage(getAuthenticationFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000800;
+
                 break;
               } // case 90
             case 98:
               {
                 input.readMessage(getContextFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00001000;
+
                 break;
               } // case 98
             case 122:
               {
                 input.readMessage(getUsageFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00002000;
+
                 break;
               } // case 122
             case 146:
@@ -3039,19 +2966,19 @@ public Builder mergeFrom(
             case 162:
               {
                 input.readMessage(getConfigVersionFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x02000000;
+
                 break;
               } // case 162
             case 170:
               {
                 input.readMessage(getControlFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00008000;
+
                 break;
               } // case 170
             case 178:
               {
                 producerProjectId_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 178
             case 186:
@@ -3094,44 +3021,44 @@ public Builder mergeFrom(
             case 210:
               {
                 input.readMessage(getBillingFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00080000;
+
                 break;
               } // case 210
             case 218:
               {
                 input.readMessage(getLoggingFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00100000;
+
                 break;
               } // case 218
             case 226:
               {
                 input.readMessage(getMonitoringFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00200000;
+
                 break;
               } // case 226
             case 234:
               {
                 input.readMessage(
                     getSystemParametersFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00400000;
+
                 break;
               } // case 234
             case 266:
               {
                 id_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 266
             case 298:
               {
                 input.readMessage(getSourceInfoFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00800000;
+
                 break;
               } // case 298
             case 362:
               {
                 input.readMessage(getPublishingFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x01000000;
+
                 break;
               } // case 362
             default:
@@ -3226,8 +3153,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3247,8 +3174,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -3273,8 +3200,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3346,8 +3273,8 @@ public Builder setTitle(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       title_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3365,8 +3292,8 @@ public Builder setTitle(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTitle() {
+
       title_ = getDefaultInstance().getTitle();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -3389,8 +3316,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       title_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3459,8 +3386,8 @@ public Builder setProducerProjectId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       producerProjectId_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -3477,8 +3404,8 @@ public Builder setProducerProjectId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProducerProjectId() {
+
       producerProjectId_ = getDefaultInstance().getProducerProjectId();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -3500,8 +3427,8 @@ public Builder setProducerProjectIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       producerProjectId_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -3579,8 +3506,8 @@ public Builder setId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       id_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -3600,8 +3527,8 @@ public Builder setId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearId() {
+
       id_ = getDefaultInstance().getId();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -3626,8 +3553,8 @@ public Builder setIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       id_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -3635,9 +3562,9 @@ public Builder setIdBytes(com.google.protobuf.ByteString value) {
     private java.util.List apis_ = java.util.Collections.emptyList();
 
     private void ensureApisIsMutable() {
-      if (!((bitField0_ & 0x00000010) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         apis_ = new java.util.ArrayList(apis_);
-        bitField0_ |= 0x00000010;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -3903,7 +3830,7 @@ public Builder addAllApis(java.lang.Iterable
     public Builder clearApis() {
       if (apisBuilder_ == null) {
         apis_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000010);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         apisBuilder_.clear();
@@ -4056,7 +3983,7 @@ public java.util.List getApisBuilderList() {
                 com.google.protobuf.Api,
                 com.google.protobuf.Api.Builder,
                 com.google.protobuf.ApiOrBuilder>(
-                apis_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
+                apis_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         apis_ = null;
       }
       return apisBuilder_;
@@ -4065,9 +3992,9 @@ public java.util.List getApisBuilderList() {
     private java.util.List types_ = java.util.Collections.emptyList();
 
     private void ensureTypesIsMutable() {
-      if (!((bitField0_ & 0x00000020) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         types_ = new java.util.ArrayList(types_);
-        bitField0_ |= 0x00000020;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -4086,7 +4013,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
      * 

@@ -4110,7 +4036,6 @@ public java.util.List 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
      * 

@@ -4134,7 +4059,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
      * 

@@ -4158,7 +4082,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
      * 

@@ -4188,7 +4111,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
      * 

@@ -4215,7 +4137,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
      * 

@@ -4245,7 +4166,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
      * 

@@ -4275,7 +4195,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
      * 

@@ -4302,7 +4221,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
      * 

@@ -4329,7 +4247,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
      * 

@@ -4356,7 +4273,6 @@ public Builder addAllTypes(java.lang.Iterable
@@ -4366,7 +4282,7 @@ public Builder addAllTypes(java.lang.Iterable
@@ -4410,7 +4325,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
      * 

@@ -4430,7 +4344,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
      * 

@@ -4454,7 +4367,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
      * 

@@ -4478,7 +4390,6 @@ public java.util.List 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
      * 

@@ -4498,7 +4409,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
      * 

@@ -4519,7 +4429,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
      * 

@@ -4541,7 +4450,7 @@ public java.util.List getTypesBuilderList() {
                 com.google.protobuf.Type,
                 com.google.protobuf.Type.Builder,
                 com.google.protobuf.TypeOrBuilder>(
-                types_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean());
+                types_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         types_ = null;
       }
       return typesBuilder_;
@@ -4550,9 +4459,9 @@ public java.util.List getTypesBuilderList() {
     private java.util.List enums_ = java.util.Collections.emptyList();
 
     private void ensureEnumsIsMutable() {
-      if (!((bitField0_ & 0x00000040) != 0)) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         enums_ = new java.util.ArrayList(enums_);
-        bitField0_ |= 0x00000040;
+        bitField0_ |= 0x00000004;
       }
     }
 
@@ -4570,7 +4479,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
      * 

@@ -4593,7 +4501,6 @@ public java.util.List 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
      * 

@@ -4616,7 +4523,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
      * 

@@ -4639,7 +4545,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
      * 

@@ -4668,7 +4573,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
      * 

@@ -4694,7 +4598,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
      * 

@@ -4723,7 +4626,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
      * 

@@ -4752,7 +4654,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
      * 

@@ -4778,7 +4679,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
      * 

@@ -4804,7 +4704,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
      * 

@@ -4830,7 +4729,6 @@ public Builder addAllEnums(java.lang.Iterable
@@ -4840,7 +4738,7 @@ public Builder addAllEnums(java.lang.Iterable
@@ -4882,7 +4779,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
      * 

@@ -4901,7 +4797,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
      * 

@@ -4924,7 +4819,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
      * 

@@ -4947,7 +4841,6 @@ public java.util.List 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
      * 

@@ -4966,7 +4859,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
      * 

@@ -4986,7 +4878,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
      * 

@@ -5008,7 +4899,7 @@ public java.util.List getEnumsBuilderList() {
                 com.google.protobuf.Enum,
                 com.google.protobuf.Enum.Builder,
                 com.google.protobuf.EnumOrBuilder>(
-                enums_, ((bitField0_ & 0x00000040) != 0), getParentForChildren(), isClean());
+                enums_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
         enums_ = null;
       }
       return enumsBuilder_;
@@ -5033,7 +4924,7 @@ public java.util.List getEnumsBuilderList() {
      * @return Whether the documentation field is set.
      */
     public boolean hasDocumentation() {
-      return ((bitField0_ & 0x00000080) != 0);
+      return documentationBuilder_ != null || documentation_ != null;
     }
 
     /**
@@ -5072,11 +4963,11 @@ public Builder setDocumentation(com.google.api.Documentation value) {
           throw new NullPointerException();
         }
         documentation_ = value;
+        onChanged();
       } else {
         documentationBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -5092,11 +4983,11 @@ public Builder setDocumentation(com.google.api.Documentation value) {
     public Builder setDocumentation(com.google.api.Documentation.Builder builderForValue) {
       if (documentationBuilder_ == null) {
         documentation_ = builderForValue.build();
+        onChanged();
       } else {
         documentationBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -5111,20 +5002,19 @@ public Builder setDocumentation(com.google.api.Documentation.Builder builderForV
      */
     public Builder mergeDocumentation(com.google.api.Documentation value) {
       if (documentationBuilder_ == null) {
-        if (((bitField0_ & 0x00000080) != 0)
-            && documentation_ != null
-            && documentation_ != com.google.api.Documentation.getDefaultInstance()) {
-          getDocumentationBuilder().mergeFrom(value);
+        if (documentation_ != null) {
+          documentation_ =
+              com.google.api.Documentation.newBuilder(documentation_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           documentation_ = value;
         }
+        onChanged();
       } else {
         documentationBuilder_.mergeFrom(value);
       }
-      if (documentation_ != null) {
-        bitField0_ |= 0x00000080;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -5138,13 +5028,14 @@ public Builder mergeDocumentation(com.google.api.Documentation value) {
      * .google.api.Documentation documentation = 6;
      */
     public Builder clearDocumentation() {
-      bitField0_ = (bitField0_ & ~0x00000080);
-      documentation_ = null;
-      if (documentationBuilder_ != null) {
-        documentationBuilder_.dispose();
+      if (documentationBuilder_ == null) {
+        documentation_ = null;
+        onChanged();
+      } else {
+        documentation_ = null;
         documentationBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -5158,7 +5049,7 @@ public Builder clearDocumentation() {
      * .google.api.Documentation documentation = 6;
      */
     public com.google.api.Documentation.Builder getDocumentationBuilder() {
-      bitField0_ |= 0x00000080;
+
       onChanged();
       return getDocumentationFieldBuilder().getBuilder();
     }
@@ -5225,7 +5116,7 @@ public com.google.api.DocumentationOrBuilder getDocumentationOrBuilder() {
      * @return Whether the backend field is set.
      */
     public boolean hasBackend() {
-      return ((bitField0_ & 0x00000100) != 0);
+      return backendBuilder_ != null || backend_ != null;
     }
 
     /**
@@ -5262,11 +5153,11 @@ public Builder setBackend(com.google.api.Backend value) {
           throw new NullPointerException();
         }
         backend_ = value;
+        onChanged();
       } else {
         backendBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000100;
-      onChanged();
+
       return this;
     }
 
@@ -5282,11 +5173,11 @@ public Builder setBackend(com.google.api.Backend value) {
     public Builder setBackend(com.google.api.Backend.Builder builderForValue) {
       if (backendBuilder_ == null) {
         backend_ = builderForValue.build();
+        onChanged();
       } else {
         backendBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000100;
-      onChanged();
+
       return this;
     }
 
@@ -5301,20 +5192,16 @@ public Builder setBackend(com.google.api.Backend.Builder builderForValue) {
      */
     public Builder mergeBackend(com.google.api.Backend value) {
       if (backendBuilder_ == null) {
-        if (((bitField0_ & 0x00000100) != 0)
-            && backend_ != null
-            && backend_ != com.google.api.Backend.getDefaultInstance()) {
-          getBackendBuilder().mergeFrom(value);
+        if (backend_ != null) {
+          backend_ = com.google.api.Backend.newBuilder(backend_).mergeFrom(value).buildPartial();
         } else {
           backend_ = value;
         }
+        onChanged();
       } else {
         backendBuilder_.mergeFrom(value);
       }
-      if (backend_ != null) {
-        bitField0_ |= 0x00000100;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -5328,13 +5215,14 @@ public Builder mergeBackend(com.google.api.Backend value) {
      * .google.api.Backend backend = 8;
      */
     public Builder clearBackend() {
-      bitField0_ = (bitField0_ & ~0x00000100);
-      backend_ = null;
-      if (backendBuilder_ != null) {
-        backendBuilder_.dispose();
+      if (backendBuilder_ == null) {
+        backend_ = null;
+        onChanged();
+      } else {
+        backend_ = null;
         backendBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -5348,7 +5236,7 @@ public Builder clearBackend() {
      * .google.api.Backend backend = 8;
      */
     public com.google.api.Backend.Builder getBackendBuilder() {
-      bitField0_ |= 0x00000100;
+
       onChanged();
       return getBackendFieldBuilder().getBuilder();
     }
@@ -5410,7 +5298,7 @@ public com.google.api.BackendOrBuilder getBackendOrBuilder() {
      * @return Whether the http field is set.
      */
     public boolean hasHttp() {
-      return ((bitField0_ & 0x00000200) != 0);
+      return httpBuilder_ != null || http_ != null;
     }
 
     /**
@@ -5447,11 +5335,11 @@ public Builder setHttp(com.google.api.Http value) {
           throw new NullPointerException();
         }
         http_ = value;
+        onChanged();
       } else {
         httpBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000200;
-      onChanged();
+
       return this;
     }
 
@@ -5467,11 +5355,11 @@ public Builder setHttp(com.google.api.Http value) {
     public Builder setHttp(com.google.api.Http.Builder builderForValue) {
       if (httpBuilder_ == null) {
         http_ = builderForValue.build();
+        onChanged();
       } else {
         httpBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000200;
-      onChanged();
+
       return this;
     }
 
@@ -5486,20 +5374,16 @@ public Builder setHttp(com.google.api.Http.Builder builderForValue) {
      */
     public Builder mergeHttp(com.google.api.Http value) {
       if (httpBuilder_ == null) {
-        if (((bitField0_ & 0x00000200) != 0)
-            && http_ != null
-            && http_ != com.google.api.Http.getDefaultInstance()) {
-          getHttpBuilder().mergeFrom(value);
+        if (http_ != null) {
+          http_ = com.google.api.Http.newBuilder(http_).mergeFrom(value).buildPartial();
         } else {
           http_ = value;
         }
+        onChanged();
       } else {
         httpBuilder_.mergeFrom(value);
       }
-      if (http_ != null) {
-        bitField0_ |= 0x00000200;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -5513,13 +5397,14 @@ public Builder mergeHttp(com.google.api.Http value) {
      * .google.api.Http http = 9;
      */
     public Builder clearHttp() {
-      bitField0_ = (bitField0_ & ~0x00000200);
-      http_ = null;
-      if (httpBuilder_ != null) {
-        httpBuilder_.dispose();
+      if (httpBuilder_ == null) {
+        http_ = null;
+        onChanged();
+      } else {
+        http_ = null;
         httpBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -5533,7 +5418,7 @@ public Builder clearHttp() {
      * .google.api.Http http = 9;
      */
     public com.google.api.Http.Builder getHttpBuilder() {
-      bitField0_ |= 0x00000200;
+
       onChanged();
       return getHttpFieldBuilder().getBuilder();
     }
@@ -5594,7 +5479,7 @@ public com.google.api.HttpOrBuilder getHttpOrBuilder() {
      * @return Whether the quota field is set.
      */
     public boolean hasQuota() {
-      return ((bitField0_ & 0x00000400) != 0);
+      return quotaBuilder_ != null || quota_ != null;
     }
 
     /**
@@ -5631,11 +5516,11 @@ public Builder setQuota(com.google.api.Quota value) {
           throw new NullPointerException();
         }
         quota_ = value;
+        onChanged();
       } else {
         quotaBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000400;
-      onChanged();
+
       return this;
     }
 
@@ -5651,11 +5536,11 @@ public Builder setQuota(com.google.api.Quota value) {
     public Builder setQuota(com.google.api.Quota.Builder builderForValue) {
       if (quotaBuilder_ == null) {
         quota_ = builderForValue.build();
+        onChanged();
       } else {
         quotaBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000400;
-      onChanged();
+
       return this;
     }
 
@@ -5670,20 +5555,16 @@ public Builder setQuota(com.google.api.Quota.Builder builderForValue) {
      */
     public Builder mergeQuota(com.google.api.Quota value) {
       if (quotaBuilder_ == null) {
-        if (((bitField0_ & 0x00000400) != 0)
-            && quota_ != null
-            && quota_ != com.google.api.Quota.getDefaultInstance()) {
-          getQuotaBuilder().mergeFrom(value);
+        if (quota_ != null) {
+          quota_ = com.google.api.Quota.newBuilder(quota_).mergeFrom(value).buildPartial();
         } else {
           quota_ = value;
         }
+        onChanged();
       } else {
         quotaBuilder_.mergeFrom(value);
       }
-      if (quota_ != null) {
-        bitField0_ |= 0x00000400;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -5697,13 +5578,14 @@ public Builder mergeQuota(com.google.api.Quota value) {
      * .google.api.Quota quota = 10;
      */
     public Builder clearQuota() {
-      bitField0_ = (bitField0_ & ~0x00000400);
-      quota_ = null;
-      if (quotaBuilder_ != null) {
-        quotaBuilder_.dispose();
+      if (quotaBuilder_ == null) {
+        quota_ = null;
+        onChanged();
+      } else {
+        quota_ = null;
         quotaBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -5717,7 +5599,7 @@ public Builder clearQuota() {
      * .google.api.Quota quota = 10;
      */
     public com.google.api.Quota.Builder getQuotaBuilder() {
-      bitField0_ |= 0x00000400;
+
       onChanged();
       return getQuotaFieldBuilder().getBuilder();
     }
@@ -5780,7 +5662,7 @@ public com.google.api.QuotaOrBuilder getQuotaOrBuilder() {
      * @return Whether the authentication field is set.
      */
     public boolean hasAuthentication() {
-      return ((bitField0_ & 0x00000800) != 0);
+      return authenticationBuilder_ != null || authentication_ != null;
     }
 
     /**
@@ -5819,11 +5701,11 @@ public Builder setAuthentication(com.google.api.Authentication value) {
           throw new NullPointerException();
         }
         authentication_ = value;
+        onChanged();
       } else {
         authenticationBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000800;
-      onChanged();
+
       return this;
     }
 
@@ -5839,11 +5721,11 @@ public Builder setAuthentication(com.google.api.Authentication value) {
     public Builder setAuthentication(com.google.api.Authentication.Builder builderForValue) {
       if (authenticationBuilder_ == null) {
         authentication_ = builderForValue.build();
+        onChanged();
       } else {
         authenticationBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000800;
-      onChanged();
+
       return this;
     }
 
@@ -5858,20 +5740,19 @@ public Builder setAuthentication(com.google.api.Authentication.Builder builderFo
      */
     public Builder mergeAuthentication(com.google.api.Authentication value) {
       if (authenticationBuilder_ == null) {
-        if (((bitField0_ & 0x00000800) != 0)
-            && authentication_ != null
-            && authentication_ != com.google.api.Authentication.getDefaultInstance()) {
-          getAuthenticationBuilder().mergeFrom(value);
+        if (authentication_ != null) {
+          authentication_ =
+              com.google.api.Authentication.newBuilder(authentication_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           authentication_ = value;
         }
+        onChanged();
       } else {
         authenticationBuilder_.mergeFrom(value);
       }
-      if (authentication_ != null) {
-        bitField0_ |= 0x00000800;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -5885,13 +5766,14 @@ public Builder mergeAuthentication(com.google.api.Authentication value) {
      * .google.api.Authentication authentication = 11;
      */
     public Builder clearAuthentication() {
-      bitField0_ = (bitField0_ & ~0x00000800);
-      authentication_ = null;
-      if (authenticationBuilder_ != null) {
-        authenticationBuilder_.dispose();
+      if (authenticationBuilder_ == null) {
+        authentication_ = null;
+        onChanged();
+      } else {
+        authentication_ = null;
         authenticationBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -5905,7 +5787,7 @@ public Builder clearAuthentication() {
      * .google.api.Authentication authentication = 11;
      */
     public com.google.api.Authentication.Builder getAuthenticationBuilder() {
-      bitField0_ |= 0x00000800;
+
       onChanged();
       return getAuthenticationFieldBuilder().getBuilder();
     }
@@ -5972,7 +5854,7 @@ public com.google.api.AuthenticationOrBuilder getAuthenticationOrBuilder() {
      * @return Whether the context field is set.
      */
     public boolean hasContext() {
-      return ((bitField0_ & 0x00001000) != 0);
+      return contextBuilder_ != null || context_ != null;
     }
 
     /**
@@ -6009,11 +5891,11 @@ public Builder setContext(com.google.api.Context value) {
           throw new NullPointerException();
         }
         context_ = value;
+        onChanged();
       } else {
         contextBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00001000;
-      onChanged();
+
       return this;
     }
 
@@ -6029,11 +5911,11 @@ public Builder setContext(com.google.api.Context value) {
     public Builder setContext(com.google.api.Context.Builder builderForValue) {
       if (contextBuilder_ == null) {
         context_ = builderForValue.build();
+        onChanged();
       } else {
         contextBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00001000;
-      onChanged();
+
       return this;
     }
 
@@ -6048,20 +5930,16 @@ public Builder setContext(com.google.api.Context.Builder builderForValue) {
      */
     public Builder mergeContext(com.google.api.Context value) {
       if (contextBuilder_ == null) {
-        if (((bitField0_ & 0x00001000) != 0)
-            && context_ != null
-            && context_ != com.google.api.Context.getDefaultInstance()) {
-          getContextBuilder().mergeFrom(value);
+        if (context_ != null) {
+          context_ = com.google.api.Context.newBuilder(context_).mergeFrom(value).buildPartial();
         } else {
           context_ = value;
         }
+        onChanged();
       } else {
         contextBuilder_.mergeFrom(value);
       }
-      if (context_ != null) {
-        bitField0_ |= 0x00001000;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -6075,13 +5953,14 @@ public Builder mergeContext(com.google.api.Context value) {
      * .google.api.Context context = 12;
      */
     public Builder clearContext() {
-      bitField0_ = (bitField0_ & ~0x00001000);
-      context_ = null;
-      if (contextBuilder_ != null) {
-        contextBuilder_.dispose();
+      if (contextBuilder_ == null) {
+        context_ = null;
+        onChanged();
+      } else {
+        context_ = null;
         contextBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -6095,7 +5974,7 @@ public Builder clearContext() {
      * .google.api.Context context = 12;
      */
     public com.google.api.Context.Builder getContextBuilder() {
-      bitField0_ |= 0x00001000;
+
       onChanged();
       return getContextFieldBuilder().getBuilder();
     }
@@ -6157,7 +6036,7 @@ public com.google.api.ContextOrBuilder getContextOrBuilder() {
      * @return Whether the usage field is set.
      */
     public boolean hasUsage() {
-      return ((bitField0_ & 0x00002000) != 0);
+      return usageBuilder_ != null || usage_ != null;
     }
 
     /**
@@ -6194,11 +6073,11 @@ public Builder setUsage(com.google.api.Usage value) {
           throw new NullPointerException();
         }
         usage_ = value;
+        onChanged();
       } else {
         usageBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00002000;
-      onChanged();
+
       return this;
     }
 
@@ -6214,11 +6093,11 @@ public Builder setUsage(com.google.api.Usage value) {
     public Builder setUsage(com.google.api.Usage.Builder builderForValue) {
       if (usageBuilder_ == null) {
         usage_ = builderForValue.build();
+        onChanged();
       } else {
         usageBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00002000;
-      onChanged();
+
       return this;
     }
 
@@ -6233,20 +6112,16 @@ public Builder setUsage(com.google.api.Usage.Builder builderForValue) {
      */
     public Builder mergeUsage(com.google.api.Usage value) {
       if (usageBuilder_ == null) {
-        if (((bitField0_ & 0x00002000) != 0)
-            && usage_ != null
-            && usage_ != com.google.api.Usage.getDefaultInstance()) {
-          getUsageBuilder().mergeFrom(value);
+        if (usage_ != null) {
+          usage_ = com.google.api.Usage.newBuilder(usage_).mergeFrom(value).buildPartial();
         } else {
           usage_ = value;
         }
+        onChanged();
       } else {
         usageBuilder_.mergeFrom(value);
       }
-      if (usage_ != null) {
-        bitField0_ |= 0x00002000;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -6260,13 +6135,14 @@ public Builder mergeUsage(com.google.api.Usage value) {
      * .google.api.Usage usage = 15;
      */
     public Builder clearUsage() {
-      bitField0_ = (bitField0_ & ~0x00002000);
-      usage_ = null;
-      if (usageBuilder_ != null) {
-        usageBuilder_.dispose();
+      if (usageBuilder_ == null) {
+        usage_ = null;
+        onChanged();
+      } else {
+        usage_ = null;
         usageBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -6280,7 +6156,7 @@ public Builder clearUsage() {
      * .google.api.Usage usage = 15;
      */
     public com.google.api.Usage.Builder getUsageBuilder() {
-      bitField0_ |= 0x00002000;
+
       onChanged();
       return getUsageFieldBuilder().getBuilder();
     }
@@ -6327,9 +6203,9 @@ public com.google.api.UsageOrBuilder getUsageOrBuilder() {
     private java.util.List endpoints_ = java.util.Collections.emptyList();
 
     private void ensureEndpointsIsMutable() {
-      if (!((bitField0_ & 0x00004000) != 0)) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         endpoints_ = new java.util.ArrayList(endpoints_);
-        bitField0_ |= 0x00004000;
+        bitField0_ |= 0x00000008;
       }
     }
 
@@ -6573,7 +6449,7 @@ public Builder addAllEndpoints(java.lang.Iterable getEndpointsBuilderList()
                 com.google.api.Endpoint,
                 com.google.api.Endpoint.Builder,
                 com.google.api.EndpointOrBuilder>(
-                endpoints_, ((bitField0_ & 0x00004000) != 0), getParentForChildren(), isClean());
+                endpoints_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
         endpoints_ = null;
       }
       return endpointsBuilder_;
@@ -6736,7 +6612,7 @@ public java.util.List getEndpointsBuilderList()
      * @return Whether the control field is set.
      */
     public boolean hasControl() {
-      return ((bitField0_ & 0x00008000) != 0);
+      return controlBuilder_ != null || control_ != null;
     }
 
     /**
@@ -6773,11 +6649,11 @@ public Builder setControl(com.google.api.Control value) {
           throw new NullPointerException();
         }
         control_ = value;
+        onChanged();
       } else {
         controlBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00008000;
-      onChanged();
+
       return this;
     }
 
@@ -6793,11 +6669,11 @@ public Builder setControl(com.google.api.Control value) {
     public Builder setControl(com.google.api.Control.Builder builderForValue) {
       if (controlBuilder_ == null) {
         control_ = builderForValue.build();
+        onChanged();
       } else {
         controlBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00008000;
-      onChanged();
+
       return this;
     }
 
@@ -6812,20 +6688,16 @@ public Builder setControl(com.google.api.Control.Builder builderForValue) {
      */
     public Builder mergeControl(com.google.api.Control value) {
       if (controlBuilder_ == null) {
-        if (((bitField0_ & 0x00008000) != 0)
-            && control_ != null
-            && control_ != com.google.api.Control.getDefaultInstance()) {
-          getControlBuilder().mergeFrom(value);
+        if (control_ != null) {
+          control_ = com.google.api.Control.newBuilder(control_).mergeFrom(value).buildPartial();
         } else {
           control_ = value;
         }
+        onChanged();
       } else {
         controlBuilder_.mergeFrom(value);
       }
-      if (control_ != null) {
-        bitField0_ |= 0x00008000;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -6839,13 +6711,14 @@ public Builder mergeControl(com.google.api.Control value) {
      * .google.api.Control control = 21;
      */
     public Builder clearControl() {
-      bitField0_ = (bitField0_ & ~0x00008000);
-      control_ = null;
-      if (controlBuilder_ != null) {
-        controlBuilder_.dispose();
+      if (controlBuilder_ == null) {
+        control_ = null;
+        onChanged();
+      } else {
+        control_ = null;
         controlBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -6859,7 +6732,7 @@ public Builder clearControl() {
      * .google.api.Control control = 21;
      */
     public com.google.api.Control.Builder getControlBuilder() {
-      bitField0_ |= 0x00008000;
+
       onChanged();
       return getControlFieldBuilder().getBuilder();
     }
@@ -6907,9 +6780,9 @@ public com.google.api.ControlOrBuilder getControlOrBuilder() {
     private java.util.List logs_ = java.util.Collections.emptyList();
 
     private void ensureLogsIsMutable() {
-      if (!((bitField0_ & 0x00010000) != 0)) {
+      if (!((bitField0_ & 0x00000010) != 0)) {
         logs_ = new java.util.ArrayList(logs_);
-        bitField0_ |= 0x00010000;
+        bitField0_ |= 0x00000010;
       }
     }
 
@@ -7131,7 +7004,7 @@ public Builder addAllLogs(java.lang.Iterable getLogsBuilderList()
                 com.google.api.LogDescriptor,
                 com.google.api.LogDescriptor.Builder,
                 com.google.api.LogDescriptorOrBuilder>(
-                logs_, ((bitField0_ & 0x00010000) != 0), getParentForChildren(), isClean());
+                logs_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean());
         logs_ = null;
       }
       return logsBuilder_;
@@ -7267,9 +7140,9 @@ public java.util.List getLogsBuilderList()
         java.util.Collections.emptyList();
 
     private void ensureMetricsIsMutable() {
-      if (!((bitField0_ & 0x00020000) != 0)) {
+      if (!((bitField0_ & 0x00000020) != 0)) {
         metrics_ = new java.util.ArrayList(metrics_);
-        bitField0_ |= 0x00020000;
+        bitField0_ |= 0x00000020;
       }
     }
 
@@ -7492,7 +7365,7 @@ public Builder addAllMetrics(
     public Builder clearMetrics() {
       if (metricsBuilder_ == null) {
         metrics_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00020000);
+        bitField0_ = (bitField0_ & ~0x00000020);
         onChanged();
       } else {
         metricsBuilder_.clear();
@@ -7620,7 +7493,7 @@ public java.util.List getMetricsBuilder
                 com.google.api.MetricDescriptor,
                 com.google.api.MetricDescriptor.Builder,
                 com.google.api.MetricDescriptorOrBuilder>(
-                metrics_, ((bitField0_ & 0x00020000) != 0), getParentForChildren(), isClean());
+                metrics_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean());
         metrics_ = null;
       }
       return metricsBuilder_;
@@ -7630,11 +7503,11 @@ public java.util.List getMetricsBuilder
         java.util.Collections.emptyList();
 
     private void ensureMonitoredResourcesIsMutable() {
-      if (!((bitField0_ & 0x00040000) != 0)) {
+      if (!((bitField0_ & 0x00000040) != 0)) {
         monitoredResources_ =
             new java.util.ArrayList(
                 monitoredResources_);
-        bitField0_ |= 0x00040000;
+        bitField0_ |= 0x00000040;
       }
     }
 
@@ -7884,7 +7757,7 @@ public Builder addAllMonitoredResources(
     public Builder clearMonitoredResources() {
       if (monitoredResourcesBuilder_ == null) {
         monitoredResources_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00040000);
+        bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
       } else {
         monitoredResourcesBuilder_.clear();
@@ -8031,7 +7904,7 @@ public com.google.api.MonitoredResourceDescriptor.Builder addMonitoredResourcesB
                 com.google.api.MonitoredResourceDescriptor.Builder,
                 com.google.api.MonitoredResourceDescriptorOrBuilder>(
                 monitoredResources_,
-                ((bitField0_ & 0x00040000) != 0),
+                ((bitField0_ & 0x00000040) != 0),
                 getParentForChildren(),
                 isClean());
         monitoredResources_ = null;
@@ -8056,7 +7929,7 @@ public com.google.api.MonitoredResourceDescriptor.Builder addMonitoredResourcesB
      * @return Whether the billing field is set.
      */
     public boolean hasBilling() {
-      return ((bitField0_ & 0x00080000) != 0);
+      return billingBuilder_ != null || billing_ != null;
     }
 
     /**
@@ -8093,11 +7966,11 @@ public Builder setBilling(com.google.api.Billing value) {
           throw new NullPointerException();
         }
         billing_ = value;
+        onChanged();
       } else {
         billingBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00080000;
-      onChanged();
+
       return this;
     }
 
@@ -8113,11 +7986,11 @@ public Builder setBilling(com.google.api.Billing value) {
     public Builder setBilling(com.google.api.Billing.Builder builderForValue) {
       if (billingBuilder_ == null) {
         billing_ = builderForValue.build();
+        onChanged();
       } else {
         billingBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00080000;
-      onChanged();
+
       return this;
     }
 
@@ -8132,20 +8005,16 @@ public Builder setBilling(com.google.api.Billing.Builder builderForValue) {
      */
     public Builder mergeBilling(com.google.api.Billing value) {
       if (billingBuilder_ == null) {
-        if (((bitField0_ & 0x00080000) != 0)
-            && billing_ != null
-            && billing_ != com.google.api.Billing.getDefaultInstance()) {
-          getBillingBuilder().mergeFrom(value);
+        if (billing_ != null) {
+          billing_ = com.google.api.Billing.newBuilder(billing_).mergeFrom(value).buildPartial();
         } else {
           billing_ = value;
         }
+        onChanged();
       } else {
         billingBuilder_.mergeFrom(value);
       }
-      if (billing_ != null) {
-        bitField0_ |= 0x00080000;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -8159,13 +8028,14 @@ public Builder mergeBilling(com.google.api.Billing value) {
      * .google.api.Billing billing = 26;
      */
     public Builder clearBilling() {
-      bitField0_ = (bitField0_ & ~0x00080000);
-      billing_ = null;
-      if (billingBuilder_ != null) {
-        billingBuilder_.dispose();
+      if (billingBuilder_ == null) {
+        billing_ = null;
+        onChanged();
+      } else {
+        billing_ = null;
         billingBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -8179,7 +8049,7 @@ public Builder clearBilling() {
      * .google.api.Billing billing = 26;
      */
     public com.google.api.Billing.Builder getBillingBuilder() {
-      bitField0_ |= 0x00080000;
+
       onChanged();
       return getBillingFieldBuilder().getBuilder();
     }
@@ -8241,7 +8111,7 @@ public com.google.api.BillingOrBuilder getBillingOrBuilder() {
      * @return Whether the logging field is set.
      */
     public boolean hasLogging() {
-      return ((bitField0_ & 0x00100000) != 0);
+      return loggingBuilder_ != null || logging_ != null;
     }
 
     /**
@@ -8278,11 +8148,11 @@ public Builder setLogging(com.google.api.Logging value) {
           throw new NullPointerException();
         }
         logging_ = value;
+        onChanged();
       } else {
         loggingBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00100000;
-      onChanged();
+
       return this;
     }
 
@@ -8298,11 +8168,11 @@ public Builder setLogging(com.google.api.Logging value) {
     public Builder setLogging(com.google.api.Logging.Builder builderForValue) {
       if (loggingBuilder_ == null) {
         logging_ = builderForValue.build();
+        onChanged();
       } else {
         loggingBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00100000;
-      onChanged();
+
       return this;
     }
 
@@ -8317,20 +8187,16 @@ public Builder setLogging(com.google.api.Logging.Builder builderForValue) {
      */
     public Builder mergeLogging(com.google.api.Logging value) {
       if (loggingBuilder_ == null) {
-        if (((bitField0_ & 0x00100000) != 0)
-            && logging_ != null
-            && logging_ != com.google.api.Logging.getDefaultInstance()) {
-          getLoggingBuilder().mergeFrom(value);
+        if (logging_ != null) {
+          logging_ = com.google.api.Logging.newBuilder(logging_).mergeFrom(value).buildPartial();
         } else {
           logging_ = value;
         }
+        onChanged();
       } else {
         loggingBuilder_.mergeFrom(value);
       }
-      if (logging_ != null) {
-        bitField0_ |= 0x00100000;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -8344,13 +8210,14 @@ public Builder mergeLogging(com.google.api.Logging value) {
      * .google.api.Logging logging = 27;
      */
     public Builder clearLogging() {
-      bitField0_ = (bitField0_ & ~0x00100000);
-      logging_ = null;
-      if (loggingBuilder_ != null) {
-        loggingBuilder_.dispose();
+      if (loggingBuilder_ == null) {
+        logging_ = null;
+        onChanged();
+      } else {
+        logging_ = null;
         loggingBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -8364,7 +8231,7 @@ public Builder clearLogging() {
      * .google.api.Logging logging = 27;
      */
     public com.google.api.Logging.Builder getLoggingBuilder() {
-      bitField0_ |= 0x00100000;
+
       onChanged();
       return getLoggingFieldBuilder().getBuilder();
     }
@@ -8428,7 +8295,7 @@ public com.google.api.LoggingOrBuilder getLoggingOrBuilder() {
      * @return Whether the monitoring field is set.
      */
     public boolean hasMonitoring() {
-      return ((bitField0_ & 0x00200000) != 0);
+      return monitoringBuilder_ != null || monitoring_ != null;
     }
 
     /**
@@ -8465,11 +8332,11 @@ public Builder setMonitoring(com.google.api.Monitoring value) {
           throw new NullPointerException();
         }
         monitoring_ = value;
+        onChanged();
       } else {
         monitoringBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00200000;
-      onChanged();
+
       return this;
     }
 
@@ -8485,11 +8352,11 @@ public Builder setMonitoring(com.google.api.Monitoring value) {
     public Builder setMonitoring(com.google.api.Monitoring.Builder builderForValue) {
       if (monitoringBuilder_ == null) {
         monitoring_ = builderForValue.build();
+        onChanged();
       } else {
         monitoringBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00200000;
-      onChanged();
+
       return this;
     }
 
@@ -8504,20 +8371,17 @@ public Builder setMonitoring(com.google.api.Monitoring.Builder builderForValue)
      */
     public Builder mergeMonitoring(com.google.api.Monitoring value) {
       if (monitoringBuilder_ == null) {
-        if (((bitField0_ & 0x00200000) != 0)
-            && monitoring_ != null
-            && monitoring_ != com.google.api.Monitoring.getDefaultInstance()) {
-          getMonitoringBuilder().mergeFrom(value);
+        if (monitoring_ != null) {
+          monitoring_ =
+              com.google.api.Monitoring.newBuilder(monitoring_).mergeFrom(value).buildPartial();
         } else {
           monitoring_ = value;
         }
+        onChanged();
       } else {
         monitoringBuilder_.mergeFrom(value);
       }
-      if (monitoring_ != null) {
-        bitField0_ |= 0x00200000;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -8531,13 +8395,14 @@ public Builder mergeMonitoring(com.google.api.Monitoring value) {
      * .google.api.Monitoring monitoring = 28;
      */
     public Builder clearMonitoring() {
-      bitField0_ = (bitField0_ & ~0x00200000);
-      monitoring_ = null;
-      if (monitoringBuilder_ != null) {
-        monitoringBuilder_.dispose();
+      if (monitoringBuilder_ == null) {
+        monitoring_ = null;
+        onChanged();
+      } else {
+        monitoring_ = null;
         monitoringBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -8551,7 +8416,7 @@ public Builder clearMonitoring() {
      * .google.api.Monitoring monitoring = 28;
      */
     public com.google.api.Monitoring.Builder getMonitoringBuilder() {
-      bitField0_ |= 0x00200000;
+
       onChanged();
       return getMonitoringFieldBuilder().getBuilder();
     }
@@ -8618,7 +8483,7 @@ public com.google.api.MonitoringOrBuilder getMonitoringOrBuilder() {
      * @return Whether the systemParameters field is set.
      */
     public boolean hasSystemParameters() {
-      return ((bitField0_ & 0x00400000) != 0);
+      return systemParametersBuilder_ != null || systemParameters_ != null;
     }
 
     /**
@@ -8657,11 +8522,11 @@ public Builder setSystemParameters(com.google.api.SystemParameters value) {
           throw new NullPointerException();
         }
         systemParameters_ = value;
+        onChanged();
       } else {
         systemParametersBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00400000;
-      onChanged();
+
       return this;
     }
 
@@ -8677,11 +8542,11 @@ public Builder setSystemParameters(com.google.api.SystemParameters value) {
     public Builder setSystemParameters(com.google.api.SystemParameters.Builder builderForValue) {
       if (systemParametersBuilder_ == null) {
         systemParameters_ = builderForValue.build();
+        onChanged();
       } else {
         systemParametersBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00400000;
-      onChanged();
+
       return this;
     }
 
@@ -8696,20 +8561,19 @@ public Builder setSystemParameters(com.google.api.SystemParameters.Builder build
      */
     public Builder mergeSystemParameters(com.google.api.SystemParameters value) {
       if (systemParametersBuilder_ == null) {
-        if (((bitField0_ & 0x00400000) != 0)
-            && systemParameters_ != null
-            && systemParameters_ != com.google.api.SystemParameters.getDefaultInstance()) {
-          getSystemParametersBuilder().mergeFrom(value);
+        if (systemParameters_ != null) {
+          systemParameters_ =
+              com.google.api.SystemParameters.newBuilder(systemParameters_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           systemParameters_ = value;
         }
+        onChanged();
       } else {
         systemParametersBuilder_.mergeFrom(value);
       }
-      if (systemParameters_ != null) {
-        bitField0_ |= 0x00400000;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -8723,13 +8587,14 @@ public Builder mergeSystemParameters(com.google.api.SystemParameters value) {
      * .google.api.SystemParameters system_parameters = 29;
      */
     public Builder clearSystemParameters() {
-      bitField0_ = (bitField0_ & ~0x00400000);
-      systemParameters_ = null;
-      if (systemParametersBuilder_ != null) {
-        systemParametersBuilder_.dispose();
+      if (systemParametersBuilder_ == null) {
+        systemParameters_ = null;
+        onChanged();
+      } else {
+        systemParameters_ = null;
         systemParametersBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -8743,7 +8608,7 @@ public Builder clearSystemParameters() {
      * .google.api.SystemParameters system_parameters = 29;
      */
     public com.google.api.SystemParameters.Builder getSystemParametersBuilder() {
-      bitField0_ |= 0x00400000;
+
       onChanged();
       return getSystemParametersFieldBuilder().getBuilder();
     }
@@ -8812,7 +8677,7 @@ public com.google.api.SystemParametersOrBuilder getSystemParametersOrBuilder() {
      * @return Whether the sourceInfo field is set.
      */
     public boolean hasSourceInfo() {
-      return ((bitField0_ & 0x00800000) != 0);
+      return sourceInfoBuilder_ != null || sourceInfo_ != null;
     }
 
     /**
@@ -8849,11 +8714,11 @@ public Builder setSourceInfo(com.google.api.SourceInfo value) {
           throw new NullPointerException();
         }
         sourceInfo_ = value;
+        onChanged();
       } else {
         sourceInfoBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00800000;
-      onChanged();
+
       return this;
     }
 
@@ -8869,11 +8734,11 @@ public Builder setSourceInfo(com.google.api.SourceInfo value) {
     public Builder setSourceInfo(com.google.api.SourceInfo.Builder builderForValue) {
       if (sourceInfoBuilder_ == null) {
         sourceInfo_ = builderForValue.build();
+        onChanged();
       } else {
         sourceInfoBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00800000;
-      onChanged();
+
       return this;
     }
 
@@ -8888,20 +8753,17 @@ public Builder setSourceInfo(com.google.api.SourceInfo.Builder builderForValue)
      */
     public Builder mergeSourceInfo(com.google.api.SourceInfo value) {
       if (sourceInfoBuilder_ == null) {
-        if (((bitField0_ & 0x00800000) != 0)
-            && sourceInfo_ != null
-            && sourceInfo_ != com.google.api.SourceInfo.getDefaultInstance()) {
-          getSourceInfoBuilder().mergeFrom(value);
+        if (sourceInfo_ != null) {
+          sourceInfo_ =
+              com.google.api.SourceInfo.newBuilder(sourceInfo_).mergeFrom(value).buildPartial();
         } else {
           sourceInfo_ = value;
         }
+        onChanged();
       } else {
         sourceInfoBuilder_.mergeFrom(value);
       }
-      if (sourceInfo_ != null) {
-        bitField0_ |= 0x00800000;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -8915,13 +8777,14 @@ public Builder mergeSourceInfo(com.google.api.SourceInfo value) {
      * .google.api.SourceInfo source_info = 37;
      */
     public Builder clearSourceInfo() {
-      bitField0_ = (bitField0_ & ~0x00800000);
-      sourceInfo_ = null;
-      if (sourceInfoBuilder_ != null) {
-        sourceInfoBuilder_.dispose();
+      if (sourceInfoBuilder_ == null) {
+        sourceInfo_ = null;
+        onChanged();
+      } else {
+        sourceInfo_ = null;
         sourceInfoBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -8935,7 +8798,7 @@ public Builder clearSourceInfo() {
      * .google.api.SourceInfo source_info = 37;
      */
     public com.google.api.SourceInfo.Builder getSourceInfoBuilder() {
-      bitField0_ |= 0x00800000;
+
       onChanged();
       return getSourceInfoFieldBuilder().getBuilder();
     }
@@ -9004,7 +8867,7 @@ public com.google.api.SourceInfoOrBuilder getSourceInfoOrBuilder() {
      * @return Whether the publishing field is set.
      */
     public boolean hasPublishing() {
-      return ((bitField0_ & 0x01000000) != 0);
+      return publishingBuilder_ != null || publishing_ != null;
     }
 
     /**
@@ -9045,11 +8908,11 @@ public Builder setPublishing(com.google.api.Publishing value) {
           throw new NullPointerException();
         }
         publishing_ = value;
+        onChanged();
       } else {
         publishingBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x01000000;
-      onChanged();
+
       return this;
     }
 
@@ -9067,11 +8930,11 @@ public Builder setPublishing(com.google.api.Publishing value) {
     public Builder setPublishing(com.google.api.Publishing.Builder builderForValue) {
       if (publishingBuilder_ == null) {
         publishing_ = builderForValue.build();
+        onChanged();
       } else {
         publishingBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x01000000;
-      onChanged();
+
       return this;
     }
 
@@ -9088,20 +8951,17 @@ public Builder setPublishing(com.google.api.Publishing.Builder builderForValue)
      */
     public Builder mergePublishing(com.google.api.Publishing value) {
       if (publishingBuilder_ == null) {
-        if (((bitField0_ & 0x01000000) != 0)
-            && publishing_ != null
-            && publishing_ != com.google.api.Publishing.getDefaultInstance()) {
-          getPublishingBuilder().mergeFrom(value);
+        if (publishing_ != null) {
+          publishing_ =
+              com.google.api.Publishing.newBuilder(publishing_).mergeFrom(value).buildPartial();
         } else {
           publishing_ = value;
         }
+        onChanged();
       } else {
         publishingBuilder_.mergeFrom(value);
       }
-      if (publishing_ != null) {
-        bitField0_ |= 0x01000000;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -9117,13 +8977,14 @@ public Builder mergePublishing(com.google.api.Publishing value) {
      * .google.api.Publishing publishing = 45;
      */
     public Builder clearPublishing() {
-      bitField0_ = (bitField0_ & ~0x01000000);
-      publishing_ = null;
-      if (publishingBuilder_ != null) {
-        publishingBuilder_.dispose();
+      if (publishingBuilder_ == null) {
+        publishing_ = null;
+        onChanged();
+      } else {
+        publishing_ = null;
         publishingBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -9139,7 +9000,7 @@ public Builder clearPublishing() {
      * .google.api.Publishing publishing = 45;
      */
     public com.google.api.Publishing.Builder getPublishingBuilder() {
-      bitField0_ |= 0x01000000;
+
       onChanged();
       return getPublishingFieldBuilder().getBuilder();
     }
@@ -9203,7 +9064,6 @@ public com.google.api.PublishingOrBuilder getPublishingOrBuilder() {
      *
      * 
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * 

@@ -9213,7 +9073,7 @@ public com.google.api.PublishingOrBuilder getPublishingOrBuilder() {
      * @return Whether the configVersion field is set.
      */
     public boolean hasConfigVersion() {
-      return ((bitField0_ & 0x02000000) != 0);
+      return configVersionBuilder_ != null || configVersion_ != null;
     }
 
     /**
@@ -9221,7 +9081,6 @@ public boolean hasConfigVersion() {
      *
      * 
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * 

@@ -9245,7 +9104,6 @@ public com.google.protobuf.UInt32Value getConfigVersion() {
      *
      * 
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * 

@@ -9258,11 +9116,11 @@ public Builder setConfigVersion(com.google.protobuf.UInt32Value value) {
           throw new NullPointerException();
         }
         configVersion_ = value;
+        onChanged();
       } else {
         configVersionBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x02000000;
-      onChanged();
+
       return this;
     }
 
@@ -9271,7 +9129,6 @@ public Builder setConfigVersion(com.google.protobuf.UInt32Value value) {
      *
      * 
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * 

@@ -9281,11 +9138,11 @@ public Builder setConfigVersion(com.google.protobuf.UInt32Value value) {
     public Builder setConfigVersion(com.google.protobuf.UInt32Value.Builder builderForValue) {
       if (configVersionBuilder_ == null) {
         configVersion_ = builderForValue.build();
+        onChanged();
       } else {
         configVersionBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x02000000;
-      onChanged();
+
       return this;
     }
 
@@ -9294,7 +9151,6 @@ public Builder setConfigVersion(com.google.protobuf.UInt32Value.Builder builderF
      *
      * 
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * 

@@ -9303,20 +9159,19 @@ public Builder setConfigVersion(com.google.protobuf.UInt32Value.Builder builderF
      */
     public Builder mergeConfigVersion(com.google.protobuf.UInt32Value value) {
       if (configVersionBuilder_ == null) {
-        if (((bitField0_ & 0x02000000) != 0)
-            && configVersion_ != null
-            && configVersion_ != com.google.protobuf.UInt32Value.getDefaultInstance()) {
-          getConfigVersionBuilder().mergeFrom(value);
+        if (configVersion_ != null) {
+          configVersion_ =
+              com.google.protobuf.UInt32Value.newBuilder(configVersion_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           configVersion_ = value;
         }
+        onChanged();
       } else {
         configVersionBuilder_.mergeFrom(value);
       }
-      if (configVersion_ != null) {
-        bitField0_ |= 0x02000000;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -9325,7 +9180,6 @@ public Builder mergeConfigVersion(com.google.protobuf.UInt32Value value) {
      *
      * 
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * 

@@ -9333,13 +9187,14 @@ public Builder mergeConfigVersion(com.google.protobuf.UInt32Value value) {
      * .google.protobuf.UInt32Value config_version = 20;
      */
     public Builder clearConfigVersion() {
-      bitField0_ = (bitField0_ & ~0x02000000);
-      configVersion_ = null;
-      if (configVersionBuilder_ != null) {
-        configVersionBuilder_.dispose();
+      if (configVersionBuilder_ == null) {
+        configVersion_ = null;
+        onChanged();
+      } else {
+        configVersion_ = null;
         configVersionBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -9348,7 +9203,6 @@ public Builder clearConfigVersion() {
      *
      * 
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * 

@@ -9356,7 +9210,7 @@ public Builder clearConfigVersion() {
      * .google.protobuf.UInt32Value config_version = 20;
      */
     public com.google.protobuf.UInt32Value.Builder getConfigVersionBuilder() {
-      bitField0_ |= 0x02000000;
+
       onChanged();
       return getConfigVersionFieldBuilder().getBuilder();
     }
@@ -9366,7 +9220,6 @@ public com.google.protobuf.UInt32Value.Builder getConfigVersionBuilder() {
      *
      * 
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * 

@@ -9388,7 +9241,6 @@ public com.google.protobuf.UInt32ValueOrBuilder getConfigVersionOrBuilder() {
      *
      * 
      * Obsolete. Do not use.
-     *
      * This field has no semantic meaning. The service config compiler always
      * sets this field to `3`.
      * 

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 92b5005d3e..b5ea9d5826 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface ServiceOrBuilder
@@ -226,7 +225,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
    * 

@@ -244,7 +242,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
    * 

@@ -262,7 +259,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
    * 

@@ -280,7 +276,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
    * 

@@ -298,7 +293,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
    * 

@@ -315,7 +309,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
    * 

@@ -332,7 +325,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
    * 

@@ -349,7 +341,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
    * 

@@ -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
    * 

@@ -383,7 +373,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
    * 

@@ -1162,7 +1151,6 @@ public interface ServiceOrBuilder
    *
    * 
    * Obsolete. Do not use.
-   *
    * This field has no semantic meaning. The service config compiler always
    * sets this field to `3`.
    * 

@@ -1178,7 +1166,6 @@ public interface ServiceOrBuilder
    *
    * 
    * Obsolete. Do not use.
-   *
    * This field has no semantic meaning. The service config compiler always
    * sets this field to `3`.
    * 

@@ -1194,7 +1181,6 @@ public interface ServiceOrBuilder
    *
    * 
    * Obsolete. Do not use.
-   *
    * This field has no semantic meaning. The service config compiler always
    * sets this field to `3`.
    * 

diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ServiceProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ServiceProto.java
index ef639ff6de..d1b99904b0 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ServiceProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ServiceProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class ServiceProto {
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 9f5099b89f..878315a9dd 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/source_info.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -49,6 +48,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;
   }
@@ -62,8 +66,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SOURCE_FILES_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List sourceFiles_;
 
   /**
@@ -331,7 +333,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (sourceFilesBuilder_ == null) {
         sourceFiles_ = java.util.Collections.emptyList();
       } else {
@@ -364,15 +365,7 @@ public com.google.api.SourceInfo build() {
     @java.lang.Override
     public com.google.api.SourceInfo buildPartial() {
       com.google.api.SourceInfo result = new com.google.api.SourceInfo(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.SourceInfo result) {
+      int from_bitField0_ = bitField0_;
       if (sourceFilesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           sourceFiles_ = java.util.Collections.unmodifiableList(sourceFiles_);
@@ -382,10 +375,8 @@ private void buildPartialRepeatedFields(com.google.api.SourceInfo result) {
       } else {
         result.sourceFiles_ = sourceFilesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.SourceInfo result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SourceInfoOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SourceInfoOrBuilder.java
index f7c823950e..1b35e88331 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SourceInfoOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SourceInfoOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/source_info.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface SourceInfoOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SourceInfoProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SourceInfoProto.java
index 7ac30673de..18e83574dd 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SourceInfoProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SourceInfoProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/source_info.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class SourceInfoProto {
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 ec8fc591ea..cceba5b476 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/system_parameter.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -53,6 +52,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;
@@ -68,9 +72,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -121,9 +123,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int HTTP_HEADER_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object httpHeader_ = "";
+  private volatile java.lang.Object httpHeader_;
 
   /**
    *
@@ -176,9 +176,7 @@ public com.google.protobuf.ByteString getHttpHeaderBytes() {
   }
 
   public static final int URL_QUERY_PARAMETER_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object urlQueryParameter_ = "";
+  private volatile java.lang.Object urlQueryParameter_;
 
   /**
    *
@@ -445,10 +443,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       httpHeader_ = "";
+
       urlQueryParameter_ = "";
+
       return this;
     }
 
@@ -475,26 +475,13 @@ public com.google.api.SystemParameter build() {
     @java.lang.Override
     public com.google.api.SystemParameter buildPartial() {
       com.google.api.SystemParameter result = new com.google.api.SystemParameter(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
+      result.httpHeader_ = httpHeader_;
+      result.urlQueryParameter_ = urlQueryParameter_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.SystemParameter result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.httpHeader_ = httpHeader_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.urlQueryParameter_ = urlQueryParameter_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -542,17 +529,14 @@ public Builder mergeFrom(com.google.api.SystemParameter other) {
       if (other == com.google.api.SystemParameter.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getHttpHeader().isEmpty()) {
         httpHeader_ = other.httpHeader_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getUrlQueryParameter().isEmpty()) {
         urlQueryParameter_ = other.urlQueryParameter_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -584,19 +568,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 httpHeader_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 urlQueryParameter_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -616,8 +600,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -682,8 +664,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -700,8 +682,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -723,8 +705,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -796,8 +778,8 @@ public Builder setHttpHeader(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       httpHeader_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -815,8 +797,8 @@ public Builder setHttpHeader(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearHttpHeader() {
+
       httpHeader_ = getDefaultInstance().getHttpHeader();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -839,8 +821,8 @@ public Builder setHttpHeaderBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       httpHeader_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -912,8 +894,8 @@ public Builder setUrlQueryParameter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       urlQueryParameter_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -931,8 +913,8 @@ public Builder setUrlQueryParameter(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearUrlQueryParameter() {
+
       urlQueryParameter_ = getDefaultInstance().getUrlQueryParameter();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -955,8 +937,8 @@ public Builder setUrlQueryParameterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       urlQueryParameter_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameterOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameterOrBuilder.java
index cafe8e3c69..551efa90b4 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameterOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameterOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/system_parameter.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface SystemParameterOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameterProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameterProto.java
index 179ec30bc7..f2ba696fd6 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameterProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SystemParameterProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/system_parameter.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class SystemParameterProto {
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 e0b93fb087..005eb66570 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/system_parameter.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -51,6 +50,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;
@@ -67,9 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object selector_ = "";
+  private volatile java.lang.Object selector_;
 
   /**
    *
@@ -77,7 +79,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * 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.
    * 

@@ -105,7 +106,6 @@ public java.lang.String getSelector() {
    * 
    * 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.
    * 

@@ -128,8 +128,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
   }
 
   public static final int PARAMETERS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List parameters_;
 
   /**
@@ -431,15 +429,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       selector_ = "";
+
       if (parametersBuilder_ == null) {
         parameters_ = java.util.Collections.emptyList();
       } else {
         parameters_ = null;
         parametersBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -466,31 +464,19 @@ public com.google.api.SystemParameterRule build() {
     @java.lang.Override
     public com.google.api.SystemParameterRule buildPartial() {
       com.google.api.SystemParameterRule result = new com.google.api.SystemParameterRule(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.SystemParameterRule result) {
+      int from_bitField0_ = bitField0_;
+      result.selector_ = selector_;
       if (parametersBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           parameters_ = java.util.Collections.unmodifiableList(parameters_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.parameters_ = parameters_;
       } else {
         result.parameters_ = parametersBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.SystemParameterRule result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.selector_ = selector_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -540,14 +526,13 @@ public Builder mergeFrom(com.google.api.SystemParameterRule other) {
       if (other == com.google.api.SystemParameterRule.getDefaultInstance()) return this;
       if (!other.getSelector().isEmpty()) {
         selector_ = other.selector_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (parametersBuilder_ == null) {
         if (!other.parameters_.isEmpty()) {
           if (parameters_.isEmpty()) {
             parameters_ = other.parameters_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureParametersIsMutable();
             parameters_.addAll(other.parameters_);
@@ -560,7 +545,7 @@ public Builder mergeFrom(com.google.api.SystemParameterRule other) {
             parametersBuilder_.dispose();
             parametersBuilder_ = null;
             parameters_ = other.parameters_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             parametersBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getParametersFieldBuilder()
@@ -599,7 +584,7 @@ public Builder mergeFrom(
             case 10:
               {
                 selector_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -641,7 +626,6 @@ public Builder mergeFrom(
      * 
      * 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.
      * 

@@ -668,7 +652,6 @@ public java.lang.String getSelector() {
      * 
      * 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.
      * 

@@ -695,7 +678,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      * 
      * 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.
      * 

@@ -709,8 +691,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -721,7 +703,6 @@ public Builder setSelector(java.lang.String value) {
      * 
      * 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.
      * 

@@ -731,8 +712,8 @@ public Builder setSelector(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSelector() {
+
       selector_ = getDefaultInstance().getSelector();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -743,7 +724,6 @@ public Builder clearSelector() {
      * 
      * 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.
      * 

@@ -758,8 +738,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -768,9 +748,9 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureParametersIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         parameters_ = new java.util.ArrayList(parameters_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1039,7 +1019,7 @@ public Builder addAllParameters(
     public Builder clearParameters() {
       if (parametersBuilder_ == null) {
         parameters_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         parametersBuilder_.clear();
@@ -1195,7 +1175,7 @@ public java.util.List getParametersBuild
                 com.google.api.SystemParameter,
                 com.google.api.SystemParameter.Builder,
                 com.google.api.SystemParameterOrBuilder>(
-                parameters_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                parameters_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         parameters_ = null;
       }
       return parametersBuilder_;
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 9c44aba415..ffdaf31795 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/system_parameter.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface SystemParameterRuleOrBuilder
@@ -30,7 +29,6 @@ public interface SystemParameterRuleOrBuilder
    * 
    * 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.
    * 

@@ -47,7 +45,6 @@ public interface SystemParameterRuleOrBuilder
    * 
    * 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.
    * 

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 3bb9467391..ae94fca60f 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/system_parameter.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -24,7 +23,6 @@
  *
  * 
  * ### 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
@@ -54,6 +52,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;
@@ -69,8 +72,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RULES_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List rules_;
 
   /**
@@ -78,24 +79,18 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * 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"
@@ -104,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.
    * 

    *
@@ -120,24 +114,18 @@ public java.util.List getRulesList() {
    *
    * 
    * 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"
@@ -146,7 +134,6 @@ public java.util.List getRulesList() {
    *               http_header: Api-Key1
    *             - name: api_key
    *               http_header: Api-Key2
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -163,24 +150,18 @@ public java.util.List getRulesList() {
    *
    * 
    * 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"
@@ -189,7 +170,6 @@ public java.util.List getRulesList() {
    *               http_header: Api-Key1
    *             - name: api_key
    *               http_header: Api-Key2
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -205,24 +185,18 @@ public int getRulesCount() {
    *
    * 
    * 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"
@@ -231,7 +205,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.
    * 

    *
@@ -247,24 +220,18 @@ public com.google.api.SystemParameterRule getRules(int index) {
    *
    * 
    * 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"
@@ -273,7 +240,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.
    * 

    *
@@ -449,7 +415,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * ### 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
@@ -486,7 +451,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
       } else {
@@ -520,15 +484,7 @@ public com.google.api.SystemParameters build() {
     @java.lang.Override
     public com.google.api.SystemParameters buildPartial() {
       com.google.api.SystemParameters result = new com.google.api.SystemParameters(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.SystemParameters result) {
+      int from_bitField0_ = bitField0_;
       if (rulesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
@@ -538,10 +494,8 @@ private void buildPartialRepeatedFields(com.google.api.SystemParameters result)
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.SystemParameters result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -695,24 +649,18 @@ private void ensureRulesIsMutable() {
      *
      * 
      * 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"
@@ -721,7 +669,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.
      * 

      *
@@ -740,24 +687,18 @@ public java.util.List getRulesList() {
      *
      * 
      * 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"
@@ -766,7 +707,6 @@ public java.util.List getRulesList() {
      *               http_header: Api-Key1
      *             - name: api_key
      *               http_header: Api-Key2
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -785,24 +725,18 @@ public int getRulesCount() {
      *
      * 
      * 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"
@@ -811,7 +745,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.
      * 

      *
@@ -830,24 +763,18 @@ public com.google.api.SystemParameterRule getRules(int index) {
      *
      * 
      * 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"
@@ -856,7 +783,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.
      * 

      *
@@ -881,24 +807,18 @@ public Builder setRules(int index, com.google.api.SystemParameterRule value) {
      *
      * 
      * 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"
@@ -907,7 +827,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.
      * 

      *
@@ -929,24 +848,18 @@ public Builder setRules(int index, com.google.api.SystemParameterRule.Builder bu
      *
      * 
      * 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"
@@ -955,7 +868,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.
      * 

      *
@@ -980,24 +892,18 @@ public Builder addRules(com.google.api.SystemParameterRule value) {
      *
      * 
      * 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"
@@ -1006,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.
      * 

      *
@@ -1031,24 +936,18 @@ public Builder addRules(int index, com.google.api.SystemParameterRule value) {
      *
      * 
      * 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"
@@ -1057,7 +956,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.
      * 

      *
@@ -1079,24 +977,18 @@ public Builder addRules(com.google.api.SystemParameterRule.Builder builderForVal
      *
      * 
      * 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"
@@ -1105,7 +997,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.
      * 

      *
@@ -1127,24 +1018,18 @@ public Builder addRules(int index, com.google.api.SystemParameterRule.Builder bu
      *
      * 
      * 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"
@@ -1153,7 +1038,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.
      * 

      *
@@ -1176,24 +1060,18 @@ public Builder addAllRules(
      *
      * 
      * 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"
@@ -1202,7 +1080,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.
      * 

      *
@@ -1224,24 +1101,18 @@ public Builder clearRules() {
      *
      * 
      * 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"
@@ -1250,7 +1121,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.
      * 

      *
@@ -1272,24 +1142,18 @@ public Builder removeRules(int index) {
      *
      * 
      * 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"
@@ -1298,7 +1162,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.
      * 

      *
@@ -1313,24 +1176,18 @@ public com.google.api.SystemParameterRule.Builder getRulesBuilder(int index) {
      *
      * 
      * 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"
@@ -1339,7 +1196,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.
      * 

      *
@@ -1358,24 +1214,18 @@ public com.google.api.SystemParameterRuleOrBuilder getRulesOrBuilder(int index)
      *
      * 
      * 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"
@@ -1384,7 +1234,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.
      * 

      *
@@ -1404,24 +1253,18 @@ public com.google.api.SystemParameterRuleOrBuilder getRulesOrBuilder(int index)
      *
      * 
      * 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"
@@ -1430,7 +1273,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.
      * 

      *
@@ -1446,24 +1288,18 @@ public com.google.api.SystemParameterRule.Builder addRulesBuilder() {
      *
      * 
      * 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"
@@ -1472,7 +1308,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.
      * 

      *
@@ -1488,24 +1323,18 @@ public com.google.api.SystemParameterRule.Builder addRulesBuilder(int index) {
      *
      * 
      * 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"
@@ -1514,7 +1343,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.
      * 

      *
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 110d7274bd..87e055c474 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/system_parameter.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface SystemParametersOrBuilder
@@ -29,24 +28,18 @@ public interface SystemParametersOrBuilder
    *
    * 
    * 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"
@@ -55,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.
    * 

    *
@@ -68,24 +60,18 @@ public interface SystemParametersOrBuilder
    *
    * 
    * 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"
@@ -94,7 +80,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.
    * 

    *
@@ -107,24 +92,18 @@ public interface SystemParametersOrBuilder
    *
    * 
    * 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"
@@ -133,7 +112,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.
    * 

    *
@@ -146,24 +124,18 @@ public interface SystemParametersOrBuilder
    *
    * 
    * 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"
@@ -172,7 +144,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.
    * 

    *
@@ -185,24 +156,18 @@ public interface SystemParametersOrBuilder
    *
    * 
    * 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"
@@ -211,7 +176,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.
    * 

    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/TypeReference.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/TypeReference.java
index 31d29f0cff..1667d3c2d8 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/TypeReference.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/TypeReference.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/field_info.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new TypeReference();
   }
 
+  @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.FieldInfoProto.internal_static_google_api_TypeReference_descriptor;
   }
@@ -62,9 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int TYPE_NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object typeName_ = "";
+  private volatile java.lang.Object typeName_;
 
   /**
    *
@@ -74,10 +76,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * If the type is in the same protobuf package, the value can be the simple
    * message name e.g., `"MyMessage"`. Otherwise, the value must be the
    * fully-qualified message name e.g., `"google.library.v1.Book"`.
-   *
    * If the type(s) are unknown to the service (e.g. the field accepts generic
    * user input), use the wildcard `"*"` to denote this behavior.
-   *
    * See [AIP-202](https://google.aip.dev/202#type-references) for more details.
    * 

    *
@@ -106,10 +106,8 @@ public java.lang.String getTypeName() {
    * If the type is in the same protobuf package, the value can be the simple
    * message name e.g., `"MyMessage"`. Otherwise, the value must be the
    * fully-qualified message name e.g., `"google.library.v1.Book"`.
-   *
    * If the type(s) are unknown to the service (e.g. the field accepts generic
    * user input), use the wildcard `"*"` to denote this behavior.
-   *
    * See [AIP-202](https://google.aip.dev/202#type-references) for more details.
    * 

    *
@@ -324,8 +322,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       typeName_ = "";
+
       return this;
     }
 
@@ -351,20 +349,11 @@ public com.google.api.TypeReference build() {
     @java.lang.Override
     public com.google.api.TypeReference buildPartial() {
       com.google.api.TypeReference result = new com.google.api.TypeReference(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.typeName_ = typeName_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.TypeReference result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.typeName_ = typeName_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -412,7 +401,6 @@ public Builder mergeFrom(com.google.api.TypeReference other) {
       if (other == com.google.api.TypeReference.getDefaultInstance()) return this;
       if (!other.getTypeName().isEmpty()) {
         typeName_ = other.typeName_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -444,7 +432,7 @@ public Builder mergeFrom(
             case 10:
               {
                 typeName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -464,8 +452,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object typeName_ = "";
 
     /**
@@ -476,10 +462,8 @@ public Builder mergeFrom(
      * If the type is in the same protobuf package, the value can be the simple
      * message name e.g., `"MyMessage"`. Otherwise, the value must be the
      * fully-qualified message name e.g., `"google.library.v1.Book"`.
-     *
      * If the type(s) are unknown to the service (e.g. the field accepts generic
      * user input), use the wildcard `"*"` to denote this behavior.
-     *
      * See [AIP-202](https://google.aip.dev/202#type-references) for more details.
      *
* @@ -507,10 +491,8 @@ public java.lang.String getTypeName() { * If the type is in the same protobuf package, the value can be the simple * message name e.g., `"MyMessage"`. Otherwise, the value must be the * fully-qualified message name e.g., `"google.library.v1.Book"`. - * * If the type(s) are unknown to the service (e.g. the field accepts generic * user input), use the wildcard `"*"` to denote this behavior. - * * See [AIP-202](https://google.aip.dev/202#type-references) for more details. * * @@ -538,10 +520,8 @@ public com.google.protobuf.ByteString getTypeNameBytes() { * If the type is in the same protobuf package, the value can be the simple * message name e.g., `"MyMessage"`. Otherwise, the value must be the * fully-qualified message name e.g., `"google.library.v1.Book"`. - * * If the type(s) are unknown to the service (e.g. the field accepts generic * user input), use the wildcard `"*"` to denote this behavior. - * * See [AIP-202](https://google.aip.dev/202#type-references) for more details. * * @@ -554,8 +534,8 @@ public Builder setTypeName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } + typeName_ = value; - bitField0_ |= 0x00000001; onChanged(); return this; } @@ -568,10 +548,8 @@ public Builder setTypeName(java.lang.String value) { * If the type is in the same protobuf package, the value can be the simple * message name e.g., `"MyMessage"`. Otherwise, the value must be the * fully-qualified message name e.g., `"google.library.v1.Book"`. - * * If the type(s) are unknown to the service (e.g. the field accepts generic * user input), use the wildcard `"*"` to denote this behavior. - * * See [AIP-202](https://google.aip.dev/202#type-references) for more details. * * @@ -580,8 +558,8 @@ public Builder setTypeName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTypeName() { + typeName_ = getDefaultInstance().getTypeName(); - bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -594,10 +572,8 @@ public Builder clearTypeName() { * If the type is in the same protobuf package, the value can be the simple * message name e.g., `"MyMessage"`. Otherwise, the value must be the * fully-qualified message name e.g., `"google.library.v1.Book"`. - * * If the type(s) are unknown to the service (e.g. the field accepts generic * user input), use the wildcard `"*"` to denote this behavior. - * * See [AIP-202](https://google.aip.dev/202#type-references) for more details. * * @@ -611,8 +587,8 @@ public Builder setTypeNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); + typeName_ = value; - bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/TypeReferenceOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/TypeReferenceOrBuilder.java index c5caef40cc..4a4da59bb7 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/TypeReferenceOrBuilder.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/TypeReferenceOrBuilder.java @@ -16,7 +16,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/api/field_info.proto -// Protobuf Java Version: 3.25.8 package com.google.api; public interface TypeReferenceOrBuilder @@ -32,10 +31,8 @@ public interface TypeReferenceOrBuilder * If the type is in the same protobuf package, the value can be the simple * message name e.g., `"MyMessage"`. Otherwise, the value must be the * fully-qualified message name e.g., `"google.library.v1.Book"`. - * * If the type(s) are unknown to the service (e.g. the field accepts generic * user input), use the wildcard `"*"` to denote this behavior. - * * See [AIP-202](https://google.aip.dev/202#type-references) for more details. * * @@ -53,10 +50,8 @@ public interface TypeReferenceOrBuilder * If the type is in the same protobuf package, the value can be the simple * message name e.g., `"MyMessage"`. Otherwise, the value must be the * fully-qualified message name e.g., `"google.library.v1.Book"`. - * * If the type(s) are unknown to the service (e.g. the field accepts generic * user input), use the wildcard `"*"` to denote this behavior. - * * See [AIP-202](https://google.aip.dev/202#type-references) for more details. * * 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 bbcae39b08..05ce34d055 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 @@ -16,7 +16,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/api/usage.proto -// Protobuf Java Version: 3.25.8 package com.google.api; /** @@ -40,7 +39,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_ = ""; } @@ -51,6 +50,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,10 +68,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_; /** * @@ -76,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 <service.name>/<requirement-id>; * 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 @@ -99,7 +99,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 <service.name>/<requirement-id>; * 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 @@ -122,7 +121,6 @@ public int getRequirementsCount() { * Requirements that must be satisfied before a consumer project can use the * service. Each requirement is of the form <service.name>/<requirement-id>; * 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 @@ -146,7 +144,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 <service.name>/<requirement-id>; * 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 @@ -164,8 +161,6 @@ public com.google.protobuf.ByteString getRequirementsBytes(int index) { } public static final int RULES_FIELD_NUMBER = 6; - - @SuppressWarnings("serial") private java.util.List rules_; /** @@ -173,7 +168,6 @@ public com.google.protobuf.ByteString getRequirementsBytes(int index) { * * 
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    *
* @@ -189,7 +183,6 @@ public java.util.List getRulesList() { * * 
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    *
* @@ -205,7 +198,6 @@ public java.util.List getRulesOrBui * * 
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    *
* @@ -221,7 +213,6 @@ public int getRulesCount() { * * 
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    *
* @@ -237,7 +228,6 @@ public com.google.api.UsageRule getRules(int index) { * * 
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    *
* @@ -249,9 +239,7 @@ public com.google.api.UsageRuleOrBuilder getRulesOrBuilder(int index) { } public static final int PRODUCER_NOTIFICATION_CHANNEL_FIELD_NUMBER = 7; - - @SuppressWarnings("serial") - private volatile java.lang.Object producerNotificationChannel_ = ""; + private volatile java.lang.Object producerNotificationChannel_; /** * @@ -259,7 +247,6 @@ public com.google.api.UsageRuleOrBuilder getRulesOrBuilder(int index) { * 
    * 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
@@ -290,7 +277,6 @@ public java.lang.String getProducerNotificationChannel() {
    * 
    * 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
@@ -537,8 +523,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     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 {
@@ -547,6 +533,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000002);
       producerNotificationChannel_ = "";
+
       return this;
     }
 
@@ -572,15 +559,12 @@ public com.google.api.Usage build() {
     @java.lang.Override
     public com.google.api.Usage buildPartial() {
       com.google.api.Usage result = new com.google.api.Usage(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        requirements_ = requirements_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.Usage result) {
+      result.requirements_ = requirements_;
       if (rulesBuilder_ == null) {
         if (((bitField0_ & 0x00000002) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
@@ -590,17 +574,9 @@ private void buildPartialRepeatedFields(com.google.api.Usage result) {
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-    }
-
-    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_;
-      }
+      result.producerNotificationChannel_ = producerNotificationChannel_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -651,7 +627,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_);
@@ -687,7 +663,6 @@ public Builder mergeFrom(com.google.api.Usage other) {
       }
       if (!other.getProducerNotificationChannel().isEmpty()) {
         producerNotificationChannel_ = other.producerNotificationChannel_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -738,7 +713,7 @@ public Builder mergeFrom(
             case 58:
               {
                 producerNotificationChannel_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 58
             default:
@@ -760,14 +735,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;
     }
 
     /**
@@ -777,7 +752,6 @@ private void ensureRequirementsIsMutable() {
      * Requirements that must be satisfied before a consumer project can use the
      * service. Each requirement is of the form <service.name>/<requirement-id>;
      * 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
@@ -790,8 +764,7 @@ private void ensureRequirementsIsMutable() {
      * @return A list containing the requirements.
      */
     public com.google.protobuf.ProtocolStringList getRequirementsList() {
-      requirements_.makeImmutable();
-      return requirements_;
+      return requirements_.getUnmodifiableView();
     }
 
     /**
@@ -801,7 +774,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 <service.name>/<requirement-id>;
      * 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
@@ -824,7 +796,6 @@ public int getRequirementsCount() {
      * Requirements that must be satisfied before a consumer project can use the
      * service. Each requirement is of the form <service.name>/<requirement-id>;
      * 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
@@ -848,7 +819,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 <service.name>/<requirement-id>;
      * 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
@@ -872,7 +842,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 <service.name>/<requirement-id>;
      * 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
@@ -892,7 +861,6 @@ public Builder setRequirements(int index, java.lang.String value) {
       }
       ensureRequirementsIsMutable();
       requirements_.set(index, value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -904,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 <service.name>/<requirement-id>;
      * 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
@@ -923,7 +890,6 @@ public Builder addRequirements(java.lang.String value) {
       }
       ensureRequirementsIsMutable();
       requirements_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -935,7 +901,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 <service.name>/<requirement-id>;
      * 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
@@ -951,7 +916,6 @@ public Builder addRequirements(java.lang.String value) {
     public Builder addAllRequirements(java.lang.Iterable values) {
       ensureRequirementsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, requirements_);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -963,7 +927,6 @@ public Builder addAllRequirements(java.lang.Iterable values) {
      * Requirements that must be satisfied before a consumer project can use the
      * service. Each requirement is of the form <service.name>/<requirement-id>;
      * 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
@@ -976,9 +939,8 @@ public Builder addAllRequirements(java.lang.Iterable 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;
     }
@@ -990,7 +952,6 @@ public Builder clearRequirements() {
      * Requirements that must be satisfied before a consumer project can use the
      * service. Each requirement is of the form <service.name>/<requirement-id>;
      * 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
@@ -1010,7 +971,6 @@ public Builder addRequirementsBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureRequirementsIsMutable();
       requirements_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1035,7 +995,6 @@ private void ensureRulesIsMutable() {
      *
      * 
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1054,7 +1013,6 @@ public java.util.List getRulesList() {
      *
      * 
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1073,7 +1031,6 @@ public int getRulesCount() {
      *
      * 
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1092,7 +1049,6 @@ public com.google.api.UsageRule getRules(int index) {
      *
      * 
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1117,7 +1073,6 @@ public Builder setRules(int index, com.google.api.UsageRule value) {
      *
      * 
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1139,7 +1094,6 @@ public Builder setRules(int index, com.google.api.UsageRule.Builder builderForVa
      *
      * 
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1164,7 +1118,6 @@ public Builder addRules(com.google.api.UsageRule value) {
      *
      * 
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1189,7 +1142,6 @@ public Builder addRules(int index, com.google.api.UsageRule value) {
      *
      * 
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1211,7 +1163,6 @@ public Builder addRules(com.google.api.UsageRule.Builder builderForValue) {
      *
      * 
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1233,7 +1184,6 @@ public Builder addRules(int index, com.google.api.UsageRule.Builder builderForVa
      *
      * 
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1255,7 +1205,6 @@ public Builder addAllRules(java.lang.Iterable
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1277,7 +1226,6 @@ public Builder clearRules() {
      *
      * 
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1299,7 +1247,6 @@ public Builder removeRules(int index) {
      *
      * 
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1314,7 +1261,6 @@ public com.google.api.UsageRule.Builder getRulesBuilder(int index) {
      *
      * 
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1333,7 +1279,6 @@ public com.google.api.UsageRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * 
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1352,7 +1297,6 @@ public java.util.List getRulesOrBui
      *
      * 
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1367,7 +1311,6 @@ public com.google.api.UsageRule.Builder addRulesBuilder() {
      *
      * 
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1383,7 +1326,6 @@ public com.google.api.UsageRule.Builder addRulesBuilder(int index) {
      *
      * 
      * A list of usage rules that apply to individual API methods.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -1418,7 +1360,6 @@ public java.util.List getRulesBuilderList() {
      * 
      * 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
@@ -1448,7 +1389,6 @@ public java.lang.String getProducerNotificationChannel() {
      * 
      * 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
@@ -1478,7 +1418,6 @@ public com.google.protobuf.ByteString getProducerNotificationChannelBytes() {
      * 
      * 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
@@ -1495,8 +1434,8 @@ public Builder setProducerNotificationChannel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       producerNotificationChannel_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1507,7 +1446,6 @@ public Builder setProducerNotificationChannel(java.lang.String value) {
      * 
      * 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
@@ -1520,8 +1458,8 @@ public Builder setProducerNotificationChannel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProducerNotificationChannel() {
+
       producerNotificationChannel_ = getDefaultInstance().getProducerNotificationChannel();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1532,7 +1470,6 @@ public Builder clearProducerNotificationChannel() {
      * 
      * 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
@@ -1550,8 +1487,8 @@ public Builder setProducerNotificationChannelBytes(com.google.protobuf.ByteStrin
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       producerNotificationChannel_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
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 527ddab80b..1c73490602 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/usage.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface UsageOrBuilder
@@ -31,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 <service.name>/<requirement-id>;
    * 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
@@ -52,7 +50,6 @@ public interface UsageOrBuilder
    * Requirements that must be satisfied before a consumer project can use the
    * service. Each requirement is of the form <service.name>/<requirement-id>;
    * 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
@@ -73,7 +70,6 @@ public interface UsageOrBuilder
    * Requirements that must be satisfied before a consumer project can use the
    * service. Each requirement is of the form <service.name>/<requirement-id>;
    * 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 +91,6 @@ public interface UsageOrBuilder
    * Requirements that must be satisfied before a consumer project can use the
    * service. Each requirement is of the form <service.name>/<requirement-id>;
    * 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
@@ -115,7 +110,6 @@ public interface UsageOrBuilder
    *
    * 
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -128,7 +122,6 @@ public interface UsageOrBuilder
    *
    * 
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -141,7 +134,6 @@ public interface UsageOrBuilder
    *
    * 
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -154,7 +146,6 @@ public interface UsageOrBuilder
    *
    * 
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -167,7 +158,6 @@ public interface UsageOrBuilder
    *
    * 
    * A list of usage rules that apply to individual API methods.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -181,7 +171,6 @@ public interface UsageOrBuilder
    * 
    * 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
@@ -201,7 +190,6 @@ public interface UsageOrBuilder
    * 
    * 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/UsageProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/UsageProto.java
index 4c6736a19b..de01a2edbf 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/UsageProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/UsageProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/usage.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class UsageProto {
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 2f22d40238..8c1abbbb64 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/usage.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -24,26 +23,19 @@
  *
  * 
  * 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"
@@ -73,6 +65,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;
   }
@@ -86,9 +83,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object selector_ = "";
+  private volatile java.lang.Object selector_;
 
   /**
    *
@@ -96,7 +91,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * 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.
    * 

@@ -124,7 +118,6 @@ public java.lang.String getSelector() {
    * 
    * 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.
    * 

@@ -147,7 +140,7 @@ public com.google.protobuf.ByteString getSelectorBytes() {
   }
 
   public static final int ALLOW_UNREGISTERED_CALLS_FIELD_NUMBER = 2;
-  private boolean allowUnregisteredCalls_ = false;
+  private boolean allowUnregisteredCalls_;
 
   /**
    *
@@ -167,7 +160,7 @@ public boolean getAllowUnregisteredCalls() {
   }
 
   public static final int SKIP_SERVICE_CONTROL_FIELD_NUMBER = 3;
-  private boolean skipServiceControl_ = false;
+  private boolean skipServiceControl_;
 
   /**
    *
@@ -369,26 +362,19 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * 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"
@@ -423,10 +409,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       selector_ = "";
+
       allowUnregisteredCalls_ = false;
+
       skipServiceControl_ = false;
+
       return this;
     }
 
@@ -452,26 +440,13 @@ public com.google.api.UsageRule build() {
     @java.lang.Override
     public com.google.api.UsageRule buildPartial() {
       com.google.api.UsageRule result = new com.google.api.UsageRule(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.selector_ = selector_;
+      result.allowUnregisteredCalls_ = allowUnregisteredCalls_;
+      result.skipServiceControl_ = skipServiceControl_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.UsageRule result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.selector_ = selector_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.allowUnregisteredCalls_ = allowUnregisteredCalls_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.skipServiceControl_ = skipServiceControl_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -519,7 +494,6 @@ public Builder mergeFrom(com.google.api.UsageRule other) {
       if (other == com.google.api.UsageRule.getDefaultInstance()) return this;
       if (!other.getSelector().isEmpty()) {
         selector_ = other.selector_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getAllowUnregisteredCalls() != false) {
@@ -557,19 +531,19 @@ public Builder mergeFrom(
             case 10:
               {
                 selector_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 allowUnregisteredCalls_ = input.readBool();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 24:
               {
                 skipServiceControl_ = input.readBool();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             default:
@@ -589,8 +563,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object selector_ = "";
 
     /**
@@ -599,7 +571,6 @@ public Builder mergeFrom(
      * 
      * 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.
      * 

@@ -626,7 +597,6 @@ public java.lang.String getSelector() {
      * 
      * 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.
      * 

@@ -653,7 +623,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      * 
      * 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.
      * 

@@ -667,8 +636,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -679,7 +648,6 @@ public Builder setSelector(java.lang.String value) {
      * 
      * 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.
      * 

@@ -689,8 +657,8 @@ public Builder setSelector(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSelector() {
+
       selector_ = getDefaultInstance().getSelector();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -701,7 +669,6 @@ public Builder clearSelector() {
      * 
      * 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.
      * 

@@ -716,8 +683,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -757,7 +724,6 @@ public boolean getAllowUnregisteredCalls() {
     public Builder setAllowUnregisteredCalls(boolean value) {
 
       allowUnregisteredCalls_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -775,7 +741,7 @@ public Builder setAllowUnregisteredCalls(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearAllowUnregisteredCalls() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       allowUnregisteredCalls_ = false;
       onChanged();
       return this;
@@ -820,7 +786,6 @@ public boolean getSkipServiceControl() {
     public Builder setSkipServiceControl(boolean value) {
 
       skipServiceControl_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -840,7 +805,7 @@ public Builder setSkipServiceControl(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearSkipServiceControl() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       skipServiceControl_ = false;
       onChanged();
       return this;
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 edb401fee1..4411717e76 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/usage.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface UsageRuleOrBuilder
@@ -30,7 +29,6 @@ public interface UsageRuleOrBuilder
    * 
    * 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.
    * 

@@ -47,7 +45,6 @@ public interface UsageRuleOrBuilder
    * 
    * 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.
    * 

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 8e5777bfc7..b884585670 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/visibility.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -27,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.
  * 

@@ -71,6 +65,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;
   }
@@ -84,8 +83,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RULES_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List rules_;
 
   /**
@@ -93,7 +90,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -109,7 +105,6 @@ public java.util.List getRulesList() {
    *
    * 
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -125,7 +120,6 @@ public java.util.List getRules
    *
    * 
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -141,7 +135,6 @@ public int getRulesCount() {
    *
    * 
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -157,7 +150,6 @@ public com.google.api.VisibilityRule getRules(int index) {
    *
    * 
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -336,23 +328,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.
    * 

@@ -385,7 +372,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
       } else {
@@ -418,15 +404,7 @@ public com.google.api.Visibility build() {
     @java.lang.Override
     public com.google.api.Visibility buildPartial() {
       com.google.api.Visibility result = new com.google.api.Visibility(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.api.Visibility result) {
+      int from_bitField0_ = bitField0_;
       if (rulesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
@@ -436,10 +414,8 @@ private void buildPartialRepeatedFields(com.google.api.Visibility result) {
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.api.Visibility result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -592,7 +568,6 @@ private void ensureRulesIsMutable() {
      *
      * 
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -611,7 +586,6 @@ public java.util.List getRulesList() {
      *
      * 
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -630,7 +604,6 @@ public int getRulesCount() {
      *
      * 
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -649,7 +622,6 @@ public com.google.api.VisibilityRule getRules(int index) {
      *
      * 
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -674,7 +646,6 @@ public Builder setRules(int index, com.google.api.VisibilityRule value) {
      *
      * 
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -696,7 +667,6 @@ public Builder setRules(int index, com.google.api.VisibilityRule.Builder builder
      *
      * 
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -721,7 +691,6 @@ public Builder addRules(com.google.api.VisibilityRule value) {
      *
      * 
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -746,7 +715,6 @@ public Builder addRules(int index, com.google.api.VisibilityRule value) {
      *
      * 
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -768,7 +736,6 @@ public Builder addRules(com.google.api.VisibilityRule.Builder builderForValue) {
      *
      * 
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -790,7 +757,6 @@ public Builder addRules(int index, com.google.api.VisibilityRule.Builder builder
      *
      * 
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -812,7 +778,6 @@ public Builder addAllRules(java.lang.Iterable
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -834,7 +799,6 @@ public Builder clearRules() {
      *
      * 
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -856,7 +820,6 @@ public Builder removeRules(int index) {
      *
      * 
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -871,7 +834,6 @@ public com.google.api.VisibilityRule.Builder getRulesBuilder(int index) {
      *
      * 
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -890,7 +852,6 @@ public com.google.api.VisibilityRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * 
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -910,7 +871,6 @@ public com.google.api.VisibilityRuleOrBuilder getRulesOrBuilder(int index) {
      *
      * 
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -925,7 +885,6 @@ public com.google.api.VisibilityRule.Builder addRulesBuilder() {
      *
      * 
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
@@ -941,7 +900,6 @@ public com.google.api.VisibilityRule.Builder addRulesBuilder(int index) {
      *
      * 
      * A list of visibility rules that apply to individual API elements.
-     *
      * **NOTE:** All service configuration rules follow "last one wins" order.
      * 

      *
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 c25ea51984..6dbfc578c1 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/visibility.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface VisibilityOrBuilder
@@ -29,7 +28,6 @@ public interface VisibilityOrBuilder
    *
    * 
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -42,7 +40,6 @@ public interface VisibilityOrBuilder
    *
    * 
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -55,7 +52,6 @@ public interface VisibilityOrBuilder
    *
    * 
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -68,7 +64,6 @@ public interface VisibilityOrBuilder
    *
    * 
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
@@ -81,7 +76,6 @@ public interface VisibilityOrBuilder
    *
    * 
    * A list of visibility rules that apply to individual API elements.
-   *
    * **NOTE:** All service configuration rules follow "last one wins" order.
    * 

    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityProto.java
index 0422158045..2a66990716 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/VisibilityProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/visibility.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public final class VisibilityProto {
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 414065ff54..ed4be3ac22 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/visibility.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 /**
@@ -51,6 +50,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;
   }
@@ -65,16 +69,13 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SELECTOR_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object selector_ = "";
+  private volatile java.lang.Object selector_;
 
   /**
    *
    *
    * 
    * Selects methods, messages, fields, enums, etc. to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -101,7 +102,6 @@ public java.lang.String getSelector() {
    *
    * 
    * Selects methods, messages, fields, enums, etc. to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -124,9 +124,7 @@ public com.google.protobuf.ByteString getSelectorBytes() {
   }
 
   public static final int RESTRICTION_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object restriction_ = "";
+  private volatile java.lang.Object restriction_;
 
   /**
    *
@@ -134,17 +132,13 @@ public com.google.protobuf.ByteString getSelectorBytes() {
    * 
    * 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.
    * 

@@ -172,17 +166,13 @@ public java.lang.String getRestriction() {
    * 
    * 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.
    * 

@@ -408,9 +398,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       selector_ = "";
+
       restriction_ = "";
+
       return this;
     }
 
@@ -436,23 +427,12 @@ public com.google.api.VisibilityRule build() {
     @java.lang.Override
     public com.google.api.VisibilityRule buildPartial() {
       com.google.api.VisibilityRule result = new com.google.api.VisibilityRule(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.selector_ = selector_;
+      result.restriction_ = restriction_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.api.VisibilityRule result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.selector_ = selector_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.restriction_ = restriction_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -500,12 +480,10 @@ public Builder mergeFrom(com.google.api.VisibilityRule other) {
       if (other == com.google.api.VisibilityRule.getDefaultInstance()) return this;
       if (!other.getSelector().isEmpty()) {
         selector_ = other.selector_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getRestriction().isEmpty()) {
         restriction_ = other.restriction_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -537,13 +515,13 @@ public Builder mergeFrom(
             case 10:
               {
                 selector_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 restriction_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -563,8 +541,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object selector_ = "";
 
     /**
@@ -572,7 +548,6 @@ public Builder mergeFrom(
      *
      * 
      * Selects methods, messages, fields, enums, etc. to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -598,7 +573,6 @@ public java.lang.String getSelector() {
      *
      * 
      * Selects methods, messages, fields, enums, etc. to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -624,7 +598,6 @@ public com.google.protobuf.ByteString getSelectorBytes() {
      *
      * 
      * Selects methods, messages, fields, enums, etc. to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -638,8 +611,8 @@ public Builder setSelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -649,7 +622,6 @@ public Builder setSelector(java.lang.String value) {
      *
      * 
      * Selects methods, messages, fields, enums, etc. to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -659,8 +631,8 @@ public Builder setSelector(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSelector() {
+
       selector_ = getDefaultInstance().getSelector();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -670,7 +642,6 @@ public Builder clearSelector() {
      *
      * 
      * Selects methods, messages, fields, enums, etc. to which this rule applies.
-     *
      * Refer to [selector][google.api.DocumentationRule.selector] for syntax
      * details.
      * 

@@ -685,8 +656,8 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       selector_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -699,17 +670,13 @@ public Builder setSelectorBytes(com.google.protobuf.ByteString value) {
      * 
      * 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.
      * 

@@ -736,17 +703,13 @@ public java.lang.String getRestriction() {
      * 
      * 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.
      * 

@@ -773,17 +736,13 @@ public com.google.protobuf.ByteString getRestrictionBytes() {
      * 
      * 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.
      * 

@@ -797,8 +756,8 @@ public Builder setRestriction(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       restriction_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -809,17 +768,13 @@ public Builder setRestriction(java.lang.String value) {
      * 
      * 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.
      * 

@@ -829,8 +784,8 @@ public Builder setRestriction(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearRestriction() {
+
       restriction_ = getDefaultInstance().getRestriction();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -841,17 +796,13 @@ public Builder clearRestriction() {
      * 
      * 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.
      * 

@@ -866,8 +817,8 @@ public Builder setRestrictionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       restriction_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
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 53d210a238..2c8596f42c 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/visibility.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.api;
 
 public interface VisibilityRuleOrBuilder
@@ -29,7 +28,6 @@ public interface VisibilityRuleOrBuilder
    *
    * 
    * Selects methods, messages, fields, enums, etc. to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -45,7 +43,6 @@ public interface VisibilityRuleOrBuilder
    *
    * 
    * Selects methods, messages, fields, enums, etc. to which this rule applies.
-   *
    * Refer to [selector][google.api.DocumentationRule.selector] for syntax
    * details.
    * 

@@ -62,17 +59,13 @@ public interface VisibilityRuleOrBuilder
    * 
    * 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.
    * 

@@ -89,17 +82,13 @@ public interface VisibilityRuleOrBuilder
    * 
    * 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.
    * 

diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Action.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Action.java
index 28f4764d12..1f3ca465b3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Action.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Action.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -26,7 +25,6 @@
  * An action that describes the behavior when the form is submitted.
  * For example, you can invoke an Apps Script script to handle the form.
  * If the action is triggered, the form values are sent to the server.
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
  * 

@@ -49,7 +47,7 @@ private Action() {
     parameters_ = java.util.Collections.emptyList();
     loadIndicator_ = 0;
     interaction_ = 0;
-    requiredWidgets_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    requiredWidgets_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
   @java.lang.Override
@@ -58,6 +56,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Action();
   }
 
+  @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.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Action_descriptor;
   }
@@ -77,7 +80,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * Specifies the loading indicator that the action displays while
    * making the call to the action.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -217,20 +219,15 @@ private LoadIndicator(int value) {
    * 
    * Optional. Required when opening a
    * [dialog](https://developers.google.com/workspace/chat/dialogs).
-   *
    * What to do in response to an interaction with a user, such as a user
    * clicking a button in a card message.
-   *
    * If unspecified, the app responds by executing an `action`—like opening a
    * link or running a function—as normal.
-   *
    * By specifying an `interaction`, the app can respond in special interactive
    * ways. For example, by setting `interaction` to `OPEN_DIALOG`, the app can
    * open a [dialog](https://developers.google.com/workspace/chat/dialogs).
-   *
    * When specified, a loading indicator isn't shown. If specified for
    * an add-on, the entire card is stripped and nothing is shown in the client.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -253,12 +250,10 @@ public enum Interaction implements com.google.protobuf.ProtocolMessageEnum {
      * 
      * Opens a [dialog](https://developers.google.com/workspace/chat/dialogs), a
      * windowed, card-based interface that Chat apps use to interact with users.
-     *
      * Only supported by Chat apps in response to button-clicks on card
      * messages. If specified for
      * an add-on, the entire card is stripped and nothing is shown in the
      * client.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -285,12 +280,10 @@ public enum Interaction implements com.google.protobuf.ProtocolMessageEnum {
      * 
      * Opens a [dialog](https://developers.google.com/workspace/chat/dialogs), a
      * windowed, card-based interface that Chat apps use to interact with users.
-     *
      * Only supported by Chat apps in response to button-clicks on card
      * messages. If specified for
      * an add-on, the entire card is stripped and nothing is shown in the
      * client.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -445,10 +438,8 @@ public interface ActionParameterOrBuilder
    * For example, consider three snooze buttons: snooze now, snooze one day,
    * or snooze next week. You might use `action method = snooze()`, passing the
    * snooze type and snooze time in the list of string parameters.
-   *
    * To learn more, see
    * [`CommonEventObject`](https://developers.google.com/workspace/chat/api/reference/rest/v1/Event#commoneventobject).
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -477,6 +468,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new ActionParameter();
     }
 
+    @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.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Action_ActionParameter_descriptor;
@@ -493,9 +489,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int KEY_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object key_ = "";
+    private volatile java.lang.Object key_;
 
     /**
      *
@@ -546,9 +540,7 @@ public com.google.protobuf.ByteString getKeyBytes() {
     }
 
     public static final int VALUE_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object value_ = "";
+    private volatile java.lang.Object value_;
 
     /**
      *
@@ -776,10 +768,8 @@ protected Builder newBuilderForType(
      * For example, consider three snooze buttons: snooze now, snooze one day,
      * or snooze next week. You might use `action method = snooze()`, passing the
      * snooze type and snooze time in the list of string parameters.
-     *
      * To learn more, see
      * [`CommonEventObject`](https://developers.google.com/workspace/chat/api/reference/rest/v1/Event#commoneventobject).
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -816,9 +806,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         key_ = "";
+
         value_ = "";
+
         return this;
       }
 
@@ -846,23 +837,12 @@ public com.google.apps.card.v1.Action.ActionParameter build() {
       public com.google.apps.card.v1.Action.ActionParameter buildPartial() {
         com.google.apps.card.v1.Action.ActionParameter result =
             new com.google.apps.card.v1.Action.ActionParameter(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        result.key_ = key_;
+        result.value_ = value_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.apps.card.v1.Action.ActionParameter result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.key_ = key_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.value_ = value_;
-        }
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -913,12 +893,10 @@ public Builder mergeFrom(com.google.apps.card.v1.Action.ActionParameter other) {
           return this;
         if (!other.getKey().isEmpty()) {
           key_ = other.key_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getValue().isEmpty()) {
           value_ = other.value_;
-          bitField0_ |= 0x00000002;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -950,13 +928,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   key_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   value_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               default:
@@ -976,8 +954,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private java.lang.Object key_ = "";
 
       /**
@@ -1042,8 +1018,8 @@ public Builder setKey(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         key_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1060,8 +1036,8 @@ public Builder setKey(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearKey() {
+
         key_ = getDefaultInstance().getKey();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1083,8 +1059,8 @@ public Builder setKeyBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         key_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1153,8 +1129,8 @@ public Builder setValue(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         value_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1171,8 +1147,8 @@ public Builder setValue(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearValue() {
+
         value_ = getDefaultInstance().getValue();
-        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1194,8 +1170,8 @@ public Builder setValueBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         value_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1265,9 +1241,7 @@ public com.google.apps.card.v1.Action.ActionParameter getDefaultInstanceForType(
   }
 
   public static final int FUNCTION_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object function_ = "";
+  private volatile java.lang.Object function_;
 
   /**
    *
@@ -1275,7 +1249,6 @@ public com.google.apps.card.v1.Action.ActionParameter getDefaultInstanceForType(
    * 
    * A custom function to invoke when the containing element is
    * clicked or otherwise activated.
-   *
    * For example usage, see [Read form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -1303,7 +1276,6 @@ public java.lang.String getFunction() {
    * 
    * A custom function to invoke when the containing element is
    * clicked or otherwise activated.
-   *
    * For example usage, see [Read form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -1326,8 +1298,6 @@ public com.google.protobuf.ByteString getFunctionBytes() {
   }
 
   public static final int PARAMETERS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List parameters_;
 
   /**
@@ -1402,7 +1372,7 @@ public com.google.apps.card.v1.Action.ActionParameterOrBuilder getParametersOrBu
   }
 
   public static final int LOAD_INDICATOR_FIELD_NUMBER = 3;
-  private int loadIndicator_ = 0;
+  private int loadIndicator_;
 
   /**
    *
@@ -1435,13 +1405,14 @@ public int getLoadIndicatorValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.Action.LoadIndicator getLoadIndicator() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.Action.LoadIndicator result =
-        com.google.apps.card.v1.Action.LoadIndicator.forNumber(loadIndicator_);
+        com.google.apps.card.v1.Action.LoadIndicator.valueOf(loadIndicator_);
     return result == null ? com.google.apps.card.v1.Action.LoadIndicator.UNRECOGNIZED : result;
   }
 
   public static final int PERSIST_VALUES_FIELD_NUMBER = 4;
-  private boolean persistValues_ = false;
+  private boolean persistValues_;
 
   /**
    *
@@ -1449,7 +1420,6 @@ public com.google.apps.card.v1.Action.LoadIndicator getLoadIndicator() {
    * 
    * Indicates whether form values persist after the action. The default value
    * is `false`.
-   *
    * If `true`, form values remain after the action is triggered. To let the
    * user make changes while the action is being processed, set
    * [`LoadIndicator`](https://developers.google.com/workspace/add-ons/reference/rpc/google.apps.card.v1#loadindicator)
@@ -1460,7 +1430,6 @@ public com.google.apps.card.v1.Action.LoadIndicator getLoadIndicator() {
    * to `UPDATE_MESSAGE` and use the same
    * [`card_id`](https://developers.google.com/workspace/chat/api/reference/rest/v1/spaces.messages#CardWithId)
    * from the card that contained the action.
-   *
    * If `false`, the form values are cleared when the action is triggered.
    * To prevent the user from making changes while the action is being
    * processed, set
@@ -1478,7 +1447,7 @@ public boolean getPersistValues() {
   }
 
   public static final int INTERACTION_FIELD_NUMBER = 5;
-  private int interaction_ = 0;
+  private int interaction_;
 
   /**
    *
@@ -1486,19 +1455,15 @@ public boolean getPersistValues() {
    * 
    * Optional. Required when opening a
    * [dialog](https://developers.google.com/workspace/chat/dialogs).
-   *
    * What to do in response to an interaction with a user, such as a user
    * clicking a button in a card message.
-   *
    * If unspecified, the app responds by executing an `action`—like opening a
    * link or running a function—as normal.
-   *
    * By specifying an `interaction`, the app can respond in special interactive
    * ways. For example, by setting `interaction` to `OPEN_DIALOG`, the app can
    * open a [dialog](https://developers.google.com/workspace/chat/dialogs). When
    * specified, a loading indicator isn't shown. If specified for
    * an add-on, the entire card is stripped and nothing is shown in the client.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -1517,19 +1482,15 @@ public int getInteractionValue() {
    * 
    * Optional. Required when opening a
    * [dialog](https://developers.google.com/workspace/chat/dialogs).
-   *
    * What to do in response to an interaction with a user, such as a user
    * clicking a button in a card message.
-   *
    * If unspecified, the app responds by executing an `action`—like opening a
    * link or running a function—as normal.
-   *
    * By specifying an `interaction`, the app can respond in special interactive
    * ways. For example, by setting `interaction` to `OPEN_DIALOG`, the app can
    * open a [dialog](https://developers.google.com/workspace/chat/dialogs). When
    * specified, a loading indicator isn't shown. If specified for
    * an add-on, the entire card is stripped and nothing is shown in the client.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -1539,16 +1500,14 @@ public int getInteractionValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.Action.Interaction getInteraction() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.Action.Interaction result =
-        com.google.apps.card.v1.Action.Interaction.forNumber(interaction_);
+        com.google.apps.card.v1.Action.Interaction.valueOf(interaction_);
     return result == null ? com.google.apps.card.v1.Action.Interaction.UNRECOGNIZED : result;
   }
 
   public static final int REQUIRED_WIDGETS_FIELD_NUMBER = 6;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList requiredWidgets_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList requiredWidgets_;
 
   /**
    *
@@ -1556,10 +1515,8 @@ public com.google.apps.card.v1.Action.Interaction getInteraction() {
    * 
    * Optional. Fill this list with the names of widgets that this Action
    * needs for a valid submission.
-   *
    * If the widgets listed here don't have a value when this Action is invoked,
    * the form submission is aborted.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -1578,10 +1535,8 @@ public com.google.protobuf.ProtocolStringList getRequiredWidgetsList() {
    * 
    * Optional. Fill this list with the names of widgets that this Action
    * needs for a valid submission.
-   *
    * If the widgets listed here don't have a value when this Action is invoked,
    * the form submission is aborted.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -1600,10 +1555,8 @@ public int getRequiredWidgetsCount() {
    * 
    * Optional. Fill this list with the names of widgets that this Action
    * needs for a valid submission.
-   *
    * If the widgets listed here don't have a value when this Action is invoked,
    * the form submission is aborted.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -1623,10 +1576,8 @@ public java.lang.String getRequiredWidgets(int index) {
    * 
    * Optional. Fill this list with the names of widgets that this Action
    * needs for a valid submission.
-   *
    * If the widgets listed here don't have a value when this Action is invoked,
    * the form submission is aborted.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -1641,7 +1592,7 @@ public com.google.protobuf.ByteString getRequiredWidgetsBytes(int index) {
   }
 
   public static final int ALL_WIDGETS_ARE_REQUIRED_FIELD_NUMBER = 7;
-  private boolean allWidgetsAreRequired_ = false;
+  private boolean allWidgetsAreRequired_;
 
   /**
    *
@@ -1649,7 +1600,6 @@ public com.google.protobuf.ByteString getRequiredWidgetsBytes(int index) {
    * 
    * Optional. If this is true, then all widgets are considered required by
    * this action.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -1893,7 +1843,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * An action that describes the behavior when the form is submitted.
    * For example, you can invoke an Apps Script script to handle the form.
    * If the action is triggered, the form values are sent to the server.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -1928,20 +1877,25 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       function_ = "";
+
       if (parametersBuilder_ == null) {
         parameters_ = java.util.Collections.emptyList();
       } else {
         parameters_ = null;
         parametersBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       loadIndicator_ = 0;
+
       persistValues_ = false;
+
       interaction_ = 0;
-      requiredWidgets_ = com.google.protobuf.LazyStringArrayList.emptyList();
+
+      requiredWidgets_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
       allWidgetsAreRequired_ = false;
+
       return this;
     }
 
@@ -1968,47 +1922,28 @@ public com.google.apps.card.v1.Action build() {
     @java.lang.Override
     public com.google.apps.card.v1.Action buildPartial() {
       com.google.apps.card.v1.Action result = new com.google.apps.card.v1.Action(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.apps.card.v1.Action result) {
+      int from_bitField0_ = bitField0_;
+      result.function_ = function_;
       if (parametersBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           parameters_ = java.util.Collections.unmodifiableList(parameters_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.parameters_ = parameters_;
       } else {
         result.parameters_ = parametersBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.apps.card.v1.Action result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.function_ = function_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.loadIndicator_ = loadIndicator_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.persistValues_ = persistValues_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.interaction_ = interaction_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        requiredWidgets_.makeImmutable();
-        result.requiredWidgets_ = requiredWidgets_;
-      }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.allWidgetsAreRequired_ = allWidgetsAreRequired_;
+      result.loadIndicator_ = loadIndicator_;
+      result.persistValues_ = persistValues_;
+      result.interaction_ = interaction_;
+      if (((bitField0_ & 0x00000002) != 0)) {
+        requiredWidgets_ = requiredWidgets_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
       }
+      result.requiredWidgets_ = requiredWidgets_;
+      result.allWidgetsAreRequired_ = allWidgetsAreRequired_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -2058,14 +1993,13 @@ public Builder mergeFrom(com.google.apps.card.v1.Action other) {
       if (other == com.google.apps.card.v1.Action.getDefaultInstance()) return this;
       if (!other.getFunction().isEmpty()) {
         function_ = other.function_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (parametersBuilder_ == null) {
         if (!other.parameters_.isEmpty()) {
           if (parameters_.isEmpty()) {
             parameters_ = other.parameters_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureParametersIsMutable();
             parameters_.addAll(other.parameters_);
@@ -2078,7 +2012,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Action other) {
             parametersBuilder_.dispose();
             parametersBuilder_ = null;
             parameters_ = other.parameters_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             parametersBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getParametersFieldBuilder()
@@ -2100,7 +2034,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Action other) {
       if (!other.requiredWidgets_.isEmpty()) {
         if (requiredWidgets_.isEmpty()) {
           requiredWidgets_ = other.requiredWidgets_;
-          bitField0_ |= 0x00000020;
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureRequiredWidgetsIsMutable();
           requiredWidgets_.addAll(other.requiredWidgets_);
@@ -2139,7 +2073,7 @@ public Builder mergeFrom(
             case 10:
               {
                 function_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -2158,19 +2092,19 @@ public Builder mergeFrom(
             case 24:
               {
                 loadIndicator_ = input.readEnum();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 32:
               {
                 persistValues_ = input.readBool();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             case 40:
               {
                 interaction_ = input.readEnum();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 40
             case 50:
@@ -2183,7 +2117,7 @@ public Builder mergeFrom(
             case 56:
               {
                 allWidgetsAreRequired_ = input.readBool();
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 56
             default:
@@ -2213,7 +2147,6 @@ public Builder mergeFrom(
      * 
      * A custom function to invoke when the containing element is
      * clicked or otherwise activated.
-     *
      * For example usage, see [Read form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -2240,7 +2173,6 @@ public java.lang.String getFunction() {
      * 
      * A custom function to invoke when the containing element is
      * clicked or otherwise activated.
-     *
      * For example usage, see [Read form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -2267,7 +2199,6 @@ public com.google.protobuf.ByteString getFunctionBytes() {
      * 
      * A custom function to invoke when the containing element is
      * clicked or otherwise activated.
-     *
      * For example usage, see [Read form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -2281,8 +2212,8 @@ public Builder setFunction(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       function_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2293,7 +2224,6 @@ public Builder setFunction(java.lang.String value) {
      * 
      * A custom function to invoke when the containing element is
      * clicked or otherwise activated.
-     *
      * For example usage, see [Read form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -2303,8 +2233,8 @@ public Builder setFunction(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFunction() {
+
       function_ = getDefaultInstance().getFunction();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -2315,7 +2245,6 @@ public Builder clearFunction() {
      * 
      * A custom function to invoke when the containing element is
      * clicked or otherwise activated.
-     *
      * For example usage, see [Read form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -2330,8 +2259,8 @@ public Builder setFunctionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       function_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2340,10 +2269,10 @@ public Builder setFunctionBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureParametersIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         parameters_ =
             new java.util.ArrayList(parameters_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -2569,7 +2498,7 @@ public Builder addAllParameters(
     public Builder clearParameters() {
       if (parametersBuilder_ == null) {
         parameters_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         parametersBuilder_.clear();
@@ -2699,7 +2628,7 @@ public com.google.apps.card.v1.Action.ActionParameter.Builder addParametersBuild
                 com.google.apps.card.v1.Action.ActionParameter,
                 com.google.apps.card.v1.Action.ActionParameter.Builder,
                 com.google.apps.card.v1.Action.ActionParameterOrBuilder>(
-                parameters_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                parameters_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         parameters_ = null;
       }
       return parametersBuilder_;
@@ -2738,8 +2667,8 @@ public int getLoadIndicatorValue() {
      * @return This builder for chaining.
      */
     public Builder setLoadIndicatorValue(int value) {
+
       loadIndicator_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2758,8 +2687,9 @@ public Builder setLoadIndicatorValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.Action.LoadIndicator getLoadIndicator() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.Action.LoadIndicator result =
-          com.google.apps.card.v1.Action.LoadIndicator.forNumber(loadIndicator_);
+          com.google.apps.card.v1.Action.LoadIndicator.valueOf(loadIndicator_);
       return result == null ? com.google.apps.card.v1.Action.LoadIndicator.UNRECOGNIZED : result;
     }
 
@@ -2780,7 +2710,7 @@ public Builder setLoadIndicator(com.google.apps.card.v1.Action.LoadIndicator val
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000004;
+
       loadIndicator_ = value.getNumber();
       onChanged();
       return this;
@@ -2799,7 +2729,7 @@ public Builder setLoadIndicator(com.google.apps.card.v1.Action.LoadIndicator val
      * @return This builder for chaining.
      */
     public Builder clearLoadIndicator() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       loadIndicator_ = 0;
       onChanged();
       return this;
@@ -2813,7 +2743,6 @@ public Builder clearLoadIndicator() {
      * 
      * Indicates whether form values persist after the action. The default value
      * is `false`.
-     *
      * If `true`, form values remain after the action is triggered. To let the
      * user make changes while the action is being processed, set
      * [`LoadIndicator`](https://developers.google.com/workspace/add-ons/reference/rpc/google.apps.card.v1#loadindicator)
@@ -2824,7 +2753,6 @@ public Builder clearLoadIndicator() {
      * to `UPDATE_MESSAGE` and use the same
      * [`card_id`](https://developers.google.com/workspace/chat/api/reference/rest/v1/spaces.messages#CardWithId)
      * from the card that contained the action.
-     *
      * If `false`, the form values are cleared when the action is triggered.
      * To prevent the user from making changes while the action is being
      * processed, set
@@ -2847,7 +2775,6 @@ public boolean getPersistValues() {
      * 
      * Indicates whether form values persist after the action. The default value
      * is `false`.
-     *
      * If `true`, form values remain after the action is triggered. To let the
      * user make changes while the action is being processed, set
      * [`LoadIndicator`](https://developers.google.com/workspace/add-ons/reference/rpc/google.apps.card.v1#loadindicator)
@@ -2858,7 +2785,6 @@ public boolean getPersistValues() {
      * to `UPDATE_MESSAGE` and use the same
      * [`card_id`](https://developers.google.com/workspace/chat/api/reference/rest/v1/spaces.messages#CardWithId)
      * from the card that contained the action.
-     *
      * If `false`, the form values are cleared when the action is triggered.
      * To prevent the user from making changes while the action is being
      * processed, set
@@ -2874,7 +2800,6 @@ public boolean getPersistValues() {
     public Builder setPersistValues(boolean value) {
 
       persistValues_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2885,7 +2810,6 @@ public Builder setPersistValues(boolean value) {
      * 
      * Indicates whether form values persist after the action. The default value
      * is `false`.
-     *
      * If `true`, form values remain after the action is triggered. To let the
      * user make changes while the action is being processed, set
      * [`LoadIndicator`](https://developers.google.com/workspace/add-ons/reference/rpc/google.apps.card.v1#loadindicator)
@@ -2896,7 +2820,6 @@ public Builder setPersistValues(boolean value) {
      * to `UPDATE_MESSAGE` and use the same
      * [`card_id`](https://developers.google.com/workspace/chat/api/reference/rest/v1/spaces.messages#CardWithId)
      * from the card that contained the action.
-     *
      * If `false`, the form values are cleared when the action is triggered.
      * To prevent the user from making changes while the action is being
      * processed, set
@@ -2909,7 +2832,7 @@ public Builder setPersistValues(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearPersistValues() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       persistValues_ = false;
       onChanged();
       return this;
@@ -2923,19 +2846,15 @@ public Builder clearPersistValues() {
      * 
      * Optional. Required when opening a
      * [dialog](https://developers.google.com/workspace/chat/dialogs).
-     *
      * What to do in response to an interaction with a user, such as a user
      * clicking a button in a card message.
-     *
      * If unspecified, the app responds by executing an `action`—like opening a
      * link or running a function—as normal.
-     *
      * By specifying an `interaction`, the app can respond in special interactive
      * ways. For example, by setting `interaction` to `OPEN_DIALOG`, the app can
      * open a [dialog](https://developers.google.com/workspace/chat/dialogs). When
      * specified, a loading indicator isn't shown. If specified for
      * an add-on, the entire card is stripped and nothing is shown in the client.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -2954,19 +2873,15 @@ public int getInteractionValue() {
      * 
      * Optional. Required when opening a
      * [dialog](https://developers.google.com/workspace/chat/dialogs).
-     *
      * What to do in response to an interaction with a user, such as a user
      * clicking a button in a card message.
-     *
      * If unspecified, the app responds by executing an `action`—like opening a
      * link or running a function—as normal.
-     *
      * By specifying an `interaction`, the app can respond in special interactive
      * ways. For example, by setting `interaction` to `OPEN_DIALOG`, the app can
      * open a [dialog](https://developers.google.com/workspace/chat/dialogs). When
      * specified, a loading indicator isn't shown. If specified for
      * an add-on, the entire card is stripped and nothing is shown in the client.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -2976,8 +2891,8 @@ public int getInteractionValue() {
      * @return This builder for chaining.
      */
     public Builder setInteractionValue(int value) {
+
       interaction_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2988,19 +2903,15 @@ public Builder setInteractionValue(int value) {
      * 
      * Optional. Required when opening a
      * [dialog](https://developers.google.com/workspace/chat/dialogs).
-     *
      * What to do in response to an interaction with a user, such as a user
      * clicking a button in a card message.
-     *
      * If unspecified, the app responds by executing an `action`—like opening a
      * link or running a function—as normal.
-     *
      * By specifying an `interaction`, the app can respond in special interactive
      * ways. For example, by setting `interaction` to `OPEN_DIALOG`, the app can
      * open a [dialog](https://developers.google.com/workspace/chat/dialogs). When
      * specified, a loading indicator isn't shown. If specified for
      * an add-on, the entire card is stripped and nothing is shown in the client.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -3010,8 +2921,9 @@ public Builder setInteractionValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.Action.Interaction getInteraction() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.Action.Interaction result =
-          com.google.apps.card.v1.Action.Interaction.forNumber(interaction_);
+          com.google.apps.card.v1.Action.Interaction.valueOf(interaction_);
       return result == null ? com.google.apps.card.v1.Action.Interaction.UNRECOGNIZED : result;
     }
 
@@ -3021,19 +2933,15 @@ public com.google.apps.card.v1.Action.Interaction getInteraction() {
      * 
      * Optional. Required when opening a
      * [dialog](https://developers.google.com/workspace/chat/dialogs).
-     *
      * What to do in response to an interaction with a user, such as a user
      * clicking a button in a card message.
-     *
      * If unspecified, the app responds by executing an `action`—like opening a
      * link or running a function—as normal.
-     *
      * By specifying an `interaction`, the app can respond in special interactive
      * ways. For example, by setting `interaction` to `OPEN_DIALOG`, the app can
      * open a [dialog](https://developers.google.com/workspace/chat/dialogs). When
      * specified, a loading indicator isn't shown. If specified for
      * an add-on, the entire card is stripped and nothing is shown in the client.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -3046,7 +2954,7 @@ public Builder setInteraction(com.google.apps.card.v1.Action.Interaction value)
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000010;
+
       interaction_ = value.getNumber();
       onChanged();
       return this;
@@ -3058,19 +2966,15 @@ public Builder setInteraction(com.google.apps.card.v1.Action.Interaction value)
      * 
      * Optional. Required when opening a
      * [dialog](https://developers.google.com/workspace/chat/dialogs).
-     *
      * What to do in response to an interaction with a user, such as a user
      * clicking a button in a card message.
-     *
      * If unspecified, the app responds by executing an `action`—like opening a
      * link or running a function—as normal.
-     *
      * By specifying an `interaction`, the app can respond in special interactive
      * ways. For example, by setting `interaction` to `OPEN_DIALOG`, the app can
      * open a [dialog](https://developers.google.com/workspace/chat/dialogs). When
      * specified, a loading indicator isn't shown. If specified for
      * an add-on, the entire card is stripped and nothing is shown in the client.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -3079,20 +2983,20 @@ public Builder setInteraction(com.google.apps.card.v1.Action.Interaction value)
      * @return This builder for chaining.
      */
     public Builder clearInteraction() {
-      bitField0_ = (bitField0_ & ~0x00000010);
+
       interaction_ = 0;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList requiredWidgets_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList requiredWidgets_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureRequiredWidgetsIsMutable() {
-      if (!requiredWidgets_.isModifiable()) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         requiredWidgets_ = new com.google.protobuf.LazyStringArrayList(requiredWidgets_);
+        bitField0_ |= 0x00000002;
       }
-      bitField0_ |= 0x00000020;
     }
 
     /**
@@ -3101,10 +3005,8 @@ private void ensureRequiredWidgetsIsMutable() {
      * 
      * Optional. Fill this list with the names of widgets that this Action
      * needs for a valid submission.
-     *
      * If the widgets listed here don't have a value when this Action is invoked,
      * the form submission is aborted.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3114,8 +3016,7 @@ private void ensureRequiredWidgetsIsMutable() {
      * @return A list containing the requiredWidgets.
      */
     public com.google.protobuf.ProtocolStringList getRequiredWidgetsList() {
-      requiredWidgets_.makeImmutable();
-      return requiredWidgets_;
+      return requiredWidgets_.getUnmodifiableView();
     }
 
     /**
@@ -3124,10 +3025,8 @@ public com.google.protobuf.ProtocolStringList getRequiredWidgetsList() {
      * 
      * Optional. Fill this list with the names of widgets that this Action
      * needs for a valid submission.
-     *
      * If the widgets listed here don't have a value when this Action is invoked,
      * the form submission is aborted.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3146,10 +3045,8 @@ public int getRequiredWidgetsCount() {
      * 
      * Optional. Fill this list with the names of widgets that this Action
      * needs for a valid submission.
-     *
      * If the widgets listed here don't have a value when this Action is invoked,
      * the form submission is aborted.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3169,10 +3066,8 @@ public java.lang.String getRequiredWidgets(int index) {
      * 
      * Optional. Fill this list with the names of widgets that this Action
      * needs for a valid submission.
-     *
      * If the widgets listed here don't have a value when this Action is invoked,
      * the form submission is aborted.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3192,10 +3087,8 @@ public com.google.protobuf.ByteString getRequiredWidgetsBytes(int index) {
      * 
      * Optional. Fill this list with the names of widgets that this Action
      * needs for a valid submission.
-     *
      * If the widgets listed here don't have a value when this Action is invoked,
      * the form submission is aborted.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3212,7 +3105,6 @@ public Builder setRequiredWidgets(int index, java.lang.String value) {
       }
       ensureRequiredWidgetsIsMutable();
       requiredWidgets_.set(index, value);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -3223,10 +3115,8 @@ public Builder setRequiredWidgets(int index, java.lang.String value) {
      * 
      * Optional. Fill this list with the names of widgets that this Action
      * needs for a valid submission.
-     *
      * If the widgets listed here don't have a value when this Action is invoked,
      * the form submission is aborted.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3242,7 +3132,6 @@ public Builder addRequiredWidgets(java.lang.String value) {
       }
       ensureRequiredWidgetsIsMutable();
       requiredWidgets_.add(value);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -3253,10 +3142,8 @@ public Builder addRequiredWidgets(java.lang.String value) {
      * 
      * Optional. Fill this list with the names of widgets that this Action
      * needs for a valid submission.
-     *
      * If the widgets listed here don't have a value when this Action is invoked,
      * the form submission is aborted.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3269,7 +3156,6 @@ public Builder addRequiredWidgets(java.lang.String value) {
     public Builder addAllRequiredWidgets(java.lang.Iterable values) {
       ensureRequiredWidgetsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, requiredWidgets_);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -3280,10 +3166,8 @@ public Builder addAllRequiredWidgets(java.lang.Iterable values
      * 
      * Optional. Fill this list with the names of widgets that this Action
      * needs for a valid submission.
-     *
      * If the widgets listed here don't have a value when this Action is invoked,
      * the form submission is aborted.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3293,9 +3177,8 @@ public Builder addAllRequiredWidgets(java.lang.Iterable values
      * @return This builder for chaining.
      */
     public Builder clearRequiredWidgets() {
-      requiredWidgets_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000020);
-      ;
+      requiredWidgets_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -3306,10 +3189,8 @@ public Builder clearRequiredWidgets() {
      * 
      * Optional. Fill this list with the names of widgets that this Action
      * needs for a valid submission.
-     *
      * If the widgets listed here don't have a value when this Action is invoked,
      * the form submission is aborted.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3326,7 +3207,6 @@ public Builder addRequiredWidgetsBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureRequiredWidgetsIsMutable();
       requiredWidgets_.add(value);
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -3339,7 +3219,6 @@ public Builder addRequiredWidgetsBytes(com.google.protobuf.ByteString value) {
      * 
      * Optional. If this is true, then all widgets are considered required by
      * this action.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3359,7 +3238,6 @@ public boolean getAllWidgetsAreRequired() {
      * 
      * Optional. If this is true, then all widgets are considered required by
      * this action.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3372,7 +3250,6 @@ public boolean getAllWidgetsAreRequired() {
     public Builder setAllWidgetsAreRequired(boolean value) {
 
       allWidgetsAreRequired_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -3383,7 +3260,6 @@ public Builder setAllWidgetsAreRequired(boolean value) {
      * 
      * Optional. If this is true, then all widgets are considered required by
      * this action.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3393,7 +3269,7 @@ public Builder setAllWidgetsAreRequired(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearAllWidgetsAreRequired() {
-      bitField0_ = (bitField0_ & ~0x00000040);
+
       allWidgetsAreRequired_ = false;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ActionOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ActionOrBuilder.java
index 8edf767ad2..6f687aad27 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ActionOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ActionOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface ActionOrBuilder
@@ -30,7 +29,6 @@ public interface ActionOrBuilder
    * 
    * A custom function to invoke when the containing element is
    * clicked or otherwise activated.
-   *
    * For example usage, see [Read form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -47,7 +45,6 @@ public interface ActionOrBuilder
    * 
    * A custom function to invoke when the containing element is
    * clicked or otherwise activated.
-   *
    * For example usage, see [Read form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -148,7 +145,6 @@ public interface ActionOrBuilder
    * 
    * Indicates whether form values persist after the action. The default value
    * is `false`.
-   *
    * If `true`, form values remain after the action is triggered. To let the
    * user make changes while the action is being processed, set
    * [`LoadIndicator`](https://developers.google.com/workspace/add-ons/reference/rpc/google.apps.card.v1#loadindicator)
@@ -159,7 +155,6 @@ public interface ActionOrBuilder
    * to `UPDATE_MESSAGE` and use the same
    * [`card_id`](https://developers.google.com/workspace/chat/api/reference/rest/v1/spaces.messages#CardWithId)
    * from the card that contained the action.
-   *
    * If `false`, the form values are cleared when the action is triggered.
    * To prevent the user from making changes while the action is being
    * processed, set
@@ -179,19 +174,15 @@ public interface ActionOrBuilder
    * 
    * Optional. Required when opening a
    * [dialog](https://developers.google.com/workspace/chat/dialogs).
-   *
    * What to do in response to an interaction with a user, such as a user
    * clicking a button in a card message.
-   *
    * If unspecified, the app responds by executing an `action`—like opening a
    * link or running a function—as normal.
-   *
    * By specifying an `interaction`, the app can respond in special interactive
    * ways. For example, by setting `interaction` to `OPEN_DIALOG`, the app can
    * open a [dialog](https://developers.google.com/workspace/chat/dialogs). When
    * specified, a loading indicator isn't shown. If specified for
    * an add-on, the entire card is stripped and nothing is shown in the client.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -207,19 +198,15 @@ public interface ActionOrBuilder
    * 
    * Optional. Required when opening a
    * [dialog](https://developers.google.com/workspace/chat/dialogs).
-   *
    * What to do in response to an interaction with a user, such as a user
    * clicking a button in a card message.
-   *
    * If unspecified, the app responds by executing an `action`—like opening a
    * link or running a function—as normal.
-   *
    * By specifying an `interaction`, the app can respond in special interactive
    * ways. For example, by setting `interaction` to `OPEN_DIALOG`, the app can
    * open a [dialog](https://developers.google.com/workspace/chat/dialogs). When
    * specified, a loading indicator isn't shown. If specified for
    * an add-on, the entire card is stripped and nothing is shown in the client.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -235,10 +222,8 @@ public interface ActionOrBuilder
    * 
    * Optional. Fill this list with the names of widgets that this Action
    * needs for a valid submission.
-   *
    * If the widgets listed here don't have a value when this Action is invoked,
    * the form submission is aborted.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -255,10 +240,8 @@ public interface ActionOrBuilder
    * 
    * Optional. Fill this list with the names of widgets that this Action
    * needs for a valid submission.
-   *
    * If the widgets listed here don't have a value when this Action is invoked,
    * the form submission is aborted.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -275,10 +258,8 @@ public interface ActionOrBuilder
    * 
    * Optional. Fill this list with the names of widgets that this Action
    * needs for a valid submission.
-   *
    * If the widgets listed here don't have a value when this Action is invoked,
    * the form submission is aborted.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -296,10 +277,8 @@ public interface ActionOrBuilder
    * 
    * Optional. Fill this list with the names of widgets that this Action
    * needs for a valid submission.
-   *
    * If the widgets listed here don't have a value when this Action is invoked,
    * the form submission is aborted.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -317,7 +296,6 @@ public interface ActionOrBuilder
    * 
    * Optional. If this is true, then all widgets are considered required by
    * this action.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/BorderStyle.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/BorderStyle.java
index 3addf66de6..257547834e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/BorderStyle.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/BorderStyle.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -25,7 +24,6 @@
  * 
  * The style options for the border of a card or widget, including the border
  * type and color.
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
  * 

@@ -53,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new BorderStyle();
   }
 
+  @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.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_BorderStyle_descriptor;
@@ -73,7 +76,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * Represents the border types applied to widgets.
-   *
    * [Google Workspace add-ons
    * and Chat apps](https://developers.google.com/workspace/extend):
    * 

@@ -230,9 +232,8 @@ private BorderType(int value) {
     // @@protoc_insertion_point(enum_scope:google.apps.card.v1.BorderStyle.BorderType)
   }
 
-  private int bitField0_;
   public static final int TYPE_FIELD_NUMBER = 1;
-  private int type_ = 0;
+  private int type_;
 
   /**
    *
@@ -263,8 +264,9 @@ public int getTypeValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.BorderStyle.BorderType getType() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.BorderStyle.BorderType result =
-        com.google.apps.card.v1.BorderStyle.BorderType.forNumber(type_);
+        com.google.apps.card.v1.BorderStyle.BorderType.valueOf(type_);
     return result == null ? com.google.apps.card.v1.BorderStyle.BorderType.UNRECOGNIZED : result;
   }
 
@@ -276,15 +278,12 @@ public com.google.apps.card.v1.BorderStyle.BorderType getType() {
    *
    * 
    * The colors to use when the type is `BORDER_TYPE_STROKE`.
-   *
    * To set the stroke color, specify a value for the `red`, `green`, and `blue`
    * fields.
    * The value must be a float number between 0 and 1 based on the RGB color
    * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
    * represents the maximum intensity of the color.
-   *
    * For example, the following sets the color to red at its maximum intensity:
-   *
    * ```
    * "color": {
    *    "red": 1,
@@ -292,7 +291,6 @@ public com.google.apps.card.v1.BorderStyle.BorderType getType() {
    *    "blue": 0,
    * }
    * ```
-   *
    * The `alpha` field is unavailable for stroke color. If specified, this field
    * is ignored.
    * 

@@ -303,7 +301,7 @@ public com.google.apps.card.v1.BorderStyle.BorderType getType() {
    */
   @java.lang.Override
   public boolean hasStrokeColor() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return strokeColor_ != null;
   }
 
   /**
@@ -311,15 +309,12 @@ public boolean hasStrokeColor() {
    *
    * 
    * The colors to use when the type is `BORDER_TYPE_STROKE`.
-   *
    * To set the stroke color, specify a value for the `red`, `green`, and `blue`
    * fields.
    * The value must be a float number between 0 and 1 based on the RGB color
    * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
    * represents the maximum intensity of the color.
-   *
    * For example, the following sets the color to red at its maximum intensity:
-   *
    * ```
    * "color": {
    *    "red": 1,
@@ -327,7 +322,6 @@ public boolean hasStrokeColor() {
    *    "blue": 0,
    * }
    * ```
-   *
    * The `alpha` field is unavailable for stroke color. If specified, this field
    * is ignored.
    * 

@@ -346,15 +340,12 @@ public com.google.type.Color getStrokeColor() {
    *
    * 
    * The colors to use when the type is `BORDER_TYPE_STROKE`.
-   *
    * To set the stroke color, specify a value for the `red`, `green`, and `blue`
    * fields.
    * The value must be a float number between 0 and 1 based on the RGB color
    * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
    * represents the maximum intensity of the color.
-   *
    * For example, the following sets the color to red at its maximum intensity:
-   *
    * ```
    * "color": {
    *    "red": 1,
@@ -362,7 +353,6 @@ public com.google.type.Color getStrokeColor() {
    *    "blue": 0,
    * }
    * ```
-   *
    * The `alpha` field is unavailable for stroke color. If specified, this field
    * is ignored.
    * 

@@ -371,11 +361,11 @@ public com.google.type.Color getStrokeColor() {
    */
   @java.lang.Override
   public com.google.type.ColorOrBuilder getStrokeColorOrBuilder() {
-    return strokeColor_ == null ? com.google.type.Color.getDefaultInstance() : strokeColor_;
+    return getStrokeColor();
   }
 
   public static final int CORNER_RADIUS_FIELD_NUMBER = 3;
-  private int cornerRadius_ = 0;
+  private int cornerRadius_;
 
   /**
    *
@@ -411,7 +401,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         != com.google.apps.card.v1.BorderStyle.BorderType.BORDER_TYPE_UNSPECIFIED.getNumber()) {
       output.writeEnum(1, type_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (strokeColor_ != null) {
       output.writeMessage(2, getStrokeColor());
     }
     if (cornerRadius_ != 0) {
@@ -430,7 +420,7 @@ public int getSerializedSize() {
         != com.google.apps.card.v1.BorderStyle.BorderType.BORDER_TYPE_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, type_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (strokeColor_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getStrokeColor());
     }
     if (cornerRadius_ != 0) {
@@ -582,7 +572,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * 
    * The style options for the border of a card or widget, including the border
    * type and color.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -609,32 +598,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.BorderStyle.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getStrokeColorFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       type_ = 0;
-      strokeColor_ = null;
-      if (strokeColorBuilder_ != null) {
-        strokeColorBuilder_.dispose();
+
+      if (strokeColorBuilder_ == null) {
+        strokeColor_ = null;
+      } else {
+        strokeColor_ = null;
         strokeColorBuilder_ = null;
       }
       cornerRadius_ = 0;
+
       return this;
     }
 
@@ -661,30 +643,17 @@ public com.google.apps.card.v1.BorderStyle build() {
     @java.lang.Override
     public com.google.apps.card.v1.BorderStyle buildPartial() {
       com.google.apps.card.v1.BorderStyle result = new com.google.apps.card.v1.BorderStyle(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.type_ = type_;
+      if (strokeColorBuilder_ == null) {
+        result.strokeColor_ = strokeColor_;
+      } else {
+        result.strokeColor_ = strokeColorBuilder_.build();
       }
+      result.cornerRadius_ = cornerRadius_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.apps.card.v1.BorderStyle result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.type_ = type_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.strokeColor_ =
-            strokeColorBuilder_ == null ? strokeColor_ : strokeColorBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.cornerRadius_ = cornerRadius_;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -768,19 +737,19 @@ public Builder mergeFrom(
             case 8:
               {
                 type_ = input.readEnum();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 18:
               {
                 input.readMessage(getStrokeColorFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 24:
               {
                 cornerRadius_ = input.readInt32();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             default:
@@ -800,8 +769,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private int type_ = 0;
 
     /**
@@ -833,8 +800,8 @@ public int getTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setTypeValue(int value) {
+
       type_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -852,8 +819,9 @@ public Builder setTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.BorderStyle.BorderType getType() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.BorderStyle.BorderType result =
-          com.google.apps.card.v1.BorderStyle.BorderType.forNumber(type_);
+          com.google.apps.card.v1.BorderStyle.BorderType.valueOf(type_);
       return result == null ? com.google.apps.card.v1.BorderStyle.BorderType.UNRECOGNIZED : result;
     }
 
@@ -873,7 +841,7 @@ public Builder setType(com.google.apps.card.v1.BorderStyle.BorderType value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000001;
+
       type_ = value.getNumber();
       onChanged();
       return this;
@@ -891,7 +859,7 @@ public Builder setType(com.google.apps.card.v1.BorderStyle.BorderType value) {
      * @return This builder for chaining.
      */
     public Builder clearType() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       type_ = 0;
       onChanged();
       return this;
@@ -907,15 +875,12 @@ public Builder clearType() {
      *
      * 
      * The colors to use when the type is `BORDER_TYPE_STROKE`.
-     *
      * To set the stroke color, specify a value for the `red`, `green`, and `blue`
      * fields.
      * The value must be a float number between 0 and 1 based on the RGB color
      * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
      * represents the maximum intensity of the color.
-     *
      * For example, the following sets the color to red at its maximum intensity:
-     *
      * ```
      * "color": {
      *    "red": 1,
@@ -923,7 +888,6 @@ public Builder clearType() {
      *    "blue": 0,
      * }
      * ```
-     *
      * The `alpha` field is unavailable for stroke color. If specified, this field
      * is ignored.
      * 

@@ -933,7 +897,7 @@ public Builder clearType() {
      * @return Whether the strokeColor field is set.
      */
     public boolean hasStrokeColor() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return strokeColorBuilder_ != null || strokeColor_ != null;
     }
 
     /**
@@ -941,15 +905,12 @@ public boolean hasStrokeColor() {
      *
      * 
      * The colors to use when the type is `BORDER_TYPE_STROKE`.
-     *
      * To set the stroke color, specify a value for the `red`, `green`, and `blue`
      * fields.
      * The value must be a float number between 0 and 1 based on the RGB color
      * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
      * represents the maximum intensity of the color.
-     *
      * For example, the following sets the color to red at its maximum intensity:
-     *
      * ```
      * "color": {
      *    "red": 1,
@@ -957,7 +918,6 @@ public boolean hasStrokeColor() {
      *    "blue": 0,
      * }
      * ```
-     *
      * The `alpha` field is unavailable for stroke color. If specified, this field
      * is ignored.
      * 

@@ -979,15 +939,12 @@ public com.google.type.Color getStrokeColor() {
      *
      * 
      * The colors to use when the type is `BORDER_TYPE_STROKE`.
-     *
      * To set the stroke color, specify a value for the `red`, `green`, and `blue`
      * fields.
      * The value must be a float number between 0 and 1 based on the RGB color
      * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
      * represents the maximum intensity of the color.
-     *
      * For example, the following sets the color to red at its maximum intensity:
-     *
      * ```
      * "color": {
      *    "red": 1,
@@ -995,7 +952,6 @@ public com.google.type.Color getStrokeColor() {
      *    "blue": 0,
      * }
      * ```
-     *
      * The `alpha` field is unavailable for stroke color. If specified, this field
      * is ignored.
      * 

@@ -1008,11 +964,11 @@ public Builder setStrokeColor(com.google.type.Color value) {
           throw new NullPointerException();
         }
         strokeColor_ = value;
+        onChanged();
       } else {
         strokeColorBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -1021,15 +977,12 @@ public Builder setStrokeColor(com.google.type.Color value) {
      *
      * 
      * The colors to use when the type is `BORDER_TYPE_STROKE`.
-     *
      * To set the stroke color, specify a value for the `red`, `green`, and `blue`
      * fields.
      * The value must be a float number between 0 and 1 based on the RGB color
      * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
      * represents the maximum intensity of the color.
-     *
      * For example, the following sets the color to red at its maximum intensity:
-     *
      * ```
      * "color": {
      *    "red": 1,
@@ -1037,7 +990,6 @@ public Builder setStrokeColor(com.google.type.Color value) {
      *    "blue": 0,
      * }
      * ```
-     *
      * The `alpha` field is unavailable for stroke color. If specified, this field
      * is ignored.
      * 

@@ -1047,11 +999,11 @@ public Builder setStrokeColor(com.google.type.Color value) {
     public Builder setStrokeColor(com.google.type.Color.Builder builderForValue) {
       if (strokeColorBuilder_ == null) {
         strokeColor_ = builderForValue.build();
+        onChanged();
       } else {
         strokeColorBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -1060,15 +1012,12 @@ public Builder setStrokeColor(com.google.type.Color.Builder builderForValue) {
      *
      * 
      * The colors to use when the type is `BORDER_TYPE_STROKE`.
-     *
      * To set the stroke color, specify a value for the `red`, `green`, and `blue`
      * fields.
      * The value must be a float number between 0 and 1 based on the RGB color
      * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
      * represents the maximum intensity of the color.
-     *
      * For example, the following sets the color to red at its maximum intensity:
-     *
      * ```
      * "color": {
      *    "red": 1,
@@ -1076,7 +1025,6 @@ public Builder setStrokeColor(com.google.type.Color.Builder builderForValue) {
      *    "blue": 0,
      * }
      * ```
-     *
      * The `alpha` field is unavailable for stroke color. If specified, this field
      * is ignored.
      * 

@@ -1085,20 +1033,17 @@ public Builder setStrokeColor(com.google.type.Color.Builder builderForValue) {
      */
     public Builder mergeStrokeColor(com.google.type.Color value) {
       if (strokeColorBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && strokeColor_ != null
-            && strokeColor_ != com.google.type.Color.getDefaultInstance()) {
-          getStrokeColorBuilder().mergeFrom(value);
+        if (strokeColor_ != null) {
+          strokeColor_ =
+              com.google.type.Color.newBuilder(strokeColor_).mergeFrom(value).buildPartial();
         } else {
           strokeColor_ = value;
         }
+        onChanged();
       } else {
         strokeColorBuilder_.mergeFrom(value);
       }
-      if (strokeColor_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1107,15 +1052,12 @@ public Builder mergeStrokeColor(com.google.type.Color value) {
      *
      * 
      * The colors to use when the type is `BORDER_TYPE_STROKE`.
-     *
      * To set the stroke color, specify a value for the `red`, `green`, and `blue`
      * fields.
      * The value must be a float number between 0 and 1 based on the RGB color
      * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
      * represents the maximum intensity of the color.
-     *
      * For example, the following sets the color to red at its maximum intensity:
-     *
      * ```
      * "color": {
      *    "red": 1,
@@ -1123,7 +1065,6 @@ public Builder mergeStrokeColor(com.google.type.Color value) {
      *    "blue": 0,
      * }
      * ```
-     *
      * The `alpha` field is unavailable for stroke color. If specified, this field
      * is ignored.
      * 

@@ -1131,13 +1072,14 @@ public Builder mergeStrokeColor(com.google.type.Color value) {
      * .google.type.Color stroke_color = 2;
      */
     public Builder clearStrokeColor() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      strokeColor_ = null;
-      if (strokeColorBuilder_ != null) {
-        strokeColorBuilder_.dispose();
+      if (strokeColorBuilder_ == null) {
+        strokeColor_ = null;
+        onChanged();
+      } else {
+        strokeColor_ = null;
         strokeColorBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1146,15 +1088,12 @@ public Builder clearStrokeColor() {
      *
      * 
      * The colors to use when the type is `BORDER_TYPE_STROKE`.
-     *
      * To set the stroke color, specify a value for the `red`, `green`, and `blue`
      * fields.
      * The value must be a float number between 0 and 1 based on the RGB color
      * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
      * represents the maximum intensity of the color.
-     *
      * For example, the following sets the color to red at its maximum intensity:
-     *
      * ```
      * "color": {
      *    "red": 1,
@@ -1162,7 +1101,6 @@ public Builder clearStrokeColor() {
      *    "blue": 0,
      * }
      * ```
-     *
      * The `alpha` field is unavailable for stroke color. If specified, this field
      * is ignored.
      * 

@@ -1170,7 +1108,7 @@ public Builder clearStrokeColor() {
      * .google.type.Color stroke_color = 2;
      */
     public com.google.type.Color.Builder getStrokeColorBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getStrokeColorFieldBuilder().getBuilder();
     }
@@ -1180,15 +1118,12 @@ public com.google.type.Color.Builder getStrokeColorBuilder() {
      *
      * 
      * The colors to use when the type is `BORDER_TYPE_STROKE`.
-     *
      * To set the stroke color, specify a value for the `red`, `green`, and `blue`
      * fields.
      * The value must be a float number between 0 and 1 based on the RGB color
      * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
      * represents the maximum intensity of the color.
-     *
      * For example, the following sets the color to red at its maximum intensity:
-     *
      * ```
      * "color": {
      *    "red": 1,
@@ -1196,7 +1131,6 @@ public com.google.type.Color.Builder getStrokeColorBuilder() {
      *    "blue": 0,
      * }
      * ```
-     *
      * The `alpha` field is unavailable for stroke color. If specified, this field
      * is ignored.
      * 

@@ -1216,15 +1150,12 @@ public com.google.type.ColorOrBuilder getStrokeColorOrBuilder() {
      *
      * 
      * The colors to use when the type is `BORDER_TYPE_STROKE`.
-     *
      * To set the stroke color, specify a value for the `red`, `green`, and `blue`
      * fields.
      * The value must be a float number between 0 and 1 based on the RGB color
      * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
      * represents the maximum intensity of the color.
-     *
      * For example, the following sets the color to red at its maximum intensity:
-     *
      * ```
      * "color": {
      *    "red": 1,
@@ -1232,7 +1163,6 @@ public com.google.type.ColorOrBuilder getStrokeColorOrBuilder() {
      *    "blue": 0,
      * }
      * ```
-     *
      * The `alpha` field is unavailable for stroke color. If specified, this field
      * is ignored.
      * 

@@ -1287,7 +1217,6 @@ public int getCornerRadius() {
     public Builder setCornerRadius(int value) {
 
       cornerRadius_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1304,7 +1233,7 @@ public Builder setCornerRadius(int value) {
      * @return This builder for chaining.
      */
     public Builder clearCornerRadius() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       cornerRadius_ = 0;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/BorderStyleOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/BorderStyleOrBuilder.java
index 4b9d1f35fe..d5fcc2d83f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/BorderStyleOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/BorderStyleOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface BorderStyleOrBuilder
@@ -55,15 +54,12 @@ public interface BorderStyleOrBuilder
    *
    * 
    * The colors to use when the type is `BORDER_TYPE_STROKE`.
-   *
    * To set the stroke color, specify a value for the `red`, `green`, and `blue`
    * fields.
    * The value must be a float number between 0 and 1 based on the RGB color
    * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
    * represents the maximum intensity of the color.
-   *
    * For example, the following sets the color to red at its maximum intensity:
-   *
    * ```
    * "color": {
    *    "red": 1,
@@ -71,7 +67,6 @@ public interface BorderStyleOrBuilder
    *    "blue": 0,
    * }
    * ```
-   *
    * The `alpha` field is unavailable for stroke color. If specified, this field
    * is ignored.
    * 

@@ -87,15 +82,12 @@ public interface BorderStyleOrBuilder
    *
    * 
    * The colors to use when the type is `BORDER_TYPE_STROKE`.
-   *
    * To set the stroke color, specify a value for the `red`, `green`, and `blue`
    * fields.
    * The value must be a float number between 0 and 1 based on the RGB color
    * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
    * represents the maximum intensity of the color.
-   *
    * For example, the following sets the color to red at its maximum intensity:
-   *
    * ```
    * "color": {
    *    "red": 1,
@@ -103,7 +95,6 @@ public interface BorderStyleOrBuilder
    *    "blue": 0,
    * }
    * ```
-   *
    * The `alpha` field is unavailable for stroke color. If specified, this field
    * is ignored.
    * 

@@ -119,15 +110,12 @@ public interface BorderStyleOrBuilder
    *
    * 
    * The colors to use when the type is `BORDER_TYPE_STROKE`.
-   *
    * To set the stroke color, specify a value for the `red`, `green`, and `blue`
    * fields.
    * The value must be a float number between 0 and 1 based on the RGB color
    * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
    * represents the maximum intensity of the color.
-   *
    * For example, the following sets the color to red at its maximum intensity:
-   *
    * ```
    * "color": {
    *    "red": 1,
@@ -135,7 +123,6 @@ public interface BorderStyleOrBuilder
    *    "blue": 0,
    * }
    * ```
-   *
    * The `alpha` field is unavailable for stroke color. If specified, this field
    * is ignored.
    * 

diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Button.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Button.java
index 81af6dcfc6..6aed3cc45f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Button.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Button.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -27,12 +26,10 @@
  * Google Chat apps, see
  * [Add a
  * button](https://developers.google.com/workspace/chat/design-interactive-card-dialog#add_a_button).
- *
  * To make an image a clickable button, specify an
  * [`Image`][google.apps.card.v1.Image] (not an
  * [`ImageComponent`][google.apps.card.v1.ImageComponent]) and set an
  * `onClick` action.
- *
  * [Google Workspace
  * add-ons and Chat apps](https://developers.google.com/workspace/extend):
  * 

@@ -62,6 +59,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Button();
   }
 
+  @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.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Button_descriptor;
   }
@@ -82,7 +84,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * Optional. The
    * [type](https://m3.material.io/components/all-buttons#9134ac95-678e-49ae-a50a-e71948011b05)
    * of a button. If `color` field is set, the `type` is forced to `FILLED`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -300,11 +301,8 @@ private Type(int value) {
     // @@protoc_insertion_point(enum_scope:google.apps.card.v1.Button.Type)
   }
 
-  private int bitField0_;
   public static final int TEXT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object text_ = "";
+  private volatile java.lang.Object text_;
 
   /**
    *
@@ -371,7 +369,7 @@ public com.google.protobuf.ByteString getTextBytes() {
    */
   @java.lang.Override
   public boolean hasIcon() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return icon_ != null;
   }
 
   /**
@@ -403,7 +401,7 @@ public com.google.apps.card.v1.Icon getIcon() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.IconOrBuilder getIconOrBuilder() {
-    return icon_ == null ? com.google.apps.card.v1.Icon.getDefaultInstance() : icon_;
+    return getIcon();
   }
 
   public static final int COLOR_FIELD_NUMBER = 3;
@@ -417,15 +415,12 @@ public com.google.apps.card.v1.IconOrBuilder getIconOrBuilder() {
    * `FILLED` and the color of `text` and `icon` fields are set to a
    * contrasting color for readability. For example, if the button color is
    * set to blue, any text or icons in the button are set to white.
-   *
    * To set the button color, specify a value for the `red`, `green`, and `blue`
    * fields.
    * The value must be a float number between 0 and 1 based on the RGB color
    * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
    * represents the maximum intensity of the color.
-   *
    * For example, the following sets the color to red at its maximum intensity:
-   *
    * ```
    * "color": {
    *    "red": 1,
@@ -433,7 +428,6 @@ public com.google.apps.card.v1.IconOrBuilder getIconOrBuilder() {
    *    "blue": 0,
    * }
    * ```
-   *
    * The `alpha` field is unavailable for button color. If specified, this field
    * is ignored.
    * 

@@ -444,7 +438,7 @@ public com.google.apps.card.v1.IconOrBuilder getIconOrBuilder() {
    */
   @java.lang.Override
   public boolean hasColor() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return color_ != null;
   }
 
   /**
@@ -455,15 +449,12 @@ public boolean hasColor() {
    * `FILLED` and the color of `text` and `icon` fields are set to a
    * contrasting color for readability. For example, if the button color is
    * set to blue, any text or icons in the button are set to white.
-   *
    * To set the button color, specify a value for the `red`, `green`, and `blue`
    * fields.
    * The value must be a float number between 0 and 1 based on the RGB color
    * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
    * represents the maximum intensity of the color.
-   *
    * For example, the following sets the color to red at its maximum intensity:
-   *
    * ```
    * "color": {
    *    "red": 1,
@@ -471,7 +462,6 @@ public boolean hasColor() {
    *    "blue": 0,
    * }
    * ```
-   *
    * The `alpha` field is unavailable for button color. If specified, this field
    * is ignored.
    * 

@@ -493,15 +483,12 @@ public com.google.type.Color getColor() {
    * `FILLED` and the color of `text` and `icon` fields are set to a
    * contrasting color for readability. For example, if the button color is
    * set to blue, any text or icons in the button are set to white.
-   *
    * To set the button color, specify a value for the `red`, `green`, and `blue`
    * fields.
    * The value must be a float number between 0 and 1 based on the RGB color
    * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
    * represents the maximum intensity of the color.
-   *
    * For example, the following sets the color to red at its maximum intensity:
-   *
    * ```
    * "color": {
    *    "red": 1,
@@ -509,7 +496,6 @@ public com.google.type.Color getColor() {
    *    "blue": 0,
    * }
    * ```
-   *
    * The `alpha` field is unavailable for button color. If specified, this field
    * is ignored.
    * 

@@ -518,7 +504,7 @@ public com.google.type.Color getColor() {
    */
   @java.lang.Override
   public com.google.type.ColorOrBuilder getColorOrBuilder() {
-    return color_ == null ? com.google.type.Color.getDefaultInstance() : color_;
+    return getColor();
   }
 
   public static final int ON_CLICK_FIELD_NUMBER = 4;
@@ -538,7 +524,7 @@ public com.google.type.ColorOrBuilder getColorOrBuilder() {
    */
   @java.lang.Override
   public boolean hasOnClick() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return onClick_ != null;
   }
 
   /**
@@ -570,11 +556,11 @@ public com.google.apps.card.v1.OnClick getOnClick() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.OnClickOrBuilder getOnClickOrBuilder() {
-    return onClick_ == null ? com.google.apps.card.v1.OnClick.getDefaultInstance() : onClick_;
+    return getOnClick();
   }
 
   public static final int DISABLED_FIELD_NUMBER = 5;
-  private boolean disabled_ = false;
+  private boolean disabled_;
 
   /**
    *
@@ -594,16 +580,13 @@ public boolean getDisabled() {
   }
 
   public static final int ALT_TEXT_FIELD_NUMBER = 6;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object altText_ = "";
+  private volatile java.lang.Object altText_;
 
   /**
    *
    *
    * 
    * The alternative text that's used for accessibility.
-   *
    * Set descriptive text that lets users know what the button does. For
    * example, if a button opens a hyperlink, you might write: "Opens a new
    * browser tab and navigates to the Google Chat developer documentation at
@@ -632,7 +615,6 @@ public java.lang.String getAltText() {
    *
    * 
    * The alternative text that's used for accessibility.
-   *
    * Set descriptive text that lets users know what the button does. For
    * example, if a button opens a hyperlink, you might write: "Opens a new
    * browser tab and navigates to the Google Chat developer documentation at
@@ -657,7 +639,7 @@ public com.google.protobuf.ByteString getAltTextBytes() {
   }
 
   public static final int TYPE_FIELD_NUMBER = 7;
-  private int type_ = 0;
+  private int type_;
 
   /**
    *
@@ -692,8 +674,8 @@ public int getTypeValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.Button.Type getType() {
-    com.google.apps.card.v1.Button.Type result =
-        com.google.apps.card.v1.Button.Type.forNumber(type_);
+    @SuppressWarnings("deprecation")
+    com.google.apps.card.v1.Button.Type result = com.google.apps.card.v1.Button.Type.valueOf(type_);
     return result == null ? com.google.apps.card.v1.Button.Type.UNRECOGNIZED : result;
   }
 
@@ -714,13 +696,13 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(text_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, text_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (icon_ != null) {
       output.writeMessage(2, getIcon());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (color_ != null) {
       output.writeMessage(3, getColor());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (onClick_ != null) {
       output.writeMessage(4, getOnClick());
     }
     if (disabled_ != false) {
@@ -744,13 +726,13 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(text_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, text_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (icon_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getIcon());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (color_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getColor());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (onClick_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getOnClick());
     }
     if (disabled_ != false) {
@@ -932,12 +914,10 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * Google Chat apps, see
    * [Add a
    * button](https://developers.google.com/workspace/chat/design-interactive-card-dialog#add_a_button).
-   *
    * To make an image a clickable button, specify an
    * [`Image`][google.apps.card.v1.Image] (not an
    * [`ImageComponent`][google.apps.card.v1.ImageComponent]) and set an
    * `onClick` action.
-   *
    * [Google Workspace
    * add-ons and Chat apps](https://developers.google.com/workspace/extend):
    * 

@@ -963,46 +943,41 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Button.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getIconFieldBuilder();
-        getColorFieldBuilder();
-        getOnClickFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       text_ = "";
-      icon_ = null;
-      if (iconBuilder_ != null) {
-        iconBuilder_.dispose();
+
+      if (iconBuilder_ == null) {
+        icon_ = null;
+      } else {
+        icon_ = null;
         iconBuilder_ = null;
       }
-      color_ = null;
-      if (colorBuilder_ != null) {
-        colorBuilder_.dispose();
+      if (colorBuilder_ == null) {
+        color_ = null;
+      } else {
+        color_ = null;
         colorBuilder_ = null;
       }
-      onClick_ = null;
-      if (onClickBuilder_ != null) {
-        onClickBuilder_.dispose();
+      if (onClickBuilder_ == null) {
+        onClick_ = null;
+      } else {
+        onClick_ = null;
         onClickBuilder_ = null;
       }
       disabled_ = false;
+
       altText_ = "";
+
       type_ = 0;
+
       return this;
     }
 
@@ -1029,41 +1004,27 @@ public com.google.apps.card.v1.Button build() {
     @java.lang.Override
     public com.google.apps.card.v1.Button buildPartial() {
       com.google.apps.card.v1.Button result = new com.google.apps.card.v1.Button(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.apps.card.v1.Button result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.text_ = text_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.icon_ = iconBuilder_ == null ? icon_ : iconBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.color_ = colorBuilder_ == null ? color_ : colorBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.onClick_ = onClickBuilder_ == null ? onClick_ : onClickBuilder_.build();
-        to_bitField0_ |= 0x00000004;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.disabled_ = disabled_;
+      result.text_ = text_;
+      if (iconBuilder_ == null) {
+        result.icon_ = icon_;
+      } else {
+        result.icon_ = iconBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.altText_ = altText_;
+      if (colorBuilder_ == null) {
+        result.color_ = color_;
+      } else {
+        result.color_ = colorBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.type_ = type_;
+      if (onClickBuilder_ == null) {
+        result.onClick_ = onClick_;
+      } else {
+        result.onClick_ = onClickBuilder_.build();
       }
-      result.bitField0_ |= to_bitField0_;
+      result.disabled_ = disabled_;
+      result.altText_ = altText_;
+      result.type_ = type_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1113,7 +1074,6 @@ public Builder mergeFrom(com.google.apps.card.v1.Button other) {
       if (other == com.google.apps.card.v1.Button.getDefaultInstance()) return this;
       if (!other.getText().isEmpty()) {
         text_ = other.text_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasIcon()) {
@@ -1130,7 +1090,6 @@ public Builder mergeFrom(com.google.apps.card.v1.Button other) {
       }
       if (!other.getAltText().isEmpty()) {
         altText_ = other.altText_;
-        bitField0_ |= 0x00000020;
         onChanged();
       }
       if (other.type_ != 0) {
@@ -1165,43 +1124,43 @@ public Builder mergeFrom(
             case 10:
               {
                 text_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getIconFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getColorFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getOnClickFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             case 40:
               {
                 disabled_ = input.readBool();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 40
             case 50:
               {
                 altText_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 50
             case 56:
               {
                 type_ = input.readEnum();
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 56
             default:
@@ -1221,8 +1180,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object text_ = "";
 
     /**
@@ -1287,8 +1244,8 @@ public Builder setText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       text_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1305,8 +1262,8 @@ public Builder setText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearText() {
+
       text_ = getDefaultInstance().getText();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1328,8 +1285,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       text_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1354,7 +1311,7 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
      * @return Whether the icon field is set.
      */
     public boolean hasIcon() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return iconBuilder_ != null || icon_ != null;
     }
 
     /**
@@ -1393,11 +1350,11 @@ public Builder setIcon(com.google.apps.card.v1.Icon value) {
           throw new NullPointerException();
         }
         icon_ = value;
+        onChanged();
       } else {
         iconBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -1414,11 +1371,11 @@ public Builder setIcon(com.google.apps.card.v1.Icon value) {
     public Builder setIcon(com.google.apps.card.v1.Icon.Builder builderForValue) {
       if (iconBuilder_ == null) {
         icon_ = builderForValue.build();
+        onChanged();
       } else {
         iconBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -1434,20 +1391,16 @@ public Builder setIcon(com.google.apps.card.v1.Icon.Builder builderForValue) {
      */
     public Builder mergeIcon(com.google.apps.card.v1.Icon value) {
       if (iconBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && icon_ != null
-            && icon_ != com.google.apps.card.v1.Icon.getDefaultInstance()) {
-          getIconBuilder().mergeFrom(value);
+        if (icon_ != null) {
+          icon_ = com.google.apps.card.v1.Icon.newBuilder(icon_).mergeFrom(value).buildPartial();
         } else {
           icon_ = value;
         }
+        onChanged();
       } else {
         iconBuilder_.mergeFrom(value);
       }
-      if (icon_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1462,13 +1415,14 @@ public Builder mergeIcon(com.google.apps.card.v1.Icon value) {
      * .google.apps.card.v1.Icon icon = 2;
      */
     public Builder clearIcon() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      icon_ = null;
-      if (iconBuilder_ != null) {
-        iconBuilder_.dispose();
+      if (iconBuilder_ == null) {
+        icon_ = null;
+        onChanged();
+      } else {
+        icon_ = null;
         iconBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1483,7 +1437,7 @@ public Builder clearIcon() {
      * .google.apps.card.v1.Icon icon = 2;
      */
     public com.google.apps.card.v1.Icon.Builder getIconBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getIconFieldBuilder().getBuilder();
     }
@@ -1546,15 +1500,12 @@ public com.google.apps.card.v1.IconOrBuilder getIconOrBuilder() {
      * `FILLED` and the color of `text` and `icon` fields are set to a
      * contrasting color for readability. For example, if the button color is
      * set to blue, any text or icons in the button are set to white.
-     *
      * To set the button color, specify a value for the `red`, `green`, and `blue`
      * fields.
      * The value must be a float number between 0 and 1 based on the RGB color
      * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
      * represents the maximum intensity of the color.
-     *
      * For example, the following sets the color to red at its maximum intensity:
-     *
      * ```
      * "color": {
      *    "red": 1,
@@ -1562,7 +1513,6 @@ public com.google.apps.card.v1.IconOrBuilder getIconOrBuilder() {
      *    "blue": 0,
      * }
      * ```
-     *
      * The `alpha` field is unavailable for button color. If specified, this field
      * is ignored.
      * 

@@ -1572,7 +1522,7 @@ public com.google.apps.card.v1.IconOrBuilder getIconOrBuilder() {
      * @return Whether the color field is set.
      */
     public boolean hasColor() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return colorBuilder_ != null || color_ != null;
     }
 
     /**
@@ -1583,15 +1533,12 @@ public boolean hasColor() {
      * `FILLED` and the color of `text` and `icon` fields are set to a
      * contrasting color for readability. For example, if the button color is
      * set to blue, any text or icons in the button are set to white.
-     *
      * To set the button color, specify a value for the `red`, `green`, and `blue`
      * fields.
      * The value must be a float number between 0 and 1 based on the RGB color
      * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
      * represents the maximum intensity of the color.
-     *
      * For example, the following sets the color to red at its maximum intensity:
-     *
      * ```
      * "color": {
      *    "red": 1,
@@ -1599,7 +1546,6 @@ public boolean hasColor() {
      *    "blue": 0,
      * }
      * ```
-     *
      * The `alpha` field is unavailable for button color. If specified, this field
      * is ignored.
      * 

@@ -1624,15 +1570,12 @@ public com.google.type.Color getColor() {
      * `FILLED` and the color of `text` and `icon` fields are set to a
      * contrasting color for readability. For example, if the button color is
      * set to blue, any text or icons in the button are set to white.
-     *
      * To set the button color, specify a value for the `red`, `green`, and `blue`
      * fields.
      * The value must be a float number between 0 and 1 based on the RGB color
      * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
      * represents the maximum intensity of the color.
-     *
      * For example, the following sets the color to red at its maximum intensity:
-     *
      * ```
      * "color": {
      *    "red": 1,
@@ -1640,7 +1583,6 @@ public com.google.type.Color getColor() {
      *    "blue": 0,
      * }
      * ```
-     *
      * The `alpha` field is unavailable for button color. If specified, this field
      * is ignored.
      * 

@@ -1653,11 +1595,11 @@ public Builder setColor(com.google.type.Color value) {
           throw new NullPointerException();
         }
         color_ = value;
+        onChanged();
       } else {
         colorBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1669,15 +1611,12 @@ public Builder setColor(com.google.type.Color value) {
      * `FILLED` and the color of `text` and `icon` fields are set to a
      * contrasting color for readability. For example, if the button color is
      * set to blue, any text or icons in the button are set to white.
-     *
      * To set the button color, specify a value for the `red`, `green`, and `blue`
      * fields.
      * The value must be a float number between 0 and 1 based on the RGB color
      * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
      * represents the maximum intensity of the color.
-     *
      * For example, the following sets the color to red at its maximum intensity:
-     *
      * ```
      * "color": {
      *    "red": 1,
@@ -1685,7 +1624,6 @@ public Builder setColor(com.google.type.Color value) {
      *    "blue": 0,
      * }
      * ```
-     *
      * The `alpha` field is unavailable for button color. If specified, this field
      * is ignored.
      *
@@ -1695,11 +1633,11 @@ public Builder setColor(com.google.type.Color value) { public Builder setColor(com.google.type.Color.Builder builderForValue) { if (colorBuilder_ == null) { color_ = builderForValue.build(); + onChanged(); } else { colorBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000004; - onChanged(); + return this; } @@ -1711,15 +1649,12 @@ public Builder setColor(com.google.type.Color.Builder builderForValue) { * `FILLED` and the color of `text` and `icon` fields are set to a * contrasting color for readability. For example, if the button color is * set to blue, any text or icons in the button are set to white. - * * To set the button color, specify a value for the `red`, `green`, and `blue` * fields. * The value must be a float number between 0 and 1 based on the RGB color * value, where `0` (0/255) represents the absence of color and `1` (255/255) * represents the maximum intensity of the color. - * * For example, the following sets the color to red at its maximum intensity: - * * ``` * "color": { * "red": 1, @@ -1727,7 +1662,6 @@ public Builder setColor(com.google.type.Color.Builder builderForValue) { * "blue": 0, * } * ``` - * * The `alpha` field is unavailable for button color. If specified, this field * is ignored. * @@ -1736,20 +1670,16 @@ public Builder setColor(com.google.type.Color.Builder builderForValue) { */ public Builder mergeColor(com.google.type.Color value) { if (colorBuilder_ == null) { - if (((bitField0_ & 0x00000004) != 0) - && color_ != null - && color_ != com.google.type.Color.getDefaultInstance()) { - getColorBuilder().mergeFrom(value); + if (color_ != null) { + color_ = com.google.type.Color.newBuilder(color_).mergeFrom(value).buildPartial(); } else { color_ = value; } + onChanged(); } else { colorBuilder_.mergeFrom(value); } - if (color_ != null) { - bitField0_ |= 0x00000004; - onChanged(); - } + return this; } @@ -1761,15 +1691,12 @@ public Builder mergeColor(com.google.type.Color value) { * `FILLED` and the color of `text` and `icon` fields are set to a * contrasting color for readability. For example, if the button color is * set to blue, any text or icons in the button are set to white. - * * To set the button color, specify a value for the `red`, `green`, and `blue` * fields. * The value must be a float number between 0 and 1 based on the RGB color * value, where `0` (0/255) represents the absence of color and `1` (255/255) * represents the maximum intensity of the color. - * * For example, the following sets the color to red at its maximum intensity: - * * ``` * "color": { * "red": 1, @@ -1777,7 +1704,6 @@ public Builder mergeColor(com.google.type.Color value) { * "blue": 0, * } * ``` - * * The `alpha` field is unavailable for button color. If specified, this field * is ignored. * @@ -1785,13 +1711,14 @@ public Builder mergeColor(com.google.type.Color value) { * .google.type.Color color = 3; */ public Builder clearColor() { - bitField0_ = (bitField0_ & ~0x00000004); - color_ = null; - if (colorBuilder_ != null) { - colorBuilder_.dispose(); + if (colorBuilder_ == null) { + color_ = null; + onChanged(); + } else { + color_ = null; colorBuilder_ = null; } - onChanged(); + return this; } @@ -1803,15 +1730,12 @@ public Builder clearColor() { * `FILLED` and the color of `text` and `icon` fields are set to a * contrasting color for readability. For example, if the button color is * set to blue, any text or icons in the button are set to white. - * * To set the button color, specify a value for the `red`, `green`, and `blue` * fields. * The value must be a float number between 0 and 1 based on the RGB color * value, where `0` (0/255) represents the absence of color and `1` (255/255) * represents the maximum intensity of the color. - * * For example, the following sets the color to red at its maximum intensity: - * * ``` * "color": { * "red": 1, @@ -1819,7 +1743,6 @@ public Builder clearColor() { * "blue": 0, * } * ``` - * * The `alpha` field is unavailable for button color. If specified, this field * is ignored. * @@ -1827,7 +1750,7 @@ public Builder clearColor() { * .google.type.Color color = 3; */ public com.google.type.Color.Builder getColorBuilder() { - bitField0_ |= 0x00000004; + onChanged(); return getColorFieldBuilder().getBuilder(); } @@ -1840,15 +1763,12 @@ public com.google.type.Color.Builder getColorBuilder() { * `FILLED` and the color of `text` and `icon` fields are set to a * contrasting color for readability. For example, if the button color is * set to blue, any text or icons in the button are set to white. - * * To set the button color, specify a value for the `red`, `green`, and `blue` * fields. * The value must be a float number between 0 and 1 based on the RGB color * value, where `0` (0/255) represents the absence of color and `1` (255/255) * represents the maximum intensity of the color. - * * For example, the following sets the color to red at its maximum intensity: - * * ``` * "color": { * "red": 1, @@ -1856,7 +1776,6 @@ public com.google.type.Color.Builder getColorBuilder() { * "blue": 0, * } * ``` - * * The `alpha` field is unavailable for button color. If specified, this field * is ignored. * @@ -1879,15 +1798,12 @@ public com.google.type.ColorOrBuilder getColorOrBuilder() { * `FILLED` and the color of `text` and `icon` fields are set to a * contrasting color for readability. For example, if the button color is * set to blue, any text or icons in the button are set to white. - * * To set the button color, specify a value for the `red`, `green`, and `blue` * fields. * The value must be a float number between 0 and 1 based on the RGB color * value, where `0` (0/255) represents the absence of color and `1` (255/255) * represents the maximum intensity of the color. - * * For example, the following sets the color to red at its maximum intensity: - * * ``` * "color": { * "red": 1, @@ -1895,7 +1811,6 @@ public com.google.type.ColorOrBuilder getColorOrBuilder() { * "blue": 0, * } * ``` - * * The `alpha` field is unavailable for button color. If specified, this field * is ignored. * @@ -1936,7 +1851,7 @@ public com.google.type.ColorOrBuilder getColorOrBuilder() { * @return Whether the onClick field is set. */ public boolean hasOnClick() { - return ((bitField0_ & 0x00000008) != 0); + return onClickBuilder_ != null || onClick_ != null; } /** @@ -1975,11 +1890,11 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick value) { throw new NullPointerException(); } onClick_ = value; + onChanged(); } else { onClickBuilder_.setMessage(value); } - bitField0_ |= 0x00000008; - onChanged(); + return this; } @@ -1996,11 +1911,11 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick value) { public Builder setOnClick(com.google.apps.card.v1.OnClick.Builder builderForValue) { if (onClickBuilder_ == null) { onClick_ = builderForValue.build(); + onChanged(); } else { onClickBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000008; - onChanged(); + return this; } @@ -2016,20 +1931,17 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick.Builder builderForValu */ public Builder mergeOnClick(com.google.apps.card.v1.OnClick value) { if (onClickBuilder_ == null) { - if (((bitField0_ & 0x00000008) != 0) - && onClick_ != null - && onClick_ != com.google.apps.card.v1.OnClick.getDefaultInstance()) { - getOnClickBuilder().mergeFrom(value); + if (onClick_ != null) { + onClick_ = + com.google.apps.card.v1.OnClick.newBuilder(onClick_).mergeFrom(value).buildPartial(); } else { onClick_ = value; } + onChanged(); } else { onClickBuilder_.mergeFrom(value); } - if (onClick_ != null) { - bitField0_ |= 0x00000008; - onChanged(); - } + return this; } @@ -2044,13 +1956,14 @@ public Builder mergeOnClick(com.google.apps.card.v1.OnClick value) { * .google.apps.card.v1.OnClick on_click = 4; */ public Builder clearOnClick() { - bitField0_ = (bitField0_ & ~0x00000008); - onClick_ = null; - if (onClickBuilder_ != null) { - onClickBuilder_.dispose(); + if (onClickBuilder_ == null) { + onClick_ = null; + onChanged(); + } else { + onClick_ = null; onClickBuilder_ = null; } - onChanged(); + return this; } @@ -2065,7 +1978,7 @@ public Builder clearOnClick() { * .google.apps.card.v1.OnClick on_click = 4; */ public com.google.apps.card.v1.OnClick.Builder getOnClickBuilder() { - bitField0_ |= 0x00000008; + onChanged(); return getOnClickFieldBuilder().getBuilder(); } @@ -2150,7 +2063,6 @@ public boolean getDisabled() { public Builder setDisabled(boolean value) { disabled_ = value; - bitField0_ |= 0x00000010; onChanged(); return this; } @@ -2168,7 +2080,7 @@ public Builder setDisabled(boolean value) { * @return This builder for chaining. */ public Builder clearDisabled() { - bitField0_ = (bitField0_ & ~0x00000010); + disabled_ = false; onChanged(); return this; @@ -2181,7 +2093,6 @@ public Builder clearDisabled() { * * 
      * The alternative text that's used for accessibility.
-     *
      * Set descriptive text that lets users know what the button does. For
      * example, if a button opens a hyperlink, you might write: "Opens a new
      * browser tab and navigates to the Google Chat developer documentation at
@@ -2209,7 +2120,6 @@ public java.lang.String getAltText() {
      *
      * 
      * The alternative text that's used for accessibility.
-     *
      * Set descriptive text that lets users know what the button does. For
      * example, if a button opens a hyperlink, you might write: "Opens a new
      * browser tab and navigates to the Google Chat developer documentation at
@@ -2237,7 +2147,6 @@ public com.google.protobuf.ByteString getAltTextBytes() {
      *
      * 
      * The alternative text that's used for accessibility.
-     *
      * Set descriptive text that lets users know what the button does. For
      * example, if a button opens a hyperlink, you might write: "Opens a new
      * browser tab and navigates to the Google Chat developer documentation at
@@ -2253,8 +2162,8 @@ public Builder setAltText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       altText_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2264,7 +2173,6 @@ public Builder setAltText(java.lang.String value) {
      *
      * 
      * The alternative text that's used for accessibility.
-     *
      * Set descriptive text that lets users know what the button does. For
      * example, if a button opens a hyperlink, you might write: "Opens a new
      * browser tab and navigates to the Google Chat developer documentation at
@@ -2276,8 +2184,8 @@ public Builder setAltText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAltText() {
+
       altText_ = getDefaultInstance().getAltText();
-      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -2287,7 +2195,6 @@ public Builder clearAltText() {
      *
      * 
      * The alternative text that's used for accessibility.
-     *
      * Set descriptive text that lets users know what the button does. For
      * example, if a button opens a hyperlink, you might write: "Opens a new
      * browser tab and navigates to the Google Chat developer documentation at
@@ -2304,8 +2211,8 @@ public Builder setAltTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       altText_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2345,8 +2252,8 @@ public int getTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setTypeValue(int value) {
+
       type_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2366,8 +2273,9 @@ public Builder setTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.Button.Type getType() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.Button.Type result =
-          com.google.apps.card.v1.Button.Type.forNumber(type_);
+          com.google.apps.card.v1.Button.Type.valueOf(type_);
       return result == null ? com.google.apps.card.v1.Button.Type.UNRECOGNIZED : result;
     }
 
@@ -2389,7 +2297,7 @@ public Builder setType(com.google.apps.card.v1.Button.Type value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000040;
+
       type_ = value.getNumber();
       onChanged();
       return this;
@@ -2409,7 +2317,7 @@ public Builder setType(com.google.apps.card.v1.Button.Type value) {
      * @return This builder for chaining.
      */
     public Builder clearType() {
-      bitField0_ = (bitField0_ & ~0x00000040);
+
       type_ = 0;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ButtonList.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ButtonList.java
index c01cedfa00..1757991332 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ButtonList.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ButtonList.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -27,7 +26,6 @@
  * Google Chat apps, see
  * [Add a
  * button](https://developers.google.com/workspace/chat/design-interactive-card-dialog#add_a_button).
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
  * 

@@ -55,6 +53,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ButtonList();
   }
 
+  @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.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_ButtonList_descriptor;
@@ -71,8 +74,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int BUTTONS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List buttons_;
 
   /**
@@ -314,7 +315,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * Google Chat apps, see
    * [Add a
    * button](https://developers.google.com/workspace/chat/design-interactive-card-dialog#add_a_button).
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -350,7 +350,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (buttonsBuilder_ == null) {
         buttons_ = java.util.Collections.emptyList();
       } else {
@@ -384,15 +383,7 @@ public com.google.apps.card.v1.ButtonList build() {
     @java.lang.Override
     public com.google.apps.card.v1.ButtonList buildPartial() {
       com.google.apps.card.v1.ButtonList result = new com.google.apps.card.v1.ButtonList(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.apps.card.v1.ButtonList result) {
+      int from_bitField0_ = bitField0_;
       if (buttonsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           buttons_ = java.util.Collections.unmodifiableList(buttons_);
@@ -402,10 +393,8 @@ private void buildPartialRepeatedFields(com.google.apps.card.v1.ButtonList resul
       } else {
         result.buttons_ = buttonsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.apps.card.v1.ButtonList result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ButtonListOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ButtonListOrBuilder.java
index c9c85024e9..8b7f67c9a9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ButtonListOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ButtonListOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface ButtonListOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ButtonOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ButtonOrBuilder.java
index f651b22ed7..0a710d4715 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ButtonOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ButtonOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface ButtonOrBuilder
@@ -98,15 +97,12 @@ public interface ButtonOrBuilder
    * `FILLED` and the color of `text` and `icon` fields are set to a
    * contrasting color for readability. For example, if the button color is
    * set to blue, any text or icons in the button are set to white.
-   *
    * To set the button color, specify a value for the `red`, `green`, and `blue`
    * fields.
    * The value must be a float number between 0 and 1 based on the RGB color
    * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
    * represents the maximum intensity of the color.
-   *
    * For example, the following sets the color to red at its maximum intensity:
-   *
    * ```
    * "color": {
    *    "red": 1,
@@ -114,7 +110,6 @@ public interface ButtonOrBuilder
    *    "blue": 0,
    * }
    * ```
-   *
    * The `alpha` field is unavailable for button color. If specified, this field
    * is ignored.
    * 

@@ -133,15 +128,12 @@ public interface ButtonOrBuilder
    * `FILLED` and the color of `text` and `icon` fields are set to a
    * contrasting color for readability. For example, if the button color is
    * set to blue, any text or icons in the button are set to white.
-   *
    * To set the button color, specify a value for the `red`, `green`, and `blue`
    * fields.
    * The value must be a float number between 0 and 1 based on the RGB color
    * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
    * represents the maximum intensity of the color.
-   *
    * For example, the following sets the color to red at its maximum intensity:
-   *
    * ```
    * "color": {
    *    "red": 1,
@@ -149,7 +141,6 @@ public interface ButtonOrBuilder
    *    "blue": 0,
    * }
    * ```
-   *
    * The `alpha` field is unavailable for button color. If specified, this field
    * is ignored.
    * 

@@ -168,15 +159,12 @@ public interface ButtonOrBuilder
    * `FILLED` and the color of `text` and `icon` fields are set to a
    * contrasting color for readability. For example, if the button color is
    * set to blue, any text or icons in the button are set to white.
-   *
    * To set the button color, specify a value for the `red`, `green`, and `blue`
    * fields.
    * The value must be a float number between 0 and 1 based on the RGB color
    * value, where `0` (0/255) represents the absence of color  and `1` (255/255)
    * represents the maximum intensity of the color.
-   *
    * For example, the following sets the color to red at its maximum intensity:
-   *
    * ```
    * "color": {
    *    "red": 1,
@@ -184,7 +172,6 @@ public interface ButtonOrBuilder
    *    "blue": 0,
    * }
    * ```
-   *
    * The `alpha` field is unavailable for button color. If specified, this field
    * is ignored.
    *
@@ -252,7 +239,6 @@ public interface ButtonOrBuilder * * 
    * The alternative text that's used for accessibility.
-   *
    * Set descriptive text that lets users know what the button does. For
    * example, if a button opens a hyperlink, you might write: "Opens a new
    * browser tab and navigates to the Google Chat developer documentation at
@@ -270,7 +256,6 @@ public interface ButtonOrBuilder
    *
    * 
    * The alternative text that's used for accessibility.
-   *
    * Set descriptive text that lets users know what the button does. For
    * example, if a button opens a hyperlink, you might write: "Opens a new
    * browser tab and navigates to the Google Chat developer documentation at
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Card.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Card.java
index feea5697c4..5faf74dd27 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Card.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Card.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -25,32 +24,23 @@
  * 
  * A card interface displayed in a Google Chat message or Google Workspace
  * add-on.
- *
  * Cards support a defined layout, interactive UI elements like buttons, and
  * rich media like images. Use cards to present detailed information,
  * gather information from users, and guide users to take a next step.
- *
  * [Card builder](https://addons.gsuite.google.com/uikit/builder)
- *
  * To learn how
  * to build cards, see the following documentation:
- *
  * * For Google Chat apps, see [Design the components of a card or
  *   dialog](https://developers.google.com/workspace/chat/design-components-card-dialog).
  * * For Google Workspace add-ons, see [Card-based
  * interfaces](https://developers.google.com/apps-script/add-ons/concepts/cards).
- *
  * Note: You can add up to 100 widgets per card. Any widgets beyond this
  * limit are ignored. This limit applies to both card messages and dialogs
  * in Google Chat apps, and to cards in Google Workspace add-ons.
- *
  * **Example: Card message for a Google Chat app**
- *
  * ![Example contact
  * card](https://developers.google.com/workspace/chat/images/card_api_reference.png)
- *
  * To create the sample card message in Google Chat, use the following JSON:
- *
  * ```
  * {
  *   "cardsV2": [
@@ -160,6 +150,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Card();
   }
 
+  @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.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Card_descriptor;
   }
@@ -179,7 +174,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * The divider style of a card. Currently only used for dividers betweens card
    * sections.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -344,7 +338,6 @@ private DividerStyle(int value) {
    * 
    * In Google Workspace add-ons,
    * determines how a card is displayed.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -579,7 +572,6 @@ public interface CardHeaderOrBuilder
      *
      * 
      * The shape used to crop the image.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -595,7 +587,6 @@ public interface CardHeaderOrBuilder
      *
      * 
      * The shape used to crop the image.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -665,7 +656,6 @@ public interface CardHeaderOrBuilder
    * 
    * Represents a card header. For an example in Google Chat apps, see [Add a
    * header](https://developers.google.com/workspace/chat/design-components-card-dialog#add_a_header).
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -697,6 +687,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new CardHeader();
     }
 
+    @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.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Card_CardHeader_descriptor;
@@ -713,9 +708,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int TITLE_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object title_ = "";
+    private volatile java.lang.Object title_;
 
     /**
      *
@@ -772,9 +765,7 @@ public com.google.protobuf.ByteString getTitleBytes() {
     }
 
     public static final int SUBTITLE_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object subtitle_ = "";
+    private volatile java.lang.Object subtitle_;
 
     /**
      *
@@ -827,14 +818,13 @@ public com.google.protobuf.ByteString getSubtitleBytes() {
     }
 
     public static final int IMAGE_TYPE_FIELD_NUMBER = 3;
-    private int imageType_ = 0;
+    private int imageType_;
 
     /**
      *
      *
      * 
      * The shape used to crop the image.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -853,7 +843,6 @@ public int getImageTypeValue() {
      *
      * 
      * The shape used to crop the image.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -864,15 +853,14 @@ public int getImageTypeValue() {
      */
     @java.lang.Override
     public com.google.apps.card.v1.Widget.ImageType getImageType() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.Widget.ImageType result =
-          com.google.apps.card.v1.Widget.ImageType.forNumber(imageType_);
+          com.google.apps.card.v1.Widget.ImageType.valueOf(imageType_);
       return result == null ? com.google.apps.card.v1.Widget.ImageType.UNRECOGNIZED : result;
     }
 
     public static final int IMAGE_URL_FIELD_NUMBER = 4;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object imageUrl_ = "";
+    private volatile java.lang.Object imageUrl_;
 
     /**
      *
@@ -923,9 +911,7 @@ public com.google.protobuf.ByteString getImageUrlBytes() {
     }
 
     public static final int IMAGE_ALT_TEXT_FIELD_NUMBER = 5;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object imageAltText_ = "";
+    private volatile java.lang.Object imageAltText_;
 
     /**
      *
@@ -1177,7 +1163,6 @@ protected Builder newBuilderForType(
      * 
      * Represents a card header. For an example in Google Chat apps, see [Add a
      * header](https://developers.google.com/workspace/chat/design-components-card-dialog#add_a_header).
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -1214,12 +1199,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         title_ = "";
+
         subtitle_ = "";
+
         imageType_ = 0;
+
         imageUrl_ = "";
+
         imageAltText_ = "";
+
         return this;
       }
 
@@ -1247,32 +1236,15 @@ public com.google.apps.card.v1.Card.CardHeader build() {
       public com.google.apps.card.v1.Card.CardHeader buildPartial() {
         com.google.apps.card.v1.Card.CardHeader result =
             new com.google.apps.card.v1.Card.CardHeader(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        result.title_ = title_;
+        result.subtitle_ = subtitle_;
+        result.imageType_ = imageType_;
+        result.imageUrl_ = imageUrl_;
+        result.imageAltText_ = imageAltText_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.apps.card.v1.Card.CardHeader result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.title_ = title_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.subtitle_ = subtitle_;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.imageType_ = imageType_;
-        }
-        if (((from_bitField0_ & 0x00000008) != 0)) {
-          result.imageUrl_ = imageUrl_;
-        }
-        if (((from_bitField0_ & 0x00000010) != 0)) {
-          result.imageAltText_ = imageAltText_;
-        }
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1322,12 +1294,10 @@ public Builder mergeFrom(com.google.apps.card.v1.Card.CardHeader other) {
         if (other == com.google.apps.card.v1.Card.CardHeader.getDefaultInstance()) return this;
         if (!other.getTitle().isEmpty()) {
           title_ = other.title_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getSubtitle().isEmpty()) {
           subtitle_ = other.subtitle_;
-          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.imageType_ != 0) {
@@ -1335,12 +1305,10 @@ public Builder mergeFrom(com.google.apps.card.v1.Card.CardHeader other) {
         }
         if (!other.getImageUrl().isEmpty()) {
           imageUrl_ = other.imageUrl_;
-          bitField0_ |= 0x00000008;
           onChanged();
         }
         if (!other.getImageAltText().isEmpty()) {
           imageAltText_ = other.imageAltText_;
-          bitField0_ |= 0x00000010;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -1372,31 +1340,31 @@ public Builder mergeFrom(
               case 10:
                 {
                   title_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   subtitle_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               case 24:
                 {
                   imageType_ = input.readEnum();
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 24
               case 34:
                 {
                   imageUrl_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000008;
+
                   break;
                 } // case 34
               case 42:
                 {
                   imageAltText_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000010;
+
                   break;
                 } // case 42
               default:
@@ -1416,8 +1384,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private java.lang.Object title_ = "";
 
       /**
@@ -1491,8 +1457,8 @@ public Builder setTitle(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         title_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1512,8 +1478,8 @@ public Builder setTitle(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearTitle() {
+
         title_ = getDefaultInstance().getTitle();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1538,8 +1504,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         title_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1611,8 +1577,8 @@ public Builder setSubtitle(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         subtitle_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1630,8 +1596,8 @@ public Builder setSubtitle(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearSubtitle() {
+
         subtitle_ = getDefaultInstance().getSubtitle();
-        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1654,8 +1620,8 @@ public Builder setSubtitleBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         subtitle_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1667,7 +1633,6 @@ public Builder setSubtitleBytes(com.google.protobuf.ByteString value) {
        *
        * 
        * The shape used to crop the image.
-       *
        * [Google Workspace add-ons and Chat
        * apps](https://developers.google.com/workspace/extend):
        * 

@@ -1686,7 +1651,6 @@ public int getImageTypeValue() {
        *
        * 
        * The shape used to crop the image.
-       *
        * [Google Workspace add-ons and Chat
        * apps](https://developers.google.com/workspace/extend):
        * 

@@ -1697,8 +1661,8 @@ public int getImageTypeValue() {
        * @return This builder for chaining.
        */
       public Builder setImageTypeValue(int value) {
+
         imageType_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1708,7 +1672,6 @@ public Builder setImageTypeValue(int value) {
        *
        * 
        * The shape used to crop the image.
-       *
        * [Google Workspace add-ons and Chat
        * apps](https://developers.google.com/workspace/extend):
        * 

@@ -1719,8 +1682,9 @@ public Builder setImageTypeValue(int value) {
        */
       @java.lang.Override
       public com.google.apps.card.v1.Widget.ImageType getImageType() {
+        @SuppressWarnings("deprecation")
         com.google.apps.card.v1.Widget.ImageType result =
-            com.google.apps.card.v1.Widget.ImageType.forNumber(imageType_);
+            com.google.apps.card.v1.Widget.ImageType.valueOf(imageType_);
         return result == null ? com.google.apps.card.v1.Widget.ImageType.UNRECOGNIZED : result;
       }
 
@@ -1729,7 +1693,6 @@ public com.google.apps.card.v1.Widget.ImageType getImageType() {
        *
        * 
        * The shape used to crop the image.
-       *
        * [Google Workspace add-ons and Chat
        * apps](https://developers.google.com/workspace/extend):
        * 

@@ -1743,7 +1706,7 @@ public Builder setImageType(com.google.apps.card.v1.Widget.ImageType value) {
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000004;
+
         imageType_ = value.getNumber();
         onChanged();
         return this;
@@ -1754,7 +1717,6 @@ public Builder setImageType(com.google.apps.card.v1.Widget.ImageType value) {
        *
        * 
        * The shape used to crop the image.
-       *
        * [Google Workspace add-ons and Chat
        * apps](https://developers.google.com/workspace/extend):
        * 

@@ -1764,7 +1726,7 @@ public Builder setImageType(com.google.apps.card.v1.Widget.ImageType value) {
        * @return This builder for chaining.
        */
       public Builder clearImageType() {
-        bitField0_ = (bitField0_ & ~0x00000004);
+
         imageType_ = 0;
         onChanged();
         return this;
@@ -1834,8 +1796,8 @@ public Builder setImageUrl(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         imageUrl_ = value;
-        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1852,8 +1814,8 @@ public Builder setImageUrl(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearImageUrl() {
+
         imageUrl_ = getDefaultInstance().getImageUrl();
-        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -1875,8 +1837,8 @@ public Builder setImageUrlBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         imageUrl_ = value;
-        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1945,8 +1907,8 @@ public Builder setImageAltText(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         imageAltText_ = value;
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1963,8 +1925,8 @@ public Builder setImageAltText(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearImageAltText() {
+
         imageAltText_ = getDefaultInstance().getImageAltText();
-        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
       }
@@ -1986,8 +1948,8 @@ public Builder setImageAltTextBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         imageAltText_ = value;
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -2168,11 +2130,9 @@ public interface SectionOrBuilder
      *
      * 
      * Indicates whether this section is collapsible.
-     *
      * Collapsible sections hide some or all widgets, but users can expand the
      * section to reveal the hidden widgets by clicking **Show more**. Users
      * can hide the widgets again by clicking **Show less**.
-     *
      * To determine which widgets are hidden, specify
      * `uncollapsibleWidgetsCount`.
      * 

@@ -2189,7 +2149,6 @@ public interface SectionOrBuilder
      * 
      * The number of uncollapsible widgets which remain visible even when a
      * section is collapsed.
-     *
      * For example, when a section
      * contains five widgets and the `uncollapsibleWidgetsCount` is set to `2`,
      * the first two widgets are always shown and the last three are collapsed
@@ -2253,7 +2212,6 @@ public interface SectionOrBuilder
    * 
    * A section contains a collection of widgets that are rendered
    * vertically in the order that they're specified.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -2282,6 +2240,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Section();
     }
 
+    @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.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Card_Section_descriptor;
@@ -2297,11 +2260,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
               com.google.apps.card.v1.Card.Section.Builder.class);
     }
 
-    private int bitField0_;
     public static final int HEADER_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object header_ = "";
+    private volatile java.lang.Object header_;
 
     /**
      *
@@ -2368,8 +2328,6 @@ public com.google.protobuf.ByteString getHeaderBytes() {
     }
 
     public static final int WIDGETS_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
     private java.util.List widgets_;
 
     /**
@@ -2449,18 +2407,16 @@ public com.google.apps.card.v1.WidgetOrBuilder getWidgetsOrBuilder(int index) {
     }
 
     public static final int COLLAPSIBLE_FIELD_NUMBER = 5;
-    private boolean collapsible_ = false;
+    private boolean collapsible_;
 
     /**
      *
      *
      * 
      * Indicates whether this section is collapsible.
-     *
      * Collapsible sections hide some or all widgets, but users can expand the
      * section to reveal the hidden widgets by clicking **Show more**. Users
      * can hide the widgets again by clicking **Show less**.
-     *
      * To determine which widgets are hidden, specify
      * `uncollapsibleWidgetsCount`.
      * 

@@ -2475,7 +2431,7 @@ public boolean getCollapsible() {
     }
 
     public static final int UNCOLLAPSIBLE_WIDGETS_COUNT_FIELD_NUMBER = 6;
-    private int uncollapsibleWidgetsCount_ = 0;
+    private int uncollapsibleWidgetsCount_;
 
     /**
      *
@@ -2483,7 +2439,6 @@ public boolean getCollapsible() {
      * 
      * The number of uncollapsible widgets which remain visible even when a
      * section is collapsed.
-     *
      * For example, when a section
      * contains five widgets and the `uncollapsibleWidgetsCount` is set to `2`,
      * the first two widgets are always shown and the last three are collapsed
@@ -2518,7 +2473,7 @@ public int getUncollapsibleWidgetsCount() {
      */
     @java.lang.Override
     public boolean hasCollapseControl() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return collapseControl_ != null;
     }
 
     /**
@@ -2554,9 +2509,7 @@ public com.google.apps.card.v1.CollapseControl getCollapseControl() {
      */
     @java.lang.Override
     public com.google.apps.card.v1.CollapseControlOrBuilder getCollapseControlOrBuilder() {
-      return collapseControl_ == null
-          ? com.google.apps.card.v1.CollapseControl.getDefaultInstance()
-          : collapseControl_;
+      return getCollapseControl();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -2585,7 +2538,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (uncollapsibleWidgetsCount_ != 0) {
         output.writeInt32(6, uncollapsibleWidgetsCount_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (collapseControl_ != null) {
         output.writeMessage(8, getCollapseControl());
       }
       getUnknownFields().writeTo(output);
@@ -2610,7 +2563,7 @@ public int getSerializedSize() {
         size +=
             com.google.protobuf.CodedOutputStream.computeInt32Size(6, uncollapsibleWidgetsCount_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (collapseControl_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getCollapseControl());
       }
       size += getUnknownFields().getSerializedSize();
@@ -2769,7 +2722,6 @@ protected Builder newBuilderForType(
      * 
      * A section contains a collection of widgets that are rendered
      * vertically in the order that they're specified.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -2797,39 +2749,32 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.Card.Section.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getWidgetsFieldBuilder();
-          getCollapseControlFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         header_ = "";
+
         if (widgetsBuilder_ == null) {
           widgets_ = java.util.Collections.emptyList();
         } else {
           widgets_ = null;
           widgetsBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         collapsible_ = false;
+
         uncollapsibleWidgetsCount_ = 0;
-        collapseControl_ = null;
-        if (collapseControlBuilder_ != null) {
-          collapseControlBuilder_.dispose();
+
+        if (collapseControlBuilder_ == null) {
+          collapseControl_ = null;
+        } else {
+          collapseControl_ = null;
           collapseControlBuilder_ = null;
         }
         return this;
@@ -2859,44 +2804,26 @@ public com.google.apps.card.v1.Card.Section build() {
       public com.google.apps.card.v1.Card.Section buildPartial() {
         com.google.apps.card.v1.Card.Section result =
             new com.google.apps.card.v1.Card.Section(this);
-        buildPartialRepeatedFields(result);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
-        onBuilt();
-        return result;
-      }
-
-      private void buildPartialRepeatedFields(com.google.apps.card.v1.Card.Section result) {
+        int from_bitField0_ = bitField0_;
+        result.header_ = header_;
         if (widgetsBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             widgets_ = java.util.Collections.unmodifiableList(widgets_);
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.widgets_ = widgets_;
         } else {
           result.widgets_ = widgetsBuilder_.build();
         }
-      }
-
-      private void buildPartial0(com.google.apps.card.v1.Card.Section result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.header_ = header_;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.collapsible_ = collapsible_;
-        }
-        if (((from_bitField0_ & 0x00000008) != 0)) {
-          result.uncollapsibleWidgetsCount_ = uncollapsibleWidgetsCount_;
-        }
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000010) != 0)) {
-          result.collapseControl_ =
-              collapseControlBuilder_ == null ? collapseControl_ : collapseControlBuilder_.build();
-          to_bitField0_ |= 0x00000001;
+        result.collapsible_ = collapsible_;
+        result.uncollapsibleWidgetsCount_ = uncollapsibleWidgetsCount_;
+        if (collapseControlBuilder_ == null) {
+          result.collapseControl_ = collapseControl_;
+        } else {
+          result.collapseControl_ = collapseControlBuilder_.build();
         }
-        result.bitField0_ |= to_bitField0_;
+        onBuilt();
+        return result;
       }
 
       @java.lang.Override
@@ -2948,14 +2875,13 @@ public Builder mergeFrom(com.google.apps.card.v1.Card.Section other) {
         if (other == com.google.apps.card.v1.Card.Section.getDefaultInstance()) return this;
         if (!other.getHeader().isEmpty()) {
           header_ = other.header_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (widgetsBuilder_ == null) {
           if (!other.widgets_.isEmpty()) {
             if (widgets_.isEmpty()) {
               widgets_ = other.widgets_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureWidgetsIsMutable();
               widgets_.addAll(other.widgets_);
@@ -2968,7 +2894,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Card.Section other) {
               widgetsBuilder_.dispose();
               widgetsBuilder_ = null;
               widgets_ = other.widgets_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
               widgetsBuilder_ =
                   com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                       ? getWidgetsFieldBuilder()
@@ -3016,7 +2942,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   header_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
@@ -3034,20 +2960,20 @@ public Builder mergeFrom(
               case 40:
                 {
                   collapsible_ = input.readBool();
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 40
               case 48:
                 {
                   uncollapsibleWidgetsCount_ = input.readInt32();
-                  bitField0_ |= 0x00000008;
+
                   break;
                 } // case 48
               case 66:
                 {
                   input.readMessage(
                       getCollapseControlFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000010;
+
                   break;
                 } // case 66
               default:
@@ -3157,8 +3083,8 @@ public Builder setHeader(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         header_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -3183,8 +3109,8 @@ public Builder setHeader(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearHeader() {
+
         header_ = getDefaultInstance().getHeader();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -3214,8 +3140,8 @@ public Builder setHeaderBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         header_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -3224,9 +3150,9 @@ public Builder setHeaderBytes(com.google.protobuf.ByteString value) {
           java.util.Collections.emptyList();
 
       private void ensureWidgetsIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           widgets_ = new java.util.ArrayList(widgets_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000001;
         }
       }
 
@@ -3460,7 +3386,7 @@ public Builder addAllWidgets(
       public Builder clearWidgets() {
         if (widgetsBuilder_ == null) {
           widgets_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
           widgetsBuilder_.clear();
@@ -3595,7 +3521,7 @@ public java.util.List getWidgetsBuilderL
                   com.google.apps.card.v1.Widget,
                   com.google.apps.card.v1.Widget.Builder,
                   com.google.apps.card.v1.WidgetOrBuilder>(
-                  widgets_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                  widgets_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
           widgets_ = null;
         }
         return widgetsBuilder_;
@@ -3608,11 +3534,9 @@ public java.util.List getWidgetsBuilderL
        *
        * 
        * Indicates whether this section is collapsible.
-       *
        * Collapsible sections hide some or all widgets, but users can expand the
        * section to reveal the hidden widgets by clicking **Show more**. Users
        * can hide the widgets again by clicking **Show less**.
-       *
        * To determine which widgets are hidden, specify
        * `uncollapsibleWidgetsCount`.
        * 

@@ -3631,11 +3555,9 @@ public boolean getCollapsible() {
        *
        * 
        * Indicates whether this section is collapsible.
-       *
        * Collapsible sections hide some or all widgets, but users can expand the
        * section to reveal the hidden widgets by clicking **Show more**. Users
        * can hide the widgets again by clicking **Show less**.
-       *
        * To determine which widgets are hidden, specify
        * `uncollapsibleWidgetsCount`.
        * 

@@ -3648,7 +3570,6 @@ public boolean getCollapsible() {
       public Builder setCollapsible(boolean value) {
 
         collapsible_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -3658,11 +3579,9 @@ public Builder setCollapsible(boolean value) {
        *
        * 
        * Indicates whether this section is collapsible.
-       *
        * Collapsible sections hide some or all widgets, but users can expand the
        * section to reveal the hidden widgets by clicking **Show more**. Users
        * can hide the widgets again by clicking **Show less**.
-       *
        * To determine which widgets are hidden, specify
        * `uncollapsibleWidgetsCount`.
        * 

@@ -3672,7 +3591,7 @@ public Builder setCollapsible(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearCollapsible() {
-        bitField0_ = (bitField0_ & ~0x00000004);
+
         collapsible_ = false;
         onChanged();
         return this;
@@ -3686,7 +3605,6 @@ public Builder clearCollapsible() {
        * 
        * The number of uncollapsible widgets which remain visible even when a
        * section is collapsed.
-       *
        * For example, when a section
        * contains five widgets and the `uncollapsibleWidgetsCount` is set to `2`,
        * the first two widgets are always shown and the last three are collapsed
@@ -3709,7 +3627,6 @@ public int getUncollapsibleWidgetsCount() {
        * 
        * The number of uncollapsible widgets which remain visible even when a
        * section is collapsed.
-       *
        * For example, when a section
        * contains five widgets and the `uncollapsibleWidgetsCount` is set to `2`,
        * the first two widgets are always shown and the last three are collapsed
@@ -3725,7 +3642,6 @@ public int getUncollapsibleWidgetsCount() {
       public Builder setUncollapsibleWidgetsCount(int value) {
 
         uncollapsibleWidgetsCount_ = value;
-        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3736,7 +3652,6 @@ public Builder setUncollapsibleWidgetsCount(int value) {
        * 
        * The number of uncollapsible widgets which remain visible even when a
        * section is collapsed.
-       *
        * For example, when a section
        * contains five widgets and the `uncollapsibleWidgetsCount` is set to `2`,
        * the first two widgets are always shown and the last three are collapsed
@@ -3749,7 +3664,7 @@ public Builder setUncollapsibleWidgetsCount(int value) {
        * @return This builder for chaining.
        */
       public Builder clearUncollapsibleWidgetsCount() {
-        bitField0_ = (bitField0_ & ~0x00000008);
+
         uncollapsibleWidgetsCount_ = 0;
         onChanged();
         return this;
@@ -3776,7 +3691,7 @@ public Builder clearUncollapsibleWidgetsCount() {
        * @return Whether the collapseControl field is set.
        */
       public boolean hasCollapseControl() {
-        return ((bitField0_ & 0x00000010) != 0);
+        return collapseControlBuilder_ != null || collapseControl_ != null;
       }
 
       /**
@@ -3819,11 +3734,11 @@ public Builder setCollapseControl(com.google.apps.card.v1.CollapseControl value)
             throw new NullPointerException();
           }
           collapseControl_ = value;
+          onChanged();
         } else {
           collapseControlBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000010;
-        onChanged();
+
         return this;
       }
 
@@ -3842,11 +3757,11 @@ public Builder setCollapseControl(
           com.google.apps.card.v1.CollapseControl.Builder builderForValue) {
         if (collapseControlBuilder_ == null) {
           collapseControl_ = builderForValue.build();
+          onChanged();
         } else {
           collapseControlBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000010;
-        onChanged();
+
         return this;
       }
 
@@ -3863,20 +3778,19 @@ public Builder setCollapseControl(
        */
       public Builder mergeCollapseControl(com.google.apps.card.v1.CollapseControl value) {
         if (collapseControlBuilder_ == null) {
-          if (((bitField0_ & 0x00000010) != 0)
-              && collapseControl_ != null
-              && collapseControl_ != com.google.apps.card.v1.CollapseControl.getDefaultInstance()) {
-            getCollapseControlBuilder().mergeFrom(value);
+          if (collapseControl_ != null) {
+            collapseControl_ =
+                com.google.apps.card.v1.CollapseControl.newBuilder(collapseControl_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             collapseControl_ = value;
           }
+          onChanged();
         } else {
           collapseControlBuilder_.mergeFrom(value);
         }
-        if (collapseControl_ != null) {
-          bitField0_ |= 0x00000010;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -3892,13 +3806,14 @@ public Builder mergeCollapseControl(com.google.apps.card.v1.CollapseControl valu
        * .google.apps.card.v1.CollapseControl collapse_control = 8;
        */
       public Builder clearCollapseControl() {
-        bitField0_ = (bitField0_ & ~0x00000010);
-        collapseControl_ = null;
-        if (collapseControlBuilder_ != null) {
-          collapseControlBuilder_.dispose();
+        if (collapseControlBuilder_ == null) {
+          collapseControl_ = null;
+          onChanged();
+        } else {
+          collapseControl_ = null;
           collapseControlBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -3914,7 +3829,7 @@ public Builder clearCollapseControl() {
        * .google.apps.card.v1.CollapseControl collapse_control = 8;
        */
       public com.google.apps.card.v1.CollapseControl.Builder getCollapseControlBuilder() {
-        bitField0_ |= 0x00000010;
+
         onChanged();
         return getCollapseControlFieldBuilder().getBuilder();
       }
@@ -4108,7 +4023,6 @@ public interface CardActionOrBuilder
    * A card action is the action associated with the card. For example,
    * an invoice card might include actions such as delete invoice, email
    * invoice, or open the invoice in a browser.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -4136,6 +4050,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new CardAction();
     }
 
+    @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.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Card_CardAction_descriptor;
@@ -4151,11 +4070,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
               com.google.apps.card.v1.Card.CardAction.Builder.class);
     }
 
-    private int bitField0_;
     public static final int ACTION_LABEL_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object actionLabel_ = "";
+    private volatile java.lang.Object actionLabel_;
 
     /**
      *
@@ -4221,7 +4137,7 @@ public com.google.protobuf.ByteString getActionLabelBytes() {
      */
     @java.lang.Override
     public boolean hasOnClick() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return onClick_ != null;
     }
 
     /**
@@ -4251,7 +4167,7 @@ public com.google.apps.card.v1.OnClick getOnClick() {
      */
     @java.lang.Override
     public com.google.apps.card.v1.OnClickOrBuilder getOnClickOrBuilder() {
-      return onClick_ == null ? com.google.apps.card.v1.OnClick.getDefaultInstance() : onClick_;
+      return getOnClick();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -4271,7 +4187,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(actionLabel_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, actionLabel_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (onClick_ != null) {
         output.writeMessage(2, getOnClick());
       }
       getUnknownFields().writeTo(output);
@@ -4286,7 +4202,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(actionLabel_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, actionLabel_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (onClick_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getOnClick());
       }
       size += getUnknownFields().getSerializedSize();
@@ -4435,7 +4351,6 @@ protected Builder newBuilderForType(
      * A card action is the action associated with the card. For example,
      * an invoice card might include actions such as delete invoice, email
      * invoice, or open the invoice in a browser.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -4463,29 +4378,21 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.Card.CardAction.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getOnClickFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         actionLabel_ = "";
-        onClick_ = null;
-        if (onClickBuilder_ != null) {
-          onClickBuilder_.dispose();
+
+        if (onClickBuilder_ == null) {
+          onClick_ = null;
+        } else {
+          onClick_ = null;
           onClickBuilder_ = null;
         }
         return this;
@@ -4515,26 +4422,16 @@ public com.google.apps.card.v1.Card.CardAction build() {
       public com.google.apps.card.v1.Card.CardAction buildPartial() {
         com.google.apps.card.v1.Card.CardAction result =
             new com.google.apps.card.v1.Card.CardAction(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        result.actionLabel_ = actionLabel_;
+        if (onClickBuilder_ == null) {
+          result.onClick_ = onClick_;
+        } else {
+          result.onClick_ = onClickBuilder_.build();
         }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.apps.card.v1.Card.CardAction result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.actionLabel_ = actionLabel_;
-        }
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.onClick_ = onClickBuilder_ == null ? onClick_ : onClickBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        result.bitField0_ |= to_bitField0_;
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -4584,7 +4481,6 @@ public Builder mergeFrom(com.google.apps.card.v1.Card.CardAction other) {
         if (other == com.google.apps.card.v1.Card.CardAction.getDefaultInstance()) return this;
         if (!other.getActionLabel().isEmpty()) {
           actionLabel_ = other.actionLabel_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasOnClick()) {
@@ -4619,13 +4515,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   actionLabel_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   input.readMessage(getOnClickFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               default:
@@ -4645,8 +4541,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private java.lang.Object actionLabel_ = "";
 
       /**
@@ -4711,8 +4605,8 @@ public Builder setActionLabel(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         actionLabel_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4729,8 +4623,8 @@ public Builder setActionLabel(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearActionLabel() {
+
         actionLabel_ = getDefaultInstance().getActionLabel();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -4752,8 +4646,8 @@ public Builder setActionLabelBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         actionLabel_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4777,7 +4671,7 @@ public Builder setActionLabelBytes(com.google.protobuf.ByteString value) {
        * @return Whether the onClick field is set.
        */
       public boolean hasOnClick() {
-        return ((bitField0_ & 0x00000002) != 0);
+        return onClickBuilder_ != null || onClick_ != null;
       }
 
       /**
@@ -4814,11 +4708,11 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick value) {
             throw new NullPointerException();
           }
           onClick_ = value;
+          onChanged();
         } else {
           onClickBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -4834,11 +4728,11 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick value) {
       public Builder setOnClick(com.google.apps.card.v1.OnClick.Builder builderForValue) {
         if (onClickBuilder_ == null) {
           onClick_ = builderForValue.build();
+          onChanged();
         } else {
           onClickBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -4853,20 +4747,19 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick.Builder builderForValu
        */
       public Builder mergeOnClick(com.google.apps.card.v1.OnClick value) {
         if (onClickBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)
-              && onClick_ != null
-              && onClick_ != com.google.apps.card.v1.OnClick.getDefaultInstance()) {
-            getOnClickBuilder().mergeFrom(value);
+          if (onClick_ != null) {
+            onClick_ =
+                com.google.apps.card.v1.OnClick.newBuilder(onClick_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             onClick_ = value;
           }
+          onChanged();
         } else {
           onClickBuilder_.mergeFrom(value);
         }
-        if (onClick_ != null) {
-          bitField0_ |= 0x00000002;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -4880,13 +4773,14 @@ public Builder mergeOnClick(com.google.apps.card.v1.OnClick value) {
        * .google.apps.card.v1.OnClick on_click = 2;
        */
       public Builder clearOnClick() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onClick_ = null;
-        if (onClickBuilder_ != null) {
-          onClickBuilder_.dispose();
+        if (onClickBuilder_ == null) {
+          onClick_ = null;
+          onChanged();
+        } else {
+          onClick_ = null;
           onClickBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -4900,7 +4794,7 @@ public Builder clearOnClick() {
        * .google.apps.card.v1.OnClick on_click = 2;
        */
       public com.google.apps.card.v1.OnClick.Builder getOnClickBuilder() {
-        bitField0_ |= 0x00000002;
+
         onChanged();
         return getOnClickFieldBuilder().getBuilder();
       }
@@ -5128,7 +5022,7 @@ public interface NestedWidgetOrBuilder
      */
     com.google.apps.card.v1.ImageOrBuilder getImageOrBuilder();
 
-    com.google.apps.card.v1.Card.NestedWidget.DataCase getDataCase();
+    public com.google.apps.card.v1.Card.NestedWidget.DataCase getDataCase();
   }
 
   /**
@@ -5161,6 +5055,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new NestedWidget();
     }
 
+    @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.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Card_NestedWidget_descriptor;
@@ -5177,8 +5076,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     private int dataCase_ = 0;
-
-    @SuppressWarnings("serial")
     private java.lang.Object data_;
 
     public enum DataCase
@@ -5638,7 +5535,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         if (textParagraphBuilder_ != null) {
           textParagraphBuilder_.clear();
         }
@@ -5677,30 +5573,30 @@ public com.google.apps.card.v1.Card.NestedWidget build() {
       public com.google.apps.card.v1.Card.NestedWidget buildPartial() {
         com.google.apps.card.v1.Card.NestedWidget result =
             new com.google.apps.card.v1.Card.NestedWidget(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
-        buildPartialOneofs(result);
-        onBuilt();
-        return result;
-      }
-
-      private void buildPartial0(com.google.apps.card.v1.Card.NestedWidget result) {
-        int from_bitField0_ = bitField0_;
-      }
-
-      private void buildPartialOneofs(com.google.apps.card.v1.Card.NestedWidget result) {
-        result.dataCase_ = dataCase_;
-        result.data_ = this.data_;
-        if (dataCase_ == 1 && textParagraphBuilder_ != null) {
-          result.data_ = textParagraphBuilder_.build();
+        if (dataCase_ == 1) {
+          if (textParagraphBuilder_ == null) {
+            result.data_ = data_;
+          } else {
+            result.data_ = textParagraphBuilder_.build();
+          }
         }
-        if (dataCase_ == 3 && buttonListBuilder_ != null) {
-          result.data_ = buttonListBuilder_.build();
+        if (dataCase_ == 3) {
+          if (buttonListBuilder_ == null) {
+            result.data_ = data_;
+          } else {
+            result.data_ = buttonListBuilder_.build();
+          }
         }
-        if (dataCase_ == 10 && imageBuilder_ != null) {
-          result.data_ = imageBuilder_.build();
+        if (dataCase_ == 10) {
+          if (imageBuilder_ == null) {
+            result.data_ = data_;
+          } else {
+            result.data_ = imageBuilder_.build();
+          }
         }
+        result.dataCase_ = dataCase_;
+        onBuilt();
+        return result;
       }
 
       @java.lang.Override
@@ -5846,8 +5742,6 @@ public Builder clearData() {
         return this;
       }
 
-      private int bitField0_;
-
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.apps.card.v1.TextParagraph,
               com.google.apps.card.v1.TextParagraph.Builder,
@@ -6061,6 +5955,7 @@ public com.google.apps.card.v1.TextParagraphOrBuilder getTextParagraphOrBuilder(
         }
         dataCase_ = 1;
         onChanged();
+        ;
         return textParagraphBuilder_;
       }
 
@@ -6275,6 +6170,7 @@ public com.google.apps.card.v1.ButtonListOrBuilder getButtonListOrBuilder() {
         }
         dataCase_ = 3;
         onChanged();
+        ;
         return buttonListBuilder_;
       }
 
@@ -6488,6 +6384,7 @@ public com.google.apps.card.v1.ImageOrBuilder getImageOrBuilder() {
         }
         dataCase_ = 10;
         onChanged();
+        ;
         return imageBuilder_;
       }
 
@@ -6649,17 +6546,14 @@ public interface CardFixedFooterOrBuilder
    *
    * 
    * A persistent (sticky) footer that that appears at the bottom of the card.
-   *
    * Setting `fixedFooter` without specifying a `primaryButton` or a
    * `secondaryButton` causes an error.
-   *
    * For Chat apps, you can use fixed footers in
    * [dialogs](https://developers.google.com/workspace/chat/dialogs), but not
    * [card
    * messages](https://developers.google.com/workspace/chat/create-messages#create).
    * For an example in Google Chat apps, see [Add a persistent
    * footer](https://developers.google.com/workspace/chat/design-components-card-dialog#add_a_persistent_footer).
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -6685,6 +6579,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new CardFixedFooter();
     }
 
+    @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.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Card_CardFixedFooter_descriptor;
@@ -6700,7 +6599,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
               com.google.apps.card.v1.Card.CardFixedFooter.Builder.class);
     }
 
-    private int bitField0_;
     public static final int PRIMARY_BUTTON_FIELD_NUMBER = 1;
     private com.google.apps.card.v1.Button primaryButton_;
 
@@ -6718,7 +6616,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      */
     @java.lang.Override
     public boolean hasPrimaryButton() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return primaryButton_ != null;
     }
 
     /**
@@ -6752,9 +6650,7 @@ public com.google.apps.card.v1.Button getPrimaryButton() {
      */
     @java.lang.Override
     public com.google.apps.card.v1.ButtonOrBuilder getPrimaryButtonOrBuilder() {
-      return primaryButton_ == null
-          ? com.google.apps.card.v1.Button.getDefaultInstance()
-          : primaryButton_;
+      return getPrimaryButton();
     }
 
     public static final int SECONDARY_BUTTON_FIELD_NUMBER = 2;
@@ -6775,7 +6671,7 @@ public com.google.apps.card.v1.ButtonOrBuilder getPrimaryButtonOrBuilder() {
      */
     @java.lang.Override
     public boolean hasSecondaryButton() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return secondaryButton_ != null;
     }
 
     /**
@@ -6811,9 +6707,7 @@ public com.google.apps.card.v1.Button getSecondaryButton() {
      */
     @java.lang.Override
     public com.google.apps.card.v1.ButtonOrBuilder getSecondaryButtonOrBuilder() {
-      return secondaryButton_ == null
-          ? com.google.apps.card.v1.Button.getDefaultInstance()
-          : secondaryButton_;
+      return getSecondaryButton();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -6830,10 +6724,10 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (primaryButton_ != null) {
         output.writeMessage(1, getPrimaryButton());
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (secondaryButton_ != null) {
         output.writeMessage(2, getSecondaryButton());
       }
       getUnknownFields().writeTo(output);
@@ -6845,10 +6739,10 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (primaryButton_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getPrimaryButton());
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (secondaryButton_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getSecondaryButton());
       }
       size += getUnknownFields().getSerializedSize();
@@ -7001,17 +6895,14 @@ protected Builder newBuilderForType(
      *
      * 
      * A persistent (sticky) footer that that appears at the bottom of the card.
-     *
      * Setting `fixedFooter` without specifying a `primaryButton` or a
      * `secondaryButton` causes an error.
-     *
      * For Chat apps, you can use fixed footers in
      * [dialogs](https://developers.google.com/workspace/chat/dialogs), but not
      * [card
      * messages](https://developers.google.com/workspace/chat/create-messages#create).
      * For an example in Google Chat apps, see [Add a persistent
      * footer](https://developers.google.com/workspace/chat/design-components-card-dialog#add_a_persistent_footer).
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -7039,34 +6930,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.Card.CardFixedFooter.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getPrimaryButtonFieldBuilder();
-          getSecondaryButtonFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
-        primaryButton_ = null;
-        if (primaryButtonBuilder_ != null) {
-          primaryButtonBuilder_.dispose();
+        if (primaryButtonBuilder_ == null) {
+          primaryButton_ = null;
+        } else {
+          primaryButton_ = null;
           primaryButtonBuilder_ = null;
         }
-        secondaryButton_ = null;
-        if (secondaryButtonBuilder_ != null) {
-          secondaryButtonBuilder_.dispose();
+        if (secondaryButtonBuilder_ == null) {
+          secondaryButton_ = null;
+        } else {
+          secondaryButton_ = null;
           secondaryButtonBuilder_ = null;
         }
         return this;
@@ -7096,29 +6978,20 @@ public com.google.apps.card.v1.Card.CardFixedFooter build() {
       public com.google.apps.card.v1.Card.CardFixedFooter buildPartial() {
         com.google.apps.card.v1.Card.CardFixedFooter result =
             new com.google.apps.card.v1.Card.CardFixedFooter(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        if (primaryButtonBuilder_ == null) {
+          result.primaryButton_ = primaryButton_;
+        } else {
+          result.primaryButton_ = primaryButtonBuilder_.build();
+        }
+        if (secondaryButtonBuilder_ == null) {
+          result.secondaryButton_ = secondaryButton_;
+        } else {
+          result.secondaryButton_ = secondaryButtonBuilder_.build();
         }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.apps.card.v1.Card.CardFixedFooter result) {
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.primaryButton_ =
-              primaryButtonBuilder_ == null ? primaryButton_ : primaryButtonBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.secondaryButton_ =
-              secondaryButtonBuilder_ == null ? secondaryButton_ : secondaryButtonBuilder_.build();
-          to_bitField0_ |= 0x00000002;
-        }
-        result.bitField0_ |= to_bitField0_;
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -7201,14 +7074,14 @@ public Builder mergeFrom(
               case 10:
                 {
                   input.readMessage(getPrimaryButtonFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   input.readMessage(
                       getSecondaryButtonFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               default:
@@ -7228,8 +7101,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private com.google.apps.card.v1.Button primaryButton_;
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.apps.card.v1.Button,
@@ -7250,7 +7121,7 @@ public Builder mergeFrom(
        * @return Whether the primaryButton field is set.
        */
       public boolean hasPrimaryButton() {
-        return ((bitField0_ & 0x00000001) != 0);
+        return primaryButtonBuilder_ != null || primaryButton_ != null;
       }
 
       /**
@@ -7291,11 +7162,11 @@ public Builder setPrimaryButton(com.google.apps.card.v1.Button value) {
             throw new NullPointerException();
           }
           primaryButton_ = value;
+          onChanged();
         } else {
           primaryButtonBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+
         return this;
       }
 
@@ -7312,11 +7183,11 @@ public Builder setPrimaryButton(com.google.apps.card.v1.Button value) {
       public Builder setPrimaryButton(com.google.apps.card.v1.Button.Builder builderForValue) {
         if (primaryButtonBuilder_ == null) {
           primaryButton_ = builderForValue.build();
+          onChanged();
         } else {
           primaryButtonBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+
         return this;
       }
 
@@ -7332,20 +7203,19 @@ public Builder setPrimaryButton(com.google.apps.card.v1.Button.Builder builderFo
        */
       public Builder mergePrimaryButton(com.google.apps.card.v1.Button value) {
         if (primaryButtonBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)
-              && primaryButton_ != null
-              && primaryButton_ != com.google.apps.card.v1.Button.getDefaultInstance()) {
-            getPrimaryButtonBuilder().mergeFrom(value);
+          if (primaryButton_ != null) {
+            primaryButton_ =
+                com.google.apps.card.v1.Button.newBuilder(primaryButton_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             primaryButton_ = value;
           }
+          onChanged();
         } else {
           primaryButtonBuilder_.mergeFrom(value);
         }
-        if (primaryButton_ != null) {
-          bitField0_ |= 0x00000001;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -7360,13 +7230,14 @@ public Builder mergePrimaryButton(com.google.apps.card.v1.Button value) {
        * .google.apps.card.v1.Button primary_button = 1;
        */
       public Builder clearPrimaryButton() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        primaryButton_ = null;
-        if (primaryButtonBuilder_ != null) {
-          primaryButtonBuilder_.dispose();
+        if (primaryButtonBuilder_ == null) {
+          primaryButton_ = null;
+          onChanged();
+        } else {
+          primaryButton_ = null;
           primaryButtonBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -7381,7 +7252,7 @@ public Builder clearPrimaryButton() {
        * .google.apps.card.v1.Button primary_button = 1;
        */
       public com.google.apps.card.v1.Button.Builder getPrimaryButtonBuilder() {
-        bitField0_ |= 0x00000001;
+
         onChanged();
         return getPrimaryButtonFieldBuilder().getBuilder();
       }
@@ -7454,7 +7325,7 @@ public com.google.apps.card.v1.ButtonOrBuilder getPrimaryButtonOrBuilder() {
        * @return Whether the secondaryButton field is set.
        */
       public boolean hasSecondaryButton() {
-        return ((bitField0_ & 0x00000002) != 0);
+        return secondaryButtonBuilder_ != null || secondaryButton_ != null;
       }
 
       /**
@@ -7497,11 +7368,11 @@ public Builder setSecondaryButton(com.google.apps.card.v1.Button value) {
             throw new NullPointerException();
           }
           secondaryButton_ = value;
+          onChanged();
         } else {
           secondaryButtonBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -7519,11 +7390,11 @@ public Builder setSecondaryButton(com.google.apps.card.v1.Button value) {
       public Builder setSecondaryButton(com.google.apps.card.v1.Button.Builder builderForValue) {
         if (secondaryButtonBuilder_ == null) {
           secondaryButton_ = builderForValue.build();
+          onChanged();
         } else {
           secondaryButtonBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -7540,20 +7411,19 @@ public Builder setSecondaryButton(com.google.apps.card.v1.Button.Builder builder
        */
       public Builder mergeSecondaryButton(com.google.apps.card.v1.Button value) {
         if (secondaryButtonBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)
-              && secondaryButton_ != null
-              && secondaryButton_ != com.google.apps.card.v1.Button.getDefaultInstance()) {
-            getSecondaryButtonBuilder().mergeFrom(value);
+          if (secondaryButton_ != null) {
+            secondaryButton_ =
+                com.google.apps.card.v1.Button.newBuilder(secondaryButton_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             secondaryButton_ = value;
           }
+          onChanged();
         } else {
           secondaryButtonBuilder_.mergeFrom(value);
         }
-        if (secondaryButton_ != null) {
-          bitField0_ |= 0x00000002;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -7569,13 +7439,14 @@ public Builder mergeSecondaryButton(com.google.apps.card.v1.Button value) {
        * .google.apps.card.v1.Button secondary_button = 2;
        */
       public Builder clearSecondaryButton() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        secondaryButton_ = null;
-        if (secondaryButtonBuilder_ != null) {
-          secondaryButtonBuilder_.dispose();
+        if (secondaryButtonBuilder_ == null) {
+          secondaryButton_ = null;
+          onChanged();
+        } else {
+          secondaryButton_ = null;
           secondaryButtonBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -7591,7 +7462,7 @@ public Builder clearSecondaryButton() {
        * .google.apps.card.v1.Button secondary_button = 2;
        */
       public com.google.apps.card.v1.Button.Builder getSecondaryButtonBuilder() {
-        bitField0_ |= 0x00000002;
+
         onChanged();
         return getSecondaryButtonFieldBuilder().getBuilder();
       }
@@ -7709,7 +7580,6 @@ public com.google.apps.card.v1.Card.CardFixedFooter getDefaultInstanceForType()
     }
   }
 
-  private int bitField0_;
   public static final int HEADER_FIELD_NUMBER = 1;
   private com.google.apps.card.v1.Card.CardHeader header_;
 
@@ -7727,7 +7597,7 @@ public com.google.apps.card.v1.Card.CardFixedFooter getDefaultInstanceForType()
    */
   @java.lang.Override
   public boolean hasHeader() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return header_ != null;
   }
 
   /**
@@ -7759,12 +7629,10 @@ public com.google.apps.card.v1.Card.CardHeader getHeader() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.Card.CardHeaderOrBuilder getHeaderOrBuilder() {
-    return header_ == null ? com.google.apps.card.v1.Card.CardHeader.getDefaultInstance() : header_;
+    return getHeader();
   }
 
   public static final int SECTIONS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List sections_;
 
   /**
@@ -7854,7 +7722,7 @@ public com.google.apps.card.v1.Card.SectionOrBuilder getSectionsOrBuilder(int in
   }
 
   public static final int SECTION_DIVIDER_STYLE_FIELD_NUMBER = 9;
-  private int sectionDividerStyle_ = 0;
+  private int sectionDividerStyle_;
 
   /**
    *
@@ -7885,14 +7753,13 @@ public int getSectionDividerStyleValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.Card.DividerStyle getSectionDividerStyle() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.Card.DividerStyle result =
-        com.google.apps.card.v1.Card.DividerStyle.forNumber(sectionDividerStyle_);
+        com.google.apps.card.v1.Card.DividerStyle.valueOf(sectionDividerStyle_);
     return result == null ? com.google.apps.card.v1.Card.DividerStyle.UNRECOGNIZED : result;
   }
 
   public static final int CARD_ACTIONS_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
   private java.util.List cardActions_;
 
   /**
@@ -7900,13 +7767,10 @@ public com.google.apps.card.v1.Card.DividerStyle getSectionDividerStyle() {
    *
    * 
    * The card's actions. Actions are added to the card's toolbar menu.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
-   *
    * For example, the following JSON constructs a card action menu with
    * `Settings` and `Send Feedback` options:
-   *
    * ```
    * "card_actions": [
    *   {
@@ -7948,13 +7812,10 @@ public java.util.List getCardActionsLis
    *
    * 
    * The card's actions. Actions are added to the card's toolbar menu.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
-   *
    * For example, the following JSON constructs a card action menu with
    * `Settings` and `Send Feedback` options:
-   *
    * ```
    * "card_actions": [
    *   {
@@ -7997,13 +7858,10 @@ public java.util.List getCardActionsLis
    *
    * 
    * The card's actions. Actions are added to the card's toolbar menu.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
-   *
    * For example, the following JSON constructs a card action menu with
    * `Settings` and `Send Feedback` options:
-   *
    * ```
    * "card_actions": [
    *   {
@@ -8045,13 +7903,10 @@ public int getCardActionsCount() {
    *
    * 
    * The card's actions. Actions are added to the card's toolbar menu.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
-   *
    * For example, the following JSON constructs a card action menu with
    * `Settings` and `Send Feedback` options:
-   *
    * ```
    * "card_actions": [
    *   {
@@ -8093,13 +7948,10 @@ public com.google.apps.card.v1.Card.CardAction getCardActions(int index) {
    *
    * 
    * The card's actions. Actions are added to the card's toolbar menu.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
-   *
    * For example, the following JSON constructs a card action menu with
    * `Settings` and `Send Feedback` options:
-   *
    * ```
    * "card_actions": [
    *   {
@@ -8137,16 +7989,13 @@ public com.google.apps.card.v1.Card.CardActionOrBuilder getCardActionsOrBuilder(
   }
 
   public static final int NAME_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
    *
    * 
    * Name of the card. Used as a card identifier in card navigation.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -8173,7 +8022,6 @@ public java.lang.String getName() {
    *
    * 
    * Name of the card. Used as a card identifier in card navigation.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -8203,14 +8051,12 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * 
    * The fixed footer shown at the bottom of this card.
-   *
    * Setting `fixedFooter` without specifying a `primaryButton` or a
    * `secondaryButton` causes an error. For Chat apps, you can use fixed footers
    * in
    * [dialogs](https://developers.google.com/workspace/chat/dialogs), but not
    * [card
    * messages](https://developers.google.com/workspace/chat/create-messages#create).
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -8221,7 +8067,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    */
   @java.lang.Override
   public boolean hasFixedFooter() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return fixedFooter_ != null;
   }
 
   /**
@@ -8229,14 +8075,12 @@ public boolean hasFixedFooter() {
    *
    * 
    * The fixed footer shown at the bottom of this card.
-   *
    * Setting `fixedFooter` without specifying a `primaryButton` or a
    * `secondaryButton` causes an error. For Chat apps, you can use fixed footers
    * in
    * [dialogs](https://developers.google.com/workspace/chat/dialogs), but not
    * [card
    * messages](https://developers.google.com/workspace/chat/create-messages#create).
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -8257,14 +8101,12 @@ public com.google.apps.card.v1.Card.CardFixedFooter getFixedFooter() {
    *
    * 
    * The fixed footer shown at the bottom of this card.
-   *
    * Setting `fixedFooter` without specifying a `primaryButton` or a
    * `secondaryButton` causes an error. For Chat apps, you can use fixed footers
    * in
    * [dialogs](https://developers.google.com/workspace/chat/dialogs), but not
    * [card
    * messages](https://developers.google.com/workspace/chat/create-messages#create).
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -8273,13 +8115,11 @@ public com.google.apps.card.v1.Card.CardFixedFooter getFixedFooter() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.Card.CardFixedFooterOrBuilder getFixedFooterOrBuilder() {
-    return fixedFooter_ == null
-        ? com.google.apps.card.v1.Card.CardFixedFooter.getDefaultInstance()
-        : fixedFooter_;
+    return getFixedFooter();
   }
 
   public static final int DISPLAY_STYLE_FIELD_NUMBER = 6;
-  private int displayStyle_ = 0;
+  private int displayStyle_;
 
   /**
    *
@@ -8287,7 +8127,6 @@ public com.google.apps.card.v1.Card.CardFixedFooterOrBuilder getFixedFooterOrBui
    * 
    * In Google Workspace add-ons, sets the display properties of the
    * `peekCardHeader`.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -8307,7 +8146,6 @@ public int getDisplayStyleValue() {
    * 
    * In Google Workspace add-ons, sets the display properties of the
    * `peekCardHeader`.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -8318,8 +8156,9 @@ public int getDisplayStyleValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.Card.DisplayStyle getDisplayStyle() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.Card.DisplayStyle result =
-        com.google.apps.card.v1.Card.DisplayStyle.forNumber(displayStyle_);
+        com.google.apps.card.v1.Card.DisplayStyle.valueOf(displayStyle_);
     return result == null ? com.google.apps.card.v1.Card.DisplayStyle.UNRECOGNIZED : result;
   }
 
@@ -8333,7 +8172,6 @@ public com.google.apps.card.v1.Card.DisplayStyle getDisplayStyle() {
    * When displaying contextual content, the peek card header acts as a
    * placeholder so that the user can navigate forward between the homepage
    * cards and the contextual cards.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -8344,7 +8182,7 @@ public com.google.apps.card.v1.Card.DisplayStyle getDisplayStyle() {
    */
   @java.lang.Override
   public boolean hasPeekCardHeader() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return peekCardHeader_ != null;
   }
 
   /**
@@ -8354,7 +8192,6 @@ public boolean hasPeekCardHeader() {
    * When displaying contextual content, the peek card header acts as a
    * placeholder so that the user can navigate forward between the homepage
    * cards and the contextual cards.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -8377,7 +8214,6 @@ public com.google.apps.card.v1.Card.CardHeader getPeekCardHeader() {
    * When displaying contextual content, the peek card header acts as a
    * placeholder so that the user can navigate forward between the homepage
    * cards and the contextual cards.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -8386,9 +8222,7 @@ public com.google.apps.card.v1.Card.CardHeader getPeekCardHeader() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.Card.CardHeaderOrBuilder getPeekCardHeaderOrBuilder() {
-    return peekCardHeader_ == null
-        ? com.google.apps.card.v1.Card.CardHeader.getDefaultInstance()
-        : peekCardHeader_;
+    return getPeekCardHeader();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -8405,7 +8239,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (header_ != null) {
       output.writeMessage(1, getHeader());
     }
     for (int i = 0; i < sections_.size(); i++) {
@@ -8417,14 +8251,14 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, name_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (fixedFooter_ != null) {
       output.writeMessage(5, getFixedFooter());
     }
     if (displayStyle_
         != com.google.apps.card.v1.Card.DisplayStyle.DISPLAY_STYLE_UNSPECIFIED.getNumber()) {
       output.writeEnum(6, displayStyle_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (peekCardHeader_ != null) {
       output.writeMessage(7, getPeekCardHeader());
     }
     if (sectionDividerStyle_
@@ -8440,7 +8274,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (header_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getHeader());
     }
     for (int i = 0; i < sections_.size(); i++) {
@@ -8452,14 +8286,14 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, name_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (fixedFooter_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getFixedFooter());
     }
     if (displayStyle_
         != com.google.apps.card.v1.Card.DisplayStyle.DISPLAY_STYLE_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(6, displayStyle_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (peekCardHeader_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getPeekCardHeader());
     }
     if (sectionDividerStyle_
@@ -8641,32 +8475,23 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * 
    * A card interface displayed in a Google Chat message or Google Workspace
    * add-on.
-   *
    * Cards support a defined layout, interactive UI elements like buttons, and
    * rich media like images. Use cards to present detailed information,
    * gather information from users, and guide users to take a next step.
-   *
    * [Card builder](https://addons.gsuite.google.com/uikit/builder)
-   *
    * To learn how
    * to build cards, see the following documentation:
-   *
    * * For Google Chat apps, see [Design the components of a card or
    *   dialog](https://developers.google.com/workspace/chat/design-components-card-dialog).
    * * For Google Workspace add-ons, see [Card-based
    * interfaces](https://developers.google.com/apps-script/add-ons/concepts/cards).
-   *
    * Note: You can add up to 100 widgets per card. Any widgets beyond this
    * limit are ignored. This limit applies to both card messages and dialogs
    * in Google Chat apps, and to cards in Google Workspace add-ons.
-   *
    * **Example: Card message for a Google Chat app**
-   *
    * ![Example contact
    * card](https://developers.google.com/workspace/chat/images/card_api_reference.png)
-   *
    * To create the sample card message in Google Chat, use the following JSON:
-   *
    * ```
    * {
    *   "cardsV2": [
@@ -8769,32 +8594,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Card.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getHeaderFieldBuilder();
-        getSectionsFieldBuilder();
-        getCardActionsFieldBuilder();
-        getFixedFooterFieldBuilder();
-        getPeekCardHeaderFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      header_ = null;
-      if (headerBuilder_ != null) {
-        headerBuilder_.dispose();
+      if (headerBuilder_ == null) {
+        header_ = null;
+      } else {
+        header_ = null;
         headerBuilder_ = null;
       }
       if (sectionsBuilder_ == null) {
@@ -8803,25 +8615,30 @@ public Builder clear() {
         sections_ = null;
         sectionsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       sectionDividerStyle_ = 0;
+
       if (cardActionsBuilder_ == null) {
         cardActions_ = java.util.Collections.emptyList();
       } else {
         cardActions_ = null;
         cardActionsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000008);
+      bitField0_ = (bitField0_ & ~0x00000002);
       name_ = "";
-      fixedFooter_ = null;
-      if (fixedFooterBuilder_ != null) {
-        fixedFooterBuilder_.dispose();
+
+      if (fixedFooterBuilder_ == null) {
+        fixedFooter_ = null;
+      } else {
+        fixedFooter_ = null;
         fixedFooterBuilder_ = null;
       }
       displayStyle_ = 0;
-      peekCardHeader_ = null;
-      if (peekCardHeaderBuilder_ != null) {
-        peekCardHeaderBuilder_.dispose();
+
+      if (peekCardHeaderBuilder_ == null) {
+        peekCardHeader_ = null;
+      } else {
+        peekCardHeader_ = null;
         peekCardHeaderBuilder_ = null;
       }
       return this;
@@ -8849,62 +8666,45 @@ public com.google.apps.card.v1.Card build() {
     @java.lang.Override
     public com.google.apps.card.v1.Card buildPartial() {
       com.google.apps.card.v1.Card result = new com.google.apps.card.v1.Card(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      if (headerBuilder_ == null) {
+        result.header_ = header_;
+      } else {
+        result.header_ = headerBuilder_.build();
       }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.apps.card.v1.Card result) {
       if (sectionsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           sections_ = java.util.Collections.unmodifiableList(sections_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.sections_ = sections_;
       } else {
         result.sections_ = sectionsBuilder_.build();
       }
+      result.sectionDividerStyle_ = sectionDividerStyle_;
       if (cardActionsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           cardActions_ = java.util.Collections.unmodifiableList(cardActions_);
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.cardActions_ = cardActions_;
       } else {
         result.cardActions_ = cardActionsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.apps.card.v1.Card result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.header_ = headerBuilder_ == null ? header_ : headerBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.sectionDividerStyle_ = sectionDividerStyle_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.fixedFooter_ =
-            fixedFooterBuilder_ == null ? fixedFooter_ : fixedFooterBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.displayStyle_ = displayStyle_;
+      result.name_ = name_;
+      if (fixedFooterBuilder_ == null) {
+        result.fixedFooter_ = fixedFooter_;
+      } else {
+        result.fixedFooter_ = fixedFooterBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.peekCardHeader_ =
-            peekCardHeaderBuilder_ == null ? peekCardHeader_ : peekCardHeaderBuilder_.build();
-        to_bitField0_ |= 0x00000004;
+      result.displayStyle_ = displayStyle_;
+      if (peekCardHeaderBuilder_ == null) {
+        result.peekCardHeader_ = peekCardHeader_;
+      } else {
+        result.peekCardHeader_ = peekCardHeaderBuilder_.build();
       }
-      result.bitField0_ |= to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -8959,7 +8759,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Card other) {
         if (!other.sections_.isEmpty()) {
           if (sections_.isEmpty()) {
             sections_ = other.sections_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureSectionsIsMutable();
             sections_.addAll(other.sections_);
@@ -8972,7 +8772,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Card other) {
             sectionsBuilder_.dispose();
             sectionsBuilder_ = null;
             sections_ = other.sections_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             sectionsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getSectionsFieldBuilder()
@@ -8989,7 +8789,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Card other) {
         if (!other.cardActions_.isEmpty()) {
           if (cardActions_.isEmpty()) {
             cardActions_ = other.cardActions_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureCardActionsIsMutable();
             cardActions_.addAll(other.cardActions_);
@@ -9002,7 +8802,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Card other) {
             cardActionsBuilder_.dispose();
             cardActionsBuilder_ = null;
             cardActions_ = other.cardActions_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000002);
             cardActionsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getCardActionsFieldBuilder()
@@ -9014,7 +8814,6 @@ public Builder mergeFrom(com.google.apps.card.v1.Card other) {
       }
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000010;
         onChanged();
       }
       if (other.hasFixedFooter()) {
@@ -9055,7 +8854,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getHeaderFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -9087,31 +8886,31 @@ public Builder mergeFrom(
             case 34:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 34
             case 42:
               {
                 input.readMessage(getFixedFooterFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 42
             case 48:
               {
                 displayStyle_ = input.readEnum();
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 48
             case 58:
               {
                 input.readMessage(getPeekCardHeaderFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 58
             case 72:
               {
                 sectionDividerStyle_ = input.readEnum();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 72
             default:
@@ -9153,7 +8952,7 @@ public Builder mergeFrom(
      * @return Whether the header field is set.
      */
     public boolean hasHeader() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return headerBuilder_ != null || header_ != null;
     }
 
     /**
@@ -9194,11 +8993,11 @@ public Builder setHeader(com.google.apps.card.v1.Card.CardHeader value) {
           throw new NullPointerException();
         }
         header_ = value;
+        onChanged();
       } else {
         headerBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -9215,11 +9014,11 @@ public Builder setHeader(com.google.apps.card.v1.Card.CardHeader value) {
     public Builder setHeader(com.google.apps.card.v1.Card.CardHeader.Builder builderForValue) {
       if (headerBuilder_ == null) {
         header_ = builderForValue.build();
+        onChanged();
       } else {
         headerBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -9235,20 +9034,19 @@ public Builder setHeader(com.google.apps.card.v1.Card.CardHeader.Builder builder
      */
     public Builder mergeHeader(com.google.apps.card.v1.Card.CardHeader value) {
       if (headerBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && header_ != null
-            && header_ != com.google.apps.card.v1.Card.CardHeader.getDefaultInstance()) {
-          getHeaderBuilder().mergeFrom(value);
+        if (header_ != null) {
+          header_ =
+              com.google.apps.card.v1.Card.CardHeader.newBuilder(header_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           header_ = value;
         }
+        onChanged();
       } else {
         headerBuilder_.mergeFrom(value);
       }
-      if (header_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -9263,13 +9061,14 @@ public Builder mergeHeader(com.google.apps.card.v1.Card.CardHeader value) {
      * .google.apps.card.v1.Card.CardHeader header = 1;
      */
     public Builder clearHeader() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      header_ = null;
-      if (headerBuilder_ != null) {
-        headerBuilder_.dispose();
+      if (headerBuilder_ == null) {
+        header_ = null;
+        onChanged();
+      } else {
+        header_ = null;
         headerBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -9284,7 +9083,7 @@ public Builder clearHeader() {
      * .google.apps.card.v1.Card.CardHeader header = 1;
      */
     public com.google.apps.card.v1.Card.CardHeader.Builder getHeaderBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getHeaderFieldBuilder().getBuilder();
     }
@@ -9340,9 +9139,9 @@ public com.google.apps.card.v1.Card.CardHeaderOrBuilder getHeaderOrBuilder() {
         java.util.Collections.emptyList();
 
     private void ensureSectionsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         sections_ = new java.util.ArrayList(sections_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -9600,7 +9399,7 @@ public Builder addAllSections(
     public Builder clearSections() {
       if (sectionsBuilder_ == null) {
         sections_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         sectionsBuilder_.clear();
@@ -9749,7 +9548,7 @@ public java.util.List getSectionsB
                 com.google.apps.card.v1.Card.Section,
                 com.google.apps.card.v1.Card.Section.Builder,
                 com.google.apps.card.v1.Card.SectionOrBuilder>(
-                sections_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                sections_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         sections_ = null;
       }
       return sectionsBuilder_;
@@ -9786,8 +9585,8 @@ public int getSectionDividerStyleValue() {
      * @return This builder for chaining.
      */
     public Builder setSectionDividerStyleValue(int value) {
+
       sectionDividerStyle_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -9805,8 +9604,9 @@ public Builder setSectionDividerStyleValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.Card.DividerStyle getSectionDividerStyle() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.Card.DividerStyle result =
-          com.google.apps.card.v1.Card.DividerStyle.forNumber(sectionDividerStyle_);
+          com.google.apps.card.v1.Card.DividerStyle.valueOf(sectionDividerStyle_);
       return result == null ? com.google.apps.card.v1.Card.DividerStyle.UNRECOGNIZED : result;
     }
 
@@ -9826,7 +9626,7 @@ public Builder setSectionDividerStyle(com.google.apps.card.v1.Card.DividerStyle
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000004;
+
       sectionDividerStyle_ = value.getNumber();
       onChanged();
       return this;
@@ -9844,7 +9644,7 @@ public Builder setSectionDividerStyle(com.google.apps.card.v1.Card.DividerStyle
      * @return This builder for chaining.
      */
     public Builder clearSectionDividerStyle() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       sectionDividerStyle_ = 0;
       onChanged();
       return this;
@@ -9854,10 +9654,10 @@ public Builder clearSectionDividerStyle() {
         java.util.Collections.emptyList();
 
     private void ensureCardActionsIsMutable() {
-      if (!((bitField0_ & 0x00000008) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         cardActions_ =
             new java.util.ArrayList(cardActions_);
-        bitField0_ |= 0x00000008;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -9872,13 +9672,10 @@ private void ensureCardActionsIsMutable() {
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -9923,13 +9720,10 @@ public java.util.List getCardActionsLis
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -9974,13 +9768,10 @@ public int getCardActionsCount() {
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -10025,13 +9816,10 @@ public com.google.apps.card.v1.Card.CardAction getCardActions(int index) {
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -10082,13 +9870,10 @@ public Builder setCardActions(int index, com.google.apps.card.v1.Card.CardAction
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -10137,13 +9922,10 @@ public Builder setCardActions(
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -10194,13 +9976,10 @@ public Builder addCardActions(com.google.apps.card.v1.Card.CardAction value) {
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -10251,13 +10030,10 @@ public Builder addCardActions(int index, com.google.apps.card.v1.Card.CardAction
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -10305,13 +10081,10 @@ public Builder addCardActions(com.google.apps.card.v1.Card.CardAction.Builder bu
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -10360,13 +10133,10 @@ public Builder addCardActions(
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -10415,13 +10185,10 @@ public Builder addAllCardActions(
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -10456,7 +10223,7 @@ public Builder addAllCardActions(
     public Builder clearCardActions() {
       if (cardActionsBuilder_ == null) {
         cardActions_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         cardActionsBuilder_.clear();
@@ -10469,13 +10236,10 @@ public Builder clearCardActions() {
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -10523,13 +10287,10 @@ public Builder removeCardActions(int index) {
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -10570,13 +10331,10 @@ public com.google.apps.card.v1.Card.CardAction.Builder getCardActionsBuilder(int
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -10621,13 +10379,10 @@ public com.google.apps.card.v1.Card.CardActionOrBuilder getCardActionsOrBuilder(
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -10673,13 +10428,10 @@ public com.google.apps.card.v1.Card.CardActionOrBuilder getCardActionsOrBuilder(
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -10721,13 +10473,10 @@ public com.google.apps.card.v1.Card.CardAction.Builder addCardActionsBuilder() {
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -10769,13 +10518,10 @@ public com.google.apps.card.v1.Card.CardAction.Builder addCardActionsBuilder(int
      *
      * 
      * The card's actions. Actions are added to the card's toolbar menu.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
-     *
      * For example, the following JSON constructs a card action menu with
      * `Settings` and `Send Feedback` options:
-     *
      * ```
      * "card_actions": [
      *   {
@@ -10823,7 +10569,7 @@ public com.google.apps.card.v1.Card.CardAction.Builder addCardActionsBuilder(int
                 com.google.apps.card.v1.Card.CardAction,
                 com.google.apps.card.v1.Card.CardAction.Builder,
                 com.google.apps.card.v1.Card.CardActionOrBuilder>(
-                cardActions_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
+                cardActions_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         cardActions_ = null;
       }
       return cardActionsBuilder_;
@@ -10836,7 +10582,6 @@ public com.google.apps.card.v1.Card.CardAction.Builder addCardActionsBuilder(int
      *
      * 
      * Name of the card. Used as a card identifier in card navigation.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -10862,7 +10607,6 @@ public java.lang.String getName() {
      *
      * 
      * Name of the card. Used as a card identifier in card navigation.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -10888,7 +10632,6 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * 
      * Name of the card. Used as a card identifier in card navigation.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -10902,8 +10645,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -10913,7 +10656,6 @@ public Builder setName(java.lang.String value) {
      *
      * 
      * Name of the card. Used as a card identifier in card navigation.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -10923,8 +10665,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -10934,7 +10676,6 @@ public Builder clearName() {
      *
      * 
      * Name of the card. Used as a card identifier in card navigation.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -10949,8 +10690,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -10967,14 +10708,12 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      *
      * 
      * The fixed footer shown at the bottom of this card.
-     *
      * Setting `fixedFooter` without specifying a `primaryButton` or a
      * `secondaryButton` causes an error. For Chat apps, you can use fixed footers
      * in
      * [dialogs](https://developers.google.com/workspace/chat/dialogs), but not
      * [card
      * messages](https://developers.google.com/workspace/chat/create-messages#create).
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -10984,7 +10723,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the fixedFooter field is set.
      */
     public boolean hasFixedFooter() {
-      return ((bitField0_ & 0x00000020) != 0);
+      return fixedFooterBuilder_ != null || fixedFooter_ != null;
     }
 
     /**
@@ -10992,14 +10731,12 @@ public boolean hasFixedFooter() {
      *
      * 
      * The fixed footer shown at the bottom of this card.
-     *
      * Setting `fixedFooter` without specifying a `primaryButton` or a
      * `secondaryButton` causes an error. For Chat apps, you can use fixed footers
      * in
      * [dialogs](https://developers.google.com/workspace/chat/dialogs), but not
      * [card
      * messages](https://developers.google.com/workspace/chat/create-messages#create).
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -11023,14 +10760,12 @@ public com.google.apps.card.v1.Card.CardFixedFooter getFixedFooter() {
      *
      * 
      * The fixed footer shown at the bottom of this card.
-     *
      * Setting `fixedFooter` without specifying a `primaryButton` or a
      * `secondaryButton` causes an error. For Chat apps, you can use fixed footers
      * in
      * [dialogs](https://developers.google.com/workspace/chat/dialogs), but not
      * [card
      * messages](https://developers.google.com/workspace/chat/create-messages#create).
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -11043,11 +10778,11 @@ public Builder setFixedFooter(com.google.apps.card.v1.Card.CardFixedFooter value
           throw new NullPointerException();
         }
         fixedFooter_ = value;
+        onChanged();
       } else {
         fixedFooterBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000020;
-      onChanged();
+
       return this;
     }
 
@@ -11056,14 +10791,12 @@ public Builder setFixedFooter(com.google.apps.card.v1.Card.CardFixedFooter value
      *
      * 
      * The fixed footer shown at the bottom of this card.
-     *
      * Setting `fixedFooter` without specifying a `primaryButton` or a
      * `secondaryButton` causes an error. For Chat apps, you can use fixed footers
      * in
      * [dialogs](https://developers.google.com/workspace/chat/dialogs), but not
      * [card
      * messages](https://developers.google.com/workspace/chat/create-messages#create).
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -11074,11 +10807,11 @@ public Builder setFixedFooter(
         com.google.apps.card.v1.Card.CardFixedFooter.Builder builderForValue) {
       if (fixedFooterBuilder_ == null) {
         fixedFooter_ = builderForValue.build();
+        onChanged();
       } else {
         fixedFooterBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000020;
-      onChanged();
+
       return this;
     }
 
@@ -11087,14 +10820,12 @@ public Builder setFixedFooter(
      *
      * 
      * The fixed footer shown at the bottom of this card.
-     *
      * Setting `fixedFooter` without specifying a `primaryButton` or a
      * `secondaryButton` causes an error. For Chat apps, you can use fixed footers
      * in
      * [dialogs](https://developers.google.com/workspace/chat/dialogs), but not
      * [card
      * messages](https://developers.google.com/workspace/chat/create-messages#create).
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -11103,20 +10834,19 @@ public Builder setFixedFooter(
      */
     public Builder mergeFixedFooter(com.google.apps.card.v1.Card.CardFixedFooter value) {
       if (fixedFooterBuilder_ == null) {
-        if (((bitField0_ & 0x00000020) != 0)
-            && fixedFooter_ != null
-            && fixedFooter_ != com.google.apps.card.v1.Card.CardFixedFooter.getDefaultInstance()) {
-          getFixedFooterBuilder().mergeFrom(value);
+        if (fixedFooter_ != null) {
+          fixedFooter_ =
+              com.google.apps.card.v1.Card.CardFixedFooter.newBuilder(fixedFooter_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           fixedFooter_ = value;
         }
+        onChanged();
       } else {
         fixedFooterBuilder_.mergeFrom(value);
       }
-      if (fixedFooter_ != null) {
-        bitField0_ |= 0x00000020;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -11125,14 +10855,12 @@ public Builder mergeFixedFooter(com.google.apps.card.v1.Card.CardFixedFooter val
      *
      * 
      * The fixed footer shown at the bottom of this card.
-     *
      * Setting `fixedFooter` without specifying a `primaryButton` or a
      * `secondaryButton` causes an error. For Chat apps, you can use fixed footers
      * in
      * [dialogs](https://developers.google.com/workspace/chat/dialogs), but not
      * [card
      * messages](https://developers.google.com/workspace/chat/create-messages#create).
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -11140,13 +10868,14 @@ public Builder mergeFixedFooter(com.google.apps.card.v1.Card.CardFixedFooter val
      * .google.apps.card.v1.Card.CardFixedFooter fixed_footer = 5;
      */
     public Builder clearFixedFooter() {
-      bitField0_ = (bitField0_ & ~0x00000020);
-      fixedFooter_ = null;
-      if (fixedFooterBuilder_ != null) {
-        fixedFooterBuilder_.dispose();
+      if (fixedFooterBuilder_ == null) {
+        fixedFooter_ = null;
+        onChanged();
+      } else {
+        fixedFooter_ = null;
         fixedFooterBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -11155,14 +10884,12 @@ public Builder clearFixedFooter() {
      *
      * 
      * The fixed footer shown at the bottom of this card.
-     *
      * Setting `fixedFooter` without specifying a `primaryButton` or a
      * `secondaryButton` causes an error. For Chat apps, you can use fixed footers
      * in
      * [dialogs](https://developers.google.com/workspace/chat/dialogs), but not
      * [card
      * messages](https://developers.google.com/workspace/chat/create-messages#create).
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -11170,7 +10897,7 @@ public Builder clearFixedFooter() {
      * .google.apps.card.v1.Card.CardFixedFooter fixed_footer = 5;
      */
     public com.google.apps.card.v1.Card.CardFixedFooter.Builder getFixedFooterBuilder() {
-      bitField0_ |= 0x00000020;
+
       onChanged();
       return getFixedFooterFieldBuilder().getBuilder();
     }
@@ -11180,14 +10907,12 @@ public com.google.apps.card.v1.Card.CardFixedFooter.Builder getFixedFooterBuilde
      *
      * 
      * The fixed footer shown at the bottom of this card.
-     *
      * Setting `fixedFooter` without specifying a `primaryButton` or a
      * `secondaryButton` causes an error. For Chat apps, you can use fixed footers
      * in
      * [dialogs](https://developers.google.com/workspace/chat/dialogs), but not
      * [card
      * messages](https://developers.google.com/workspace/chat/create-messages#create).
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -11209,14 +10934,12 @@ public com.google.apps.card.v1.Card.CardFixedFooterOrBuilder getFixedFooterOrBui
      *
      * 
      * The fixed footer shown at the bottom of this card.
-     *
      * Setting `fixedFooter` without specifying a `primaryButton` or a
      * `secondaryButton` causes an error. For Chat apps, you can use fixed footers
      * in
      * [dialogs](https://developers.google.com/workspace/chat/dialogs), but not
      * [card
      * messages](https://developers.google.com/workspace/chat/create-messages#create).
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -11248,7 +10971,6 @@ public com.google.apps.card.v1.Card.CardFixedFooterOrBuilder getFixedFooterOrBui
      * 
      * In Google Workspace add-ons, sets the display properties of the
      * `peekCardHeader`.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -11268,7 +10990,6 @@ public int getDisplayStyleValue() {
      * 
      * In Google Workspace add-ons, sets the display properties of the
      * `peekCardHeader`.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -11279,8 +11000,8 @@ public int getDisplayStyleValue() {
      * @return This builder for chaining.
      */
     public Builder setDisplayStyleValue(int value) {
+
       displayStyle_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -11291,7 +11012,6 @@ public Builder setDisplayStyleValue(int value) {
      * 
      * In Google Workspace add-ons, sets the display properties of the
      * `peekCardHeader`.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -11302,8 +11022,9 @@ public Builder setDisplayStyleValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.Card.DisplayStyle getDisplayStyle() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.Card.DisplayStyle result =
-          com.google.apps.card.v1.Card.DisplayStyle.forNumber(displayStyle_);
+          com.google.apps.card.v1.Card.DisplayStyle.valueOf(displayStyle_);
       return result == null ? com.google.apps.card.v1.Card.DisplayStyle.UNRECOGNIZED : result;
     }
 
@@ -11313,7 +11034,6 @@ public com.google.apps.card.v1.Card.DisplayStyle getDisplayStyle() {
      * 
      * In Google Workspace add-ons, sets the display properties of the
      * `peekCardHeader`.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -11327,7 +11047,7 @@ public Builder setDisplayStyle(com.google.apps.card.v1.Card.DisplayStyle value)
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000040;
+
       displayStyle_ = value.getNumber();
       onChanged();
       return this;
@@ -11339,7 +11059,6 @@ public Builder setDisplayStyle(com.google.apps.card.v1.Card.DisplayStyle value)
      * 
      * In Google Workspace add-ons, sets the display properties of the
      * `peekCardHeader`.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -11349,7 +11068,7 @@ public Builder setDisplayStyle(com.google.apps.card.v1.Card.DisplayStyle value)
      * @return This builder for chaining.
      */
     public Builder clearDisplayStyle() {
-      bitField0_ = (bitField0_ & ~0x00000040);
+
       displayStyle_ = 0;
       onChanged();
       return this;
@@ -11369,7 +11088,6 @@ public Builder clearDisplayStyle() {
      * When displaying contextual content, the peek card header acts as a
      * placeholder so that the user can navigate forward between the homepage
      * cards and the contextual cards.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -11379,7 +11097,7 @@ public Builder clearDisplayStyle() {
      * @return Whether the peekCardHeader field is set.
      */
     public boolean hasPeekCardHeader() {
-      return ((bitField0_ & 0x00000080) != 0);
+      return peekCardHeaderBuilder_ != null || peekCardHeader_ != null;
     }
 
     /**
@@ -11389,7 +11107,6 @@ public boolean hasPeekCardHeader() {
      * When displaying contextual content, the peek card header acts as a
      * placeholder so that the user can navigate forward between the homepage
      * cards and the contextual cards.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -11415,7 +11132,6 @@ public com.google.apps.card.v1.Card.CardHeader getPeekCardHeader() {
      * When displaying contextual content, the peek card header acts as a
      * placeholder so that the user can navigate forward between the homepage
      * cards and the contextual cards.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -11428,11 +11144,11 @@ public Builder setPeekCardHeader(com.google.apps.card.v1.Card.CardHeader value)
           throw new NullPointerException();
         }
         peekCardHeader_ = value;
+        onChanged();
       } else {
         peekCardHeaderBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -11443,7 +11159,6 @@ public Builder setPeekCardHeader(com.google.apps.card.v1.Card.CardHeader value)
      * When displaying contextual content, the peek card header acts as a
      * placeholder so that the user can navigate forward between the homepage
      * cards and the contextual cards.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -11454,11 +11169,11 @@ public Builder setPeekCardHeader(
         com.google.apps.card.v1.Card.CardHeader.Builder builderForValue) {
       if (peekCardHeaderBuilder_ == null) {
         peekCardHeader_ = builderForValue.build();
+        onChanged();
       } else {
         peekCardHeaderBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -11469,7 +11184,6 @@ public Builder setPeekCardHeader(
      * When displaying contextual content, the peek card header acts as a
      * placeholder so that the user can navigate forward between the homepage
      * cards and the contextual cards.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -11478,20 +11192,19 @@ public Builder setPeekCardHeader(
      */
     public Builder mergePeekCardHeader(com.google.apps.card.v1.Card.CardHeader value) {
       if (peekCardHeaderBuilder_ == null) {
-        if (((bitField0_ & 0x00000080) != 0)
-            && peekCardHeader_ != null
-            && peekCardHeader_ != com.google.apps.card.v1.Card.CardHeader.getDefaultInstance()) {
-          getPeekCardHeaderBuilder().mergeFrom(value);
+        if (peekCardHeader_ != null) {
+          peekCardHeader_ =
+              com.google.apps.card.v1.Card.CardHeader.newBuilder(peekCardHeader_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           peekCardHeader_ = value;
         }
+        onChanged();
       } else {
         peekCardHeaderBuilder_.mergeFrom(value);
       }
-      if (peekCardHeader_ != null) {
-        bitField0_ |= 0x00000080;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -11502,7 +11215,6 @@ public Builder mergePeekCardHeader(com.google.apps.card.v1.Card.CardHeader value
      * When displaying contextual content, the peek card header acts as a
      * placeholder so that the user can navigate forward between the homepage
      * cards and the contextual cards.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -11510,13 +11222,14 @@ public Builder mergePeekCardHeader(com.google.apps.card.v1.Card.CardHeader value
      * .google.apps.card.v1.Card.CardHeader peek_card_header = 7;
      */
     public Builder clearPeekCardHeader() {
-      bitField0_ = (bitField0_ & ~0x00000080);
-      peekCardHeader_ = null;
-      if (peekCardHeaderBuilder_ != null) {
-        peekCardHeaderBuilder_.dispose();
+      if (peekCardHeaderBuilder_ == null) {
+        peekCardHeader_ = null;
+        onChanged();
+      } else {
+        peekCardHeader_ = null;
         peekCardHeaderBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -11527,7 +11240,6 @@ public Builder clearPeekCardHeader() {
      * When displaying contextual content, the peek card header acts as a
      * placeholder so that the user can navigate forward between the homepage
      * cards and the contextual cards.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -11535,7 +11247,7 @@ public Builder clearPeekCardHeader() {
      * .google.apps.card.v1.Card.CardHeader peek_card_header = 7;
      */
     public com.google.apps.card.v1.Card.CardHeader.Builder getPeekCardHeaderBuilder() {
-      bitField0_ |= 0x00000080;
+
       onChanged();
       return getPeekCardHeaderFieldBuilder().getBuilder();
     }
@@ -11547,7 +11259,6 @@ public com.google.apps.card.v1.Card.CardHeader.Builder getPeekCardHeaderBuilder(
      * When displaying contextual content, the peek card header acts as a
      * placeholder so that the user can navigate forward between the homepage
      * cards and the contextual cards.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -11571,7 +11282,6 @@ public com.google.apps.card.v1.Card.CardHeaderOrBuilder getPeekCardHeaderOrBuild
      * When displaying contextual content, the peek card header acts as a
      * placeholder so that the user can navigate forward between the homepage
      * cards and the contextual cards.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CardOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CardOrBuilder.java
index e7064a4d45..2c8e0ad55f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CardOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CardOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface CardOrBuilder
@@ -166,13 +165,10 @@ public interface CardOrBuilder
    *
    * 
    * The card's actions. Actions are added to the card's toolbar menu.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
-   *
    * For example, the following JSON constructs a card action menu with
    * `Settings` and `Send Feedback` options:
-   *
    * ```
    * "card_actions": [
    *   {
@@ -211,13 +207,10 @@ public interface CardOrBuilder
    *
    * 
    * The card's actions. Actions are added to the card's toolbar menu.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
-   *
    * For example, the following JSON constructs a card action menu with
    * `Settings` and `Send Feedback` options:
-   *
    * ```
    * "card_actions": [
    *   {
@@ -256,13 +249,10 @@ public interface CardOrBuilder
    *
    * 
    * The card's actions. Actions are added to the card's toolbar menu.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
-   *
    * For example, the following JSON constructs a card action menu with
    * `Settings` and `Send Feedback` options:
-   *
    * ```
    * "card_actions": [
    *   {
@@ -301,13 +291,10 @@ public interface CardOrBuilder
    *
    * 
    * The card's actions. Actions are added to the card's toolbar menu.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
-   *
    * For example, the following JSON constructs a card action menu with
    * `Settings` and `Send Feedback` options:
-   *
    * ```
    * "card_actions": [
    *   {
@@ -347,13 +334,10 @@ public interface CardOrBuilder
    *
    * 
    * The card's actions. Actions are added to the card's toolbar menu.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
-   *
    * For example, the following JSON constructs a card action menu with
    * `Settings` and `Send Feedback` options:
-   *
    * ```
    * "card_actions": [
    *   {
@@ -392,7 +376,6 @@ public interface CardOrBuilder
    *
    * 
    * Name of the card. Used as a card identifier in card navigation.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -408,7 +391,6 @@ public interface CardOrBuilder
    *
    * 
    * Name of the card. Used as a card identifier in card navigation.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -424,14 +406,12 @@ public interface CardOrBuilder
    *
    * 
    * The fixed footer shown at the bottom of this card.
-   *
    * Setting `fixedFooter` without specifying a `primaryButton` or a
    * `secondaryButton` causes an error. For Chat apps, you can use fixed footers
    * in
    * [dialogs](https://developers.google.com/workspace/chat/dialogs), but not
    * [card
    * messages](https://developers.google.com/workspace/chat/create-messages#create).
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -447,14 +427,12 @@ public interface CardOrBuilder
    *
    * 
    * The fixed footer shown at the bottom of this card.
-   *
    * Setting `fixedFooter` without specifying a `primaryButton` or a
    * `secondaryButton` causes an error. For Chat apps, you can use fixed footers
    * in
    * [dialogs](https://developers.google.com/workspace/chat/dialogs), but not
    * [card
    * messages](https://developers.google.com/workspace/chat/create-messages#create).
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -470,14 +448,12 @@ public interface CardOrBuilder
    *
    * 
    * The fixed footer shown at the bottom of this card.
-   *
    * Setting `fixedFooter` without specifying a `primaryButton` or a
    * `secondaryButton` causes an error. For Chat apps, you can use fixed footers
    * in
    * [dialogs](https://developers.google.com/workspace/chat/dialogs), but not
    * [card
    * messages](https://developers.google.com/workspace/chat/create-messages#create).
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -492,7 +468,6 @@ public interface CardOrBuilder
    * 
    * In Google Workspace add-ons, sets the display properties of the
    * `peekCardHeader`.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -509,7 +484,6 @@ public interface CardOrBuilder
    * 
    * In Google Workspace add-ons, sets the display properties of the
    * `peekCardHeader`.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -527,7 +501,6 @@ public interface CardOrBuilder
    * When displaying contextual content, the peek card header acts as a
    * placeholder so that the user can navigate forward between the homepage
    * cards and the contextual cards.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -545,7 +518,6 @@ public interface CardOrBuilder
    * When displaying contextual content, the peek card header acts as a
    * placeholder so that the user can navigate forward between the homepage
    * cards and the contextual cards.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -563,7 +535,6 @@ public interface CardOrBuilder
    * When displaying contextual content, the peek card header acts as a
    * placeholder so that the user can navigate forward between the homepage
    * cards and the contextual cards.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CardProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CardProto.java
index 75af237788..a17fc38ca5 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CardProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CardProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public final class CardProto {
@@ -767,6 +766,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "ExternalDataSource",
               "PlatformDataSource",
               "MultiSelectDataSource",
+              "MultiSelectMaxSelectedItems",
             });
     internal_static_google_apps_card_v1_SelectionInput_SelectionItem_descriptor =
         internal_static_google_apps_card_v1_SelectionInput_descriptor.getNestedTypes().get(0);
@@ -790,7 +790,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_apps_card_v1_DateTimePicker_descriptor,
             new java.lang.String[] {
-              "Name", "Label", "Type", "ValueMsEpoch", "TimezoneOffsetDate", "OnChangeAction",
+              "Name",
+              "Label",
+              "Type",
+              "ValueMsEpoch",
+              "TimezoneOffsetDate",
+              "OnChangeAction",
+              "ValueMsEpoch",
             });
     internal_static_google_apps_card_v1_OverflowMenu_descriptor =
         getDescriptor().getMessageTypes().get(11);
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Carousel.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Carousel.java
index e5b53c36a7..007ae9f239 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Carousel.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Carousel.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -25,10 +24,8 @@
  * 
  * A carousel, also known as a slider, rotates and displays a list of widgets in
  * a slideshow format, with buttons navigating to the previous or next widget.
- *
  * For example, this is a JSON representation of a carousel that contains three
  * text paragraph widgets.
- *
  * ```
  * {
  *   "carouselCards": [
@@ -62,7 +59,6 @@
  *   ]
  * }
  * ```
- *
  * [Google Chat apps](https://developers.google.com/workspace/chat):
  * 

  *
@@ -89,6 +85,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Carousel();
   }
 
+  @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.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_Carousel_descriptor;
@@ -263,6 +264,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new CarouselCard();
     }
 
+    @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.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Carousel_CarouselCard_descriptor;
@@ -279,8 +285,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int WIDGETS_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
     private java.util.List widgets_;
 
     /**
@@ -360,8 +364,6 @@ public com.google.apps.card.v1.Card.NestedWidgetOrBuilder getWidgetsOrBuilder(in
     }
 
     public static final int FOOTER_WIDGETS_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
     private java.util.List footerWidgets_;
 
     /**
@@ -654,7 +656,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         if (widgetsBuilder_ == null) {
           widgets_ = java.util.Collections.emptyList();
         } else {
@@ -696,16 +697,7 @@ public com.google.apps.card.v1.Carousel.CarouselCard build() {
       public com.google.apps.card.v1.Carousel.CarouselCard buildPartial() {
         com.google.apps.card.v1.Carousel.CarouselCard result =
             new com.google.apps.card.v1.Carousel.CarouselCard(this);
-        buildPartialRepeatedFields(result);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
-        onBuilt();
-        return result;
-      }
-
-      private void buildPartialRepeatedFields(
-          com.google.apps.card.v1.Carousel.CarouselCard result) {
+        int from_bitField0_ = bitField0_;
         if (widgetsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             widgets_ = java.util.Collections.unmodifiableList(widgets_);
@@ -724,10 +716,8 @@ private void buildPartialRepeatedFields(
         } else {
           result.footerWidgets_ = footerWidgetsBuilder_.build();
         }
-      }
-
-      private void buildPartial0(com.google.apps.card.v1.Carousel.CarouselCard result) {
-        int from_bitField0_ = bitField0_;
+        onBuilt();
+        return result;
       }
 
       @java.lang.Override
@@ -1742,8 +1732,6 @@ public com.google.apps.card.v1.Carousel.CarouselCard getDefaultInstanceForType()
   }
 
   public static final int CAROUSEL_CARDS_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
   private java.util.List carouselCards_;
 
   /**
@@ -1984,10 +1972,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * 
    * A carousel, also known as a slider, rotates and displays a list of widgets in
    * a slideshow format, with buttons navigating to the previous or next widget.
-   *
    * For example, this is a JSON representation of a carousel that contains three
    * text paragraph widgets.
-   *
    * ```
    * {
    *   "carouselCards": [
@@ -2021,7 +2007,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *   ]
    * }
    * ```
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -2056,7 +2041,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (carouselCardsBuilder_ == null) {
         carouselCards_ = java.util.Collections.emptyList();
       } else {
@@ -2090,15 +2074,7 @@ public com.google.apps.card.v1.Carousel build() {
     @java.lang.Override
     public com.google.apps.card.v1.Carousel buildPartial() {
       com.google.apps.card.v1.Carousel result = new com.google.apps.card.v1.Carousel(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.apps.card.v1.Carousel result) {
+      int from_bitField0_ = bitField0_;
       if (carouselCardsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           carouselCards_ = java.util.Collections.unmodifiableList(carouselCards_);
@@ -2108,10 +2084,8 @@ private void buildPartialRepeatedFields(com.google.apps.card.v1.Carousel result)
       } else {
         result.carouselCards_ = carouselCardsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.apps.card.v1.Carousel result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CarouselOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CarouselOrBuilder.java
index 055f5c9eac..246f63b5a1 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CarouselOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CarouselOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface CarouselOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Chip.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Chip.java
index 3d0567d40d..c3c6185ba4 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Chip.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Chip.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -24,7 +23,6 @@
  *
  * 
  * A text, icon, or text and icon chip that users can click.
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
  * 

@@ -53,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Chip();
   }
 
+  @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.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Chip_descriptor;
   }
@@ -66,7 +69,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.apps.card.v1.Chip.class, com.google.apps.card.v1.Chip.Builder.class);
   }
 
-  private int bitField0_;
   public static final int ICON_FIELD_NUMBER = 1;
   private com.google.apps.card.v1.Icon icon_;
 
@@ -84,7 +86,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasIcon() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return icon_ != null;
   }
 
   /**
@@ -116,13 +118,11 @@ public com.google.apps.card.v1.Icon getIcon() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.IconOrBuilder getIconOrBuilder() {
-    return icon_ == null ? com.google.apps.card.v1.Icon.getDefaultInstance() : icon_;
+    return getIcon();
   }
 
   public static final int LABEL_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object label_ = "";
+  private volatile java.lang.Object label_;
 
   /**
    *
@@ -189,7 +189,7 @@ public com.google.protobuf.ByteString getLabelBytes() {
    */
   @java.lang.Override
   public boolean hasOnClick() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return onClick_ != null;
   }
 
   /**
@@ -221,11 +221,11 @@ public com.google.apps.card.v1.OnClick getOnClick() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.OnClickOrBuilder getOnClickOrBuilder() {
-    return onClick_ == null ? com.google.apps.card.v1.OnClick.getDefaultInstance() : onClick_;
+    return getOnClick();
   }
 
   public static final int ENABLED_FIELD_NUMBER = 4;
-  private boolean enabled_ = false;
+  private boolean enabled_;
 
   /**
    *
@@ -249,7 +249,7 @@ public boolean getEnabled() {
   }
 
   public static final int DISABLED_FIELD_NUMBER = 6;
-  private boolean disabled_ = false;
+  private boolean disabled_;
 
   /**
    *
@@ -269,16 +269,13 @@ public boolean getDisabled() {
   }
 
   public static final int ALT_TEXT_FIELD_NUMBER = 5;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object altText_ = "";
+  private volatile java.lang.Object altText_;
 
   /**
    *
    *
    * 
    * The alternative text that's used for accessibility.
-   *
    * Set descriptive text that lets users know what the chip does. For
    * example, if a chip opens a hyperlink, write: "Opens a new
    * browser tab and navigates to the Google Chat developer documentation at
@@ -307,7 +304,6 @@ public java.lang.String getAltText() {
    *
    * 
    * The alternative text that's used for accessibility.
-   *
    * Set descriptive text that lets users know what the chip does. For
    * example, if a chip opens a hyperlink, write: "Opens a new
    * browser tab and navigates to the Google Chat developer documentation at
@@ -345,13 +341,13 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (icon_ != null) {
       output.writeMessage(1, getIcon());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(label_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, label_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (onClick_ != null) {
       output.writeMessage(3, getOnClick());
     }
     if (enabled_ != false) {
@@ -372,13 +368,13 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (icon_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getIcon());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(label_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, label_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (onClick_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getOnClick());
     }
     if (enabled_ != false) {
@@ -549,7 +545,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * A text, icon, or text and icon chip that users can click.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -574,40 +569,35 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Chip.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getIconFieldBuilder();
-        getOnClickFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      icon_ = null;
-      if (iconBuilder_ != null) {
-        iconBuilder_.dispose();
+      if (iconBuilder_ == null) {
+        icon_ = null;
+      } else {
+        icon_ = null;
         iconBuilder_ = null;
       }
       label_ = "";
-      onClick_ = null;
-      if (onClickBuilder_ != null) {
-        onClickBuilder_.dispose();
+
+      if (onClickBuilder_ == null) {
+        onClick_ = null;
+      } else {
+        onClick_ = null;
         onClickBuilder_ = null;
       }
       enabled_ = false;
+
       disabled_ = false;
+
       altText_ = "";
+
       return this;
     }
 
@@ -633,39 +623,24 @@ public com.google.apps.card.v1.Chip build() {
     @java.lang.Override
     public com.google.apps.card.v1.Chip buildPartial() {
       com.google.apps.card.v1.Chip result = new com.google.apps.card.v1.Chip(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (iconBuilder_ == null) {
+        result.icon_ = icon_;
+      } else {
+        result.icon_ = iconBuilder_.build();
       }
+      result.label_ = label_;
+      if (onClickBuilder_ == null) {
+        result.onClick_ = onClick_;
+      } else {
+        result.onClick_ = onClickBuilder_.build();
+      }
+      result.enabled_ = enabled_;
+      result.disabled_ = disabled_;
+      result.altText_ = altText_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.apps.card.v1.Chip result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.icon_ = iconBuilder_ == null ? icon_ : iconBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.label_ = label_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.onClick_ = onClickBuilder_ == null ? onClick_ : onClickBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.enabled_ = enabled_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.disabled_ = disabled_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.altText_ = altText_;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -716,7 +691,6 @@ public Builder mergeFrom(com.google.apps.card.v1.Chip other) {
       }
       if (!other.getLabel().isEmpty()) {
         label_ = other.label_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasOnClick()) {
@@ -730,7 +704,6 @@ public Builder mergeFrom(com.google.apps.card.v1.Chip other) {
       }
       if (!other.getAltText().isEmpty()) {
         altText_ = other.altText_;
-        bitField0_ |= 0x00000020;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -762,37 +735,37 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getIconFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 label_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getOnClickFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 32:
               {
                 enabled_ = input.readBool();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             case 42:
               {
                 altText_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 42
             case 48:
               {
                 disabled_ = input.readBool();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 48
             default:
@@ -812,8 +785,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.apps.card.v1.Icon icon_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.apps.card.v1.Icon,
@@ -834,7 +805,7 @@ public Builder mergeFrom(
      * @return Whether the icon field is set.
      */
     public boolean hasIcon() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return iconBuilder_ != null || icon_ != null;
     }
 
     /**
@@ -873,11 +844,11 @@ public Builder setIcon(com.google.apps.card.v1.Icon value) {
           throw new NullPointerException();
         }
         icon_ = value;
+        onChanged();
       } else {
         iconBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -894,11 +865,11 @@ public Builder setIcon(com.google.apps.card.v1.Icon value) {
     public Builder setIcon(com.google.apps.card.v1.Icon.Builder builderForValue) {
       if (iconBuilder_ == null) {
         icon_ = builderForValue.build();
+        onChanged();
       } else {
         iconBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -914,20 +885,16 @@ public Builder setIcon(com.google.apps.card.v1.Icon.Builder builderForValue) {
      */
     public Builder mergeIcon(com.google.apps.card.v1.Icon value) {
       if (iconBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && icon_ != null
-            && icon_ != com.google.apps.card.v1.Icon.getDefaultInstance()) {
-          getIconBuilder().mergeFrom(value);
+        if (icon_ != null) {
+          icon_ = com.google.apps.card.v1.Icon.newBuilder(icon_).mergeFrom(value).buildPartial();
         } else {
           icon_ = value;
         }
+        onChanged();
       } else {
         iconBuilder_.mergeFrom(value);
       }
-      if (icon_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -942,13 +909,14 @@ public Builder mergeIcon(com.google.apps.card.v1.Icon value) {
      * .google.apps.card.v1.Icon icon = 1;
      */
     public Builder clearIcon() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      icon_ = null;
-      if (iconBuilder_ != null) {
-        iconBuilder_.dispose();
+      if (iconBuilder_ == null) {
+        icon_ = null;
+        onChanged();
+      } else {
+        icon_ = null;
         iconBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -963,7 +931,7 @@ public Builder clearIcon() {
      * .google.apps.card.v1.Icon icon = 1;
      */
     public com.google.apps.card.v1.Icon.Builder getIconBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getIconFieldBuilder().getBuilder();
     }
@@ -1077,8 +1045,8 @@ public Builder setLabel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       label_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1095,8 +1063,8 @@ public Builder setLabel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLabel() {
+
       label_ = getDefaultInstance().getLabel();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1118,8 +1086,8 @@ public Builder setLabelBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       label_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1144,7 +1112,7 @@ public Builder setLabelBytes(com.google.protobuf.ByteString value) {
      * @return Whether the onClick field is set.
      */
     public boolean hasOnClick() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return onClickBuilder_ != null || onClick_ != null;
     }
 
     /**
@@ -1183,11 +1151,11 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick value) {
           throw new NullPointerException();
         }
         onClick_ = value;
+        onChanged();
       } else {
         onClickBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1204,11 +1172,11 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick value) {
     public Builder setOnClick(com.google.apps.card.v1.OnClick.Builder builderForValue) {
       if (onClickBuilder_ == null) {
         onClick_ = builderForValue.build();
+        onChanged();
       } else {
         onClickBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1224,20 +1192,17 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick.Builder builderForValu
      */
     public Builder mergeOnClick(com.google.apps.card.v1.OnClick value) {
       if (onClickBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && onClick_ != null
-            && onClick_ != com.google.apps.card.v1.OnClick.getDefaultInstance()) {
-          getOnClickBuilder().mergeFrom(value);
+        if (onClick_ != null) {
+          onClick_ =
+              com.google.apps.card.v1.OnClick.newBuilder(onClick_).mergeFrom(value).buildPartial();
         } else {
           onClick_ = value;
         }
+        onChanged();
       } else {
         onClickBuilder_.mergeFrom(value);
       }
-      if (onClick_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1252,13 +1217,14 @@ public Builder mergeOnClick(com.google.apps.card.v1.OnClick value) {
      * .google.apps.card.v1.OnClick on_click = 3;
      */
     public Builder clearOnClick() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      onClick_ = null;
-      if (onClickBuilder_ != null) {
-        onClickBuilder_.dispose();
+      if (onClickBuilder_ == null) {
+        onClick_ = null;
+        onChanged();
+      } else {
+        onClick_ = null;
         onClickBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1273,7 +1239,7 @@ public Builder clearOnClick() {
      * .google.apps.card.v1.OnClick on_click = 3;
      */
     public com.google.apps.card.v1.OnClick.Builder getOnClickBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getOnClickFieldBuilder().getBuilder();
     }
@@ -1366,7 +1332,6 @@ public boolean getEnabled() {
     public Builder setEnabled(boolean value) {
 
       enabled_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1388,7 +1353,7 @@ public Builder setEnabled(boolean value) {
      */
     @java.lang.Deprecated
     public Builder clearEnabled() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       enabled_ = false;
       onChanged();
       return this;
@@ -1429,7 +1394,6 @@ public boolean getDisabled() {
     public Builder setDisabled(boolean value) {
 
       disabled_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1447,7 +1411,7 @@ public Builder setDisabled(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearDisabled() {
-      bitField0_ = (bitField0_ & ~0x00000010);
+
       disabled_ = false;
       onChanged();
       return this;
@@ -1460,7 +1424,6 @@ public Builder clearDisabled() {
      *
      * 
      * The alternative text that's used for accessibility.
-     *
      * Set descriptive text that lets users know what the chip does. For
      * example, if a chip opens a hyperlink, write: "Opens a new
      * browser tab and navigates to the Google Chat developer documentation at
@@ -1488,7 +1451,6 @@ public java.lang.String getAltText() {
      *
      * 
      * The alternative text that's used for accessibility.
-     *
      * Set descriptive text that lets users know what the chip does. For
      * example, if a chip opens a hyperlink, write: "Opens a new
      * browser tab and navigates to the Google Chat developer documentation at
@@ -1516,7 +1478,6 @@ public com.google.protobuf.ByteString getAltTextBytes() {
      *
      * 
      * The alternative text that's used for accessibility.
-     *
      * Set descriptive text that lets users know what the chip does. For
      * example, if a chip opens a hyperlink, write: "Opens a new
      * browser tab and navigates to the Google Chat developer documentation at
@@ -1532,8 +1493,8 @@ public Builder setAltText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       altText_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1543,7 +1504,6 @@ public Builder setAltText(java.lang.String value) {
      *
      * 
      * The alternative text that's used for accessibility.
-     *
      * Set descriptive text that lets users know what the chip does. For
      * example, if a chip opens a hyperlink, write: "Opens a new
      * browser tab and navigates to the Google Chat developer documentation at
@@ -1555,8 +1515,8 @@ public Builder setAltText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAltText() {
+
       altText_ = getDefaultInstance().getAltText();
-      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -1566,7 +1526,6 @@ public Builder clearAltText() {
      *
      * 
      * The alternative text that's used for accessibility.
-     *
      * Set descriptive text that lets users know what the chip does. For
      * example, if a chip opens a hyperlink, write: "Opens a new
      * browser tab and navigates to the Google Chat developer documentation at
@@ -1583,8 +1542,8 @@ public Builder setAltTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       altText_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ChipList.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ChipList.java
index 8336ee2fec..53efa7e802 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ChipList.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ChipList.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -25,7 +24,6 @@
  * 
  * A list of chips layed out horizontally, which can either scroll horizontally
  * or wrap to the next line.
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
  * 

@@ -54,6 +52,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ChipList();
   }
 
+  @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.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_ChipList_descriptor;
@@ -230,7 +233,7 @@ private Layout(int value) {
   }
 
   public static final int LAYOUT_FIELD_NUMBER = 1;
-  private int layout_ = 0;
+  private int layout_;
 
   /**
    *
@@ -261,14 +264,13 @@ public int getLayoutValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.ChipList.Layout getLayout() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.ChipList.Layout result =
-        com.google.apps.card.v1.ChipList.Layout.forNumber(layout_);
+        com.google.apps.card.v1.ChipList.Layout.valueOf(layout_);
     return result == null ? com.google.apps.card.v1.ChipList.Layout.UNRECOGNIZED : result;
   }
 
   public static final int CHIPS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List chips_;
 
   /**
@@ -516,7 +518,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * 
    * A list of chips layed out horizontally, which can either scroll horizontally
    * or wrap to the next line.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -552,15 +553,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       layout_ = 0;
+
       if (chipsBuilder_ == null) {
         chips_ = java.util.Collections.emptyList();
       } else {
         chips_ = null;
         chipsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -587,31 +588,19 @@ public com.google.apps.card.v1.ChipList build() {
     @java.lang.Override
     public com.google.apps.card.v1.ChipList buildPartial() {
       com.google.apps.card.v1.ChipList result = new com.google.apps.card.v1.ChipList(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.apps.card.v1.ChipList result) {
+      int from_bitField0_ = bitField0_;
+      result.layout_ = layout_;
       if (chipsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           chips_ = java.util.Collections.unmodifiableList(chips_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.chips_ = chips_;
       } else {
         result.chips_ = chipsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.apps.card.v1.ChipList result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.layout_ = layout_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -666,7 +655,7 @@ public Builder mergeFrom(com.google.apps.card.v1.ChipList other) {
         if (!other.chips_.isEmpty()) {
           if (chips_.isEmpty()) {
             chips_ = other.chips_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureChipsIsMutable();
             chips_.addAll(other.chips_);
@@ -679,7 +668,7 @@ public Builder mergeFrom(com.google.apps.card.v1.ChipList other) {
             chipsBuilder_.dispose();
             chipsBuilder_ = null;
             chips_ = other.chips_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             chipsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getChipsFieldBuilder()
@@ -718,7 +707,7 @@ public Builder mergeFrom(
             case 8:
               {
                 layout_ = input.readEnum();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 18:
@@ -783,8 +772,8 @@ public int getLayoutValue() {
      * @return This builder for chaining.
      */
     public Builder setLayoutValue(int value) {
+
       layout_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -802,8 +791,9 @@ public Builder setLayoutValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.ChipList.Layout getLayout() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.ChipList.Layout result =
-          com.google.apps.card.v1.ChipList.Layout.forNumber(layout_);
+          com.google.apps.card.v1.ChipList.Layout.valueOf(layout_);
       return result == null ? com.google.apps.card.v1.ChipList.Layout.UNRECOGNIZED : result;
     }
 
@@ -823,7 +813,7 @@ public Builder setLayout(com.google.apps.card.v1.ChipList.Layout value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000001;
+
       layout_ = value.getNumber();
       onChanged();
       return this;
@@ -841,7 +831,7 @@ public Builder setLayout(com.google.apps.card.v1.ChipList.Layout value) {
      * @return This builder for chaining.
      */
     public Builder clearLayout() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       layout_ = 0;
       onChanged();
       return this;
@@ -850,9 +840,9 @@ public Builder clearLayout() {
     private java.util.List chips_ = java.util.Collections.emptyList();
 
     private void ensureChipsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         chips_ = new java.util.ArrayList(chips_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1074,7 +1064,7 @@ public Builder addAllChips(java.lang.Iterable getChipsBuilderList(
                 com.google.apps.card.v1.Chip,
                 com.google.apps.card.v1.Chip.Builder,
                 com.google.apps.card.v1.ChipOrBuilder>(
-                chips_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                chips_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         chips_ = null;
       }
       return chipsBuilder_;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ChipListOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ChipListOrBuilder.java
index 9967403a7a..777a3b3349 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ChipListOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ChipListOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface ChipListOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ChipOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ChipOrBuilder.java
index 20f8cb4feb..744dbfc470 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ChipOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ChipOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface ChipOrBuilder
@@ -167,7 +166,6 @@ public interface ChipOrBuilder
    *
    * 
    * The alternative text that's used for accessibility.
-   *
    * Set descriptive text that lets users know what the chip does. For
    * example, if a chip opens a hyperlink, write: "Opens a new
    * browser tab and navigates to the Google Chat developer documentation at
@@ -185,7 +183,6 @@ public interface ChipOrBuilder
    *
    * 
    * The alternative text that's used for accessibility.
-   *
    * Set descriptive text that lets users know what the chip does. For
    * example, if a chip opens a hyperlink, write: "Opens a new
    * browser tab and navigates to the Google Chat developer documentation at
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CollapseControl.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CollapseControl.java
index 4313daefd2..9da8d6e236 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CollapseControl.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CollapseControl.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -24,7 +23,6 @@
  *
  * 
  * Represent an expand and collapse control.
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
  * 

@@ -52,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CollapseControl();
   }
 
+  @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.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_CollapseControl_descriptor;
@@ -67,9 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.apps.card.v1.CollapseControl.Builder.class);
   }
 
-  private int bitField0_;
   public static final int HORIZONTAL_ALIGNMENT_FIELD_NUMBER = 1;
-  private int horizontalAlignment_ = 0;
+  private int horizontalAlignment_;
 
   /**
    *
@@ -100,8 +102,9 @@ public int getHorizontalAlignmentValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.Widget.HorizontalAlignment getHorizontalAlignment() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.Widget.HorizontalAlignment result =
-        com.google.apps.card.v1.Widget.HorizontalAlignment.forNumber(horizontalAlignment_);
+        com.google.apps.card.v1.Widget.HorizontalAlignment.valueOf(horizontalAlignment_);
     return result == null
         ? com.google.apps.card.v1.Widget.HorizontalAlignment.UNRECOGNIZED
         : result;
@@ -126,7 +129,7 @@ public com.google.apps.card.v1.Widget.HorizontalAlignment getHorizontalAlignment
    */
   @java.lang.Override
   public boolean hasExpandButton() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return expandButton_ != null;
   }
 
   /**
@@ -164,9 +167,7 @@ public com.google.apps.card.v1.Button getExpandButton() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.ButtonOrBuilder getExpandButtonOrBuilder() {
-    return expandButton_ == null
-        ? com.google.apps.card.v1.Button.getDefaultInstance()
-        : expandButton_;
+    return getExpandButton();
   }
 
   public static final int COLLAPSE_BUTTON_FIELD_NUMBER = 3;
@@ -188,7 +189,7 @@ public com.google.apps.card.v1.ButtonOrBuilder getExpandButtonOrBuilder() {
    */
   @java.lang.Override
   public boolean hasCollapseButton() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return collapseButton_ != null;
   }
 
   /**
@@ -226,9 +227,7 @@ public com.google.apps.card.v1.Button getCollapseButton() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.ButtonOrBuilder getCollapseButtonOrBuilder() {
-    return collapseButton_ == null
-        ? com.google.apps.card.v1.Button.getDefaultInstance()
-        : collapseButton_;
+    return getCollapseButton();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -250,10 +249,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
             .getNumber()) {
       output.writeEnum(1, horizontalAlignment_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (expandButton_ != null) {
       output.writeMessage(2, getExpandButton());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (collapseButton_ != null) {
       output.writeMessage(3, getCollapseButton());
     }
     getUnknownFields().writeTo(output);
@@ -270,10 +269,10 @@ public int getSerializedSize() {
             .getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, horizontalAlignment_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (expandButton_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getExpandButton());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (collapseButton_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getCollapseButton());
     }
     size += getUnknownFields().getSerializedSize();
@@ -427,7 +426,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * Represent an expand and collapse control.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -454,35 +452,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.CollapseControl.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getExpandButtonFieldBuilder();
-        getCollapseButtonFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       horizontalAlignment_ = 0;
-      expandButton_ = null;
-      if (expandButtonBuilder_ != null) {
-        expandButtonBuilder_.dispose();
+
+      if (expandButtonBuilder_ == null) {
+        expandButton_ = null;
+      } else {
+        expandButton_ = null;
         expandButtonBuilder_ = null;
       }
-      collapseButton_ = null;
-      if (collapseButtonBuilder_ != null) {
-        collapseButtonBuilder_.dispose();
+      if (collapseButtonBuilder_ == null) {
+        collapseButton_ = null;
+      } else {
+        collapseButton_ = null;
         collapseButtonBuilder_ = null;
       }
       return this;
@@ -512,32 +502,21 @@ public com.google.apps.card.v1.CollapseControl build() {
     public com.google.apps.card.v1.CollapseControl buildPartial() {
       com.google.apps.card.v1.CollapseControl result =
           new com.google.apps.card.v1.CollapseControl(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.horizontalAlignment_ = horizontalAlignment_;
+      if (expandButtonBuilder_ == null) {
+        result.expandButton_ = expandButton_;
+      } else {
+        result.expandButton_ = expandButtonBuilder_.build();
+      }
+      if (collapseButtonBuilder_ == null) {
+        result.collapseButton_ = collapseButton_;
+      } else {
+        result.collapseButton_ = collapseButtonBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.apps.card.v1.CollapseControl result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.horizontalAlignment_ = horizontalAlignment_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.expandButton_ =
-            expandButtonBuilder_ == null ? expandButton_ : expandButtonBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.collapseButton_ =
-            collapseButtonBuilder_ == null ? collapseButton_ : collapseButtonBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -621,19 +600,19 @@ public Builder mergeFrom(
             case 8:
               {
                 horizontalAlignment_ = input.readEnum();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 18:
               {
                 input.readMessage(getExpandButtonFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getCollapseButtonFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -653,8 +632,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private int horizontalAlignment_ = 0;
 
     /**
@@ -686,8 +663,8 @@ public int getHorizontalAlignmentValue() {
      * @return This builder for chaining.
      */
     public Builder setHorizontalAlignmentValue(int value) {
+
       horizontalAlignment_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -705,8 +682,9 @@ public Builder setHorizontalAlignmentValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.Widget.HorizontalAlignment getHorizontalAlignment() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.Widget.HorizontalAlignment result =
-          com.google.apps.card.v1.Widget.HorizontalAlignment.forNumber(horizontalAlignment_);
+          com.google.apps.card.v1.Widget.HorizontalAlignment.valueOf(horizontalAlignment_);
       return result == null
           ? com.google.apps.card.v1.Widget.HorizontalAlignment.UNRECOGNIZED
           : result;
@@ -729,7 +707,7 @@ public Builder setHorizontalAlignment(
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000001;
+
       horizontalAlignment_ = value.getNumber();
       onChanged();
       return this;
@@ -747,7 +725,7 @@ public Builder setHorizontalAlignment(
      * @return This builder for chaining.
      */
     public Builder clearHorizontalAlignment() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       horizontalAlignment_ = 0;
       onChanged();
       return this;
@@ -775,7 +753,7 @@ public Builder clearHorizontalAlignment() {
      * @return Whether the expandButton field is set.
      */
     public boolean hasExpandButton() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return expandButtonBuilder_ != null || expandButton_ != null;
     }
 
     /**
@@ -820,11 +798,11 @@ public Builder setExpandButton(com.google.apps.card.v1.Button value) {
           throw new NullPointerException();
         }
         expandButton_ = value;
+        onChanged();
       } else {
         expandButtonBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -843,11 +821,11 @@ public Builder setExpandButton(com.google.apps.card.v1.Button value) {
     public Builder setExpandButton(com.google.apps.card.v1.Button.Builder builderForValue) {
       if (expandButtonBuilder_ == null) {
         expandButton_ = builderForValue.build();
+        onChanged();
       } else {
         expandButtonBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -865,20 +843,19 @@ public Builder setExpandButton(com.google.apps.card.v1.Button.Builder builderFor
      */
     public Builder mergeExpandButton(com.google.apps.card.v1.Button value) {
       if (expandButtonBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && expandButton_ != null
-            && expandButton_ != com.google.apps.card.v1.Button.getDefaultInstance()) {
-          getExpandButtonBuilder().mergeFrom(value);
+        if (expandButton_ != null) {
+          expandButton_ =
+              com.google.apps.card.v1.Button.newBuilder(expandButton_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           expandButton_ = value;
         }
+        onChanged();
       } else {
         expandButtonBuilder_.mergeFrom(value);
       }
-      if (expandButton_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -895,13 +872,14 @@ public Builder mergeExpandButton(com.google.apps.card.v1.Button value) {
      * .google.apps.card.v1.Button expand_button = 2;
      */
     public Builder clearExpandButton() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      expandButton_ = null;
-      if (expandButtonBuilder_ != null) {
-        expandButtonBuilder_.dispose();
+      if (expandButtonBuilder_ == null) {
+        expandButton_ = null;
+        onChanged();
+      } else {
+        expandButton_ = null;
         expandButtonBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -918,7 +896,7 @@ public Builder clearExpandButton() {
      * .google.apps.card.v1.Button expand_button = 2;
      */
     public com.google.apps.card.v1.Button.Builder getExpandButtonBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getExpandButtonFieldBuilder().getBuilder();
     }
@@ -996,7 +974,7 @@ public com.google.apps.card.v1.ButtonOrBuilder getExpandButtonOrBuilder() {
      * @return Whether the collapseButton field is set.
      */
     public boolean hasCollapseButton() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return collapseButtonBuilder_ != null || collapseButton_ != null;
     }
 
     /**
@@ -1041,11 +1019,11 @@ public Builder setCollapseButton(com.google.apps.card.v1.Button value) {
           throw new NullPointerException();
         }
         collapseButton_ = value;
+        onChanged();
       } else {
         collapseButtonBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1064,11 +1042,11 @@ public Builder setCollapseButton(com.google.apps.card.v1.Button value) {
     public Builder setCollapseButton(com.google.apps.card.v1.Button.Builder builderForValue) {
       if (collapseButtonBuilder_ == null) {
         collapseButton_ = builderForValue.build();
+        onChanged();
       } else {
         collapseButtonBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1086,20 +1064,19 @@ public Builder setCollapseButton(com.google.apps.card.v1.Button.Builder builderF
      */
     public Builder mergeCollapseButton(com.google.apps.card.v1.Button value) {
       if (collapseButtonBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && collapseButton_ != null
-            && collapseButton_ != com.google.apps.card.v1.Button.getDefaultInstance()) {
-          getCollapseButtonBuilder().mergeFrom(value);
+        if (collapseButton_ != null) {
+          collapseButton_ =
+              com.google.apps.card.v1.Button.newBuilder(collapseButton_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           collapseButton_ = value;
         }
+        onChanged();
       } else {
         collapseButtonBuilder_.mergeFrom(value);
       }
-      if (collapseButton_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1116,13 +1093,14 @@ public Builder mergeCollapseButton(com.google.apps.card.v1.Button value) {
      * .google.apps.card.v1.Button collapse_button = 3;
      */
     public Builder clearCollapseButton() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      collapseButton_ = null;
-      if (collapseButtonBuilder_ != null) {
-        collapseButtonBuilder_.dispose();
+      if (collapseButtonBuilder_ == null) {
+        collapseButton_ = null;
+        onChanged();
+      } else {
+        collapseButton_ = null;
         collapseButtonBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1139,7 +1117,7 @@ public Builder clearCollapseButton() {
      * .google.apps.card.v1.Button collapse_button = 3;
      */
     public com.google.apps.card.v1.Button.Builder getCollapseButtonBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getCollapseButtonFieldBuilder().getBuilder();
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CollapseControlOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CollapseControlOrBuilder.java
index 3d10406f4a..d717e92eaf 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CollapseControlOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CollapseControlOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface CollapseControlOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Columns.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Columns.java
index 25316b2f04..4c4de10442 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Columns.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Columns.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -28,31 +27,25 @@
  * specified. For an example in Google Chat apps, see
  * [Display cards and dialogs in
  * columns](https://developers.google.com/workspace/chat/format-structure-card-dialog#display_cards_and_dialogs_in_columns).
- *
  * The height of each column is determined by the taller column. For example, if
  * the first column is taller than the second column, both columns have the
  * height of the first column. Because each column can contain a different
  * number of widgets, you can't define rows or align widgets between the
  * columns.
- *
  * Columns are displayed side-by-side. You can customize the width of each
  * column using the `HorizontalSizeStyle` field. If the user's
  * screen width is too narrow, the second column wraps below the first:
- *
  * * On web, the second column wraps if the screen width is less than or equal
  *   to 480 pixels.
  * * On iOS devices, the second column wraps if the screen width is
  *   less than or equal to 300 pt.
  * * On Android devices, the second column wraps if the screen width is
  *   less than or equal to 320 dp.
- *
  * To include more than two columns, or to use rows, use the
  * [`Grid`][google.apps.card.v1.Grid] widget.
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
  * The add-on UIs that support columns include:
- *
  * * The dialog displayed when users open the add-on from an email draft.
  * * The dialog displayed when users open the add-on from the
  * **Add attachment** menu in a Google Calendar event.
@@ -81,6 +74,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Columns();
   }
 
+  @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.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Columns_descriptor;
   }
@@ -250,7 +248,6 @@ public interface ColumnOrBuilder
    *
    * 
    * A column.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend)
    * 

@@ -281,6 +278,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Column();
     }
 
+    @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.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Columns_Column_descriptor;
@@ -303,7 +305,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      * Specifies how a column fills the width of the card. The width of each
      * column depends on both the `HorizontalSizeStyle` and the width of the
      * widgets within the column.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend)
      * 

@@ -475,7 +476,6 @@ private HorizontalSizeStyle(int value) {
      * 
      * Specifies whether widgets align to the top, bottom, or center of a
      * column.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend)
      * 

@@ -959,7 +959,7 @@ public interface WidgetsOrBuilder
        */
       com.google.apps.card.v1.ChipListOrBuilder getChipListOrBuilder();
 
-      com.google.apps.card.v1.Columns.Column.Widgets.DataCase getDataCase();
+      public com.google.apps.card.v1.Columns.Column.Widgets.DataCase getDataCase();
     }
 
     /**
@@ -967,7 +967,6 @@ public interface WidgetsOrBuilder
      *
      * 
      * The supported widgets that you can include in a column.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend)
      * 

@@ -993,6 +992,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
         return new Widgets();
       }
 
+      @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.apps.card.v1.CardProto
             .internal_static_google_apps_card_v1_Columns_Column_Widgets_descriptor;
@@ -1009,8 +1013,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       private int dataCase_ = 0;
-
-      @SuppressWarnings("serial")
       private java.lang.Object data_;
 
       public enum DataCase
@@ -1794,7 +1796,6 @@ protected Builder newBuilderForType(
        *
        * 
        * The supported widgets that you can include in a column.
-       *
        * [Google Workspace add-ons and Chat
        * apps](https://developers.google.com/workspace/extend)
        * 

@@ -1831,7 +1832,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
-          bitField0_ = 0;
           if (textParagraphBuilder_ != null) {
             textParagraphBuilder_.clear();
           }
@@ -1885,45 +1885,65 @@ public com.google.apps.card.v1.Columns.Column.Widgets build() {
         public com.google.apps.card.v1.Columns.Column.Widgets buildPartial() {
           com.google.apps.card.v1.Columns.Column.Widgets result =
               new com.google.apps.card.v1.Columns.Column.Widgets(this);
-          if (bitField0_ != 0) {
-            buildPartial0(result);
-          }
-          buildPartialOneofs(result);
-          onBuilt();
-          return result;
-        }
-
-        private void buildPartial0(com.google.apps.card.v1.Columns.Column.Widgets result) {
-          int from_bitField0_ = bitField0_;
-        }
-
-        private void buildPartialOneofs(com.google.apps.card.v1.Columns.Column.Widgets result) {
-          result.dataCase_ = dataCase_;
-          result.data_ = this.data_;
-          if (dataCase_ == 1 && textParagraphBuilder_ != null) {
-            result.data_ = textParagraphBuilder_.build();
+          if (dataCase_ == 1) {
+            if (textParagraphBuilder_ == null) {
+              result.data_ = data_;
+            } else {
+              result.data_ = textParagraphBuilder_.build();
+            }
           }
-          if (dataCase_ == 2 && imageBuilder_ != null) {
-            result.data_ = imageBuilder_.build();
+          if (dataCase_ == 2) {
+            if (imageBuilder_ == null) {
+              result.data_ = data_;
+            } else {
+              result.data_ = imageBuilder_.build();
+            }
           }
-          if (dataCase_ == 3 && decoratedTextBuilder_ != null) {
-            result.data_ = decoratedTextBuilder_.build();
+          if (dataCase_ == 3) {
+            if (decoratedTextBuilder_ == null) {
+              result.data_ = data_;
+            } else {
+              result.data_ = decoratedTextBuilder_.build();
+            }
           }
-          if (dataCase_ == 4 && buttonListBuilder_ != null) {
-            result.data_ = buttonListBuilder_.build();
+          if (dataCase_ == 4) {
+            if (buttonListBuilder_ == null) {
+              result.data_ = data_;
+            } else {
+              result.data_ = buttonListBuilder_.build();
+            }
           }
-          if (dataCase_ == 5 && textInputBuilder_ != null) {
-            result.data_ = textInputBuilder_.build();
+          if (dataCase_ == 5) {
+            if (textInputBuilder_ == null) {
+              result.data_ = data_;
+            } else {
+              result.data_ = textInputBuilder_.build();
+            }
           }
-          if (dataCase_ == 6 && selectionInputBuilder_ != null) {
-            result.data_ = selectionInputBuilder_.build();
+          if (dataCase_ == 6) {
+            if (selectionInputBuilder_ == null) {
+              result.data_ = data_;
+            } else {
+              result.data_ = selectionInputBuilder_.build();
+            }
           }
-          if (dataCase_ == 7 && dateTimePickerBuilder_ != null) {
-            result.data_ = dateTimePickerBuilder_.build();
+          if (dataCase_ == 7) {
+            if (dateTimePickerBuilder_ == null) {
+              result.data_ = data_;
+            } else {
+              result.data_ = dateTimePickerBuilder_.build();
+            }
           }
-          if (dataCase_ == 8 && chipListBuilder_ != null) {
-            result.data_ = chipListBuilder_.build();
+          if (dataCase_ == 8) {
+            if (chipListBuilder_ == null) {
+              result.data_ = data_;
+            } else {
+              result.data_ = chipListBuilder_.build();
+            }
           }
+          result.dataCase_ = dataCase_;
+          onBuilt();
+          return result;
         }
 
         @java.lang.Override
@@ -2129,8 +2149,6 @@ public Builder clearData() {
           return this;
         }
 
-        private int bitField0_;
-
         private com.google.protobuf.SingleFieldBuilderV3<
                 com.google.apps.card.v1.TextParagraph,
                 com.google.apps.card.v1.TextParagraph.Builder,
@@ -2346,6 +2364,7 @@ public com.google.apps.card.v1.TextParagraphOrBuilder getTextParagraphOrBuilder(
           }
           dataCase_ = 1;
           onChanged();
+          ;
           return textParagraphBuilder_;
         }
 
@@ -2559,6 +2578,7 @@ public com.google.apps.card.v1.ImageOrBuilder getImageOrBuilder() {
           }
           dataCase_ = 2;
           onChanged();
+          ;
           return imageBuilder_;
         }
 
@@ -2777,6 +2797,7 @@ public com.google.apps.card.v1.DecoratedTextOrBuilder getDecoratedTextOrBuilder(
           }
           dataCase_ = 3;
           onChanged();
+          ;
           return decoratedTextBuilder_;
         }
 
@@ -2992,6 +3013,7 @@ public com.google.apps.card.v1.ButtonListOrBuilder getButtonListOrBuilder() {
           }
           dataCase_ = 4;
           onChanged();
+          ;
           return buttonListBuilder_;
         }
 
@@ -3206,6 +3228,7 @@ public com.google.apps.card.v1.TextInputOrBuilder getTextInputOrBuilder() {
           }
           dataCase_ = 5;
           onChanged();
+          ;
           return textInputBuilder_;
         }
 
@@ -3424,6 +3447,7 @@ public com.google.apps.card.v1.SelectionInputOrBuilder getSelectionInputOrBuilde
           }
           dataCase_ = 6;
           onChanged();
+          ;
           return selectionInputBuilder_;
         }
 
@@ -3642,6 +3666,7 @@ public com.google.apps.card.v1.DateTimePickerOrBuilder getDateTimePickerOrBuilde
           }
           dataCase_ = 7;
           onChanged();
+          ;
           return dateTimePickerBuilder_;
         }
 
@@ -3856,6 +3881,7 @@ public com.google.apps.card.v1.ChipListOrBuilder getChipListOrBuilder() {
           }
           dataCase_ = 8;
           onChanged();
+          ;
           return chipListBuilder_;
         }
 
@@ -3924,7 +3950,7 @@ public com.google.apps.card.v1.Columns.Column.Widgets getDefaultInstanceForType(
     }
 
     public static final int HORIZONTAL_SIZE_STYLE_FIELD_NUMBER = 1;
-    private int horizontalSizeStyle_ = 0;
+    private int horizontalSizeStyle_;
 
     /**
      *
@@ -3957,16 +3983,16 @@ public int getHorizontalSizeStyleValue() {
      */
     @java.lang.Override
     public com.google.apps.card.v1.Columns.Column.HorizontalSizeStyle getHorizontalSizeStyle() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.Columns.Column.HorizontalSizeStyle result =
-          com.google.apps.card.v1.Columns.Column.HorizontalSizeStyle.forNumber(
-              horizontalSizeStyle_);
+          com.google.apps.card.v1.Columns.Column.HorizontalSizeStyle.valueOf(horizontalSizeStyle_);
       return result == null
           ? com.google.apps.card.v1.Columns.Column.HorizontalSizeStyle.UNRECOGNIZED
           : result;
     }
 
     public static final int HORIZONTAL_ALIGNMENT_FIELD_NUMBER = 2;
-    private int horizontalAlignment_ = 0;
+    private int horizontalAlignment_;
 
     /**
      *
@@ -3999,15 +4025,16 @@ public int getHorizontalAlignmentValue() {
      */
     @java.lang.Override
     public com.google.apps.card.v1.Widget.HorizontalAlignment getHorizontalAlignment() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.Widget.HorizontalAlignment result =
-          com.google.apps.card.v1.Widget.HorizontalAlignment.forNumber(horizontalAlignment_);
+          com.google.apps.card.v1.Widget.HorizontalAlignment.valueOf(horizontalAlignment_);
       return result == null
           ? com.google.apps.card.v1.Widget.HorizontalAlignment.UNRECOGNIZED
           : result;
     }
 
     public static final int VERTICAL_ALIGNMENT_FIELD_NUMBER = 3;
-    private int verticalAlignment_ = 0;
+    private int verticalAlignment_;
 
     /**
      *
@@ -4040,16 +4067,15 @@ public int getVerticalAlignmentValue() {
      */
     @java.lang.Override
     public com.google.apps.card.v1.Columns.Column.VerticalAlignment getVerticalAlignment() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.Columns.Column.VerticalAlignment result =
-          com.google.apps.card.v1.Columns.Column.VerticalAlignment.forNumber(verticalAlignment_);
+          com.google.apps.card.v1.Columns.Column.VerticalAlignment.valueOf(verticalAlignment_);
       return result == null
           ? com.google.apps.card.v1.Columns.Column.VerticalAlignment.UNRECOGNIZED
           : result;
     }
 
     public static final int WIDGETS_FIELD_NUMBER = 4;
-
-    @SuppressWarnings("serial")
     private java.util.List widgets_;
 
     /**
@@ -4336,7 +4362,6 @@ protected Builder newBuilderForType(
      *
      * 
      * A column.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend)
      * 

@@ -4373,17 +4398,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         horizontalSizeStyle_ = 0;
+
         horizontalAlignment_ = 0;
+
         verticalAlignment_ = 0;
+
         if (widgetsBuilder_ == null) {
           widgets_ = java.util.Collections.emptyList();
         } else {
           widgets_ = null;
           widgetsBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -4411,37 +4438,21 @@ public com.google.apps.card.v1.Columns.Column build() {
       public com.google.apps.card.v1.Columns.Column buildPartial() {
         com.google.apps.card.v1.Columns.Column result =
             new com.google.apps.card.v1.Columns.Column(this);
-        buildPartialRepeatedFields(result);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
-        onBuilt();
-        return result;
-      }
-
-      private void buildPartialRepeatedFields(com.google.apps.card.v1.Columns.Column result) {
+        int from_bitField0_ = bitField0_;
+        result.horizontalSizeStyle_ = horizontalSizeStyle_;
+        result.horizontalAlignment_ = horizontalAlignment_;
+        result.verticalAlignment_ = verticalAlignment_;
         if (widgetsBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             widgets_ = java.util.Collections.unmodifiableList(widgets_);
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.widgets_ = widgets_;
         } else {
           result.widgets_ = widgetsBuilder_.build();
         }
-      }
-
-      private void buildPartial0(com.google.apps.card.v1.Columns.Column result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.horizontalSizeStyle_ = horizontalSizeStyle_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.horizontalAlignment_ = horizontalAlignment_;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.verticalAlignment_ = verticalAlignment_;
-        }
+        onBuilt();
+        return result;
       }
 
       @java.lang.Override
@@ -4504,7 +4515,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Columns.Column other) {
           if (!other.widgets_.isEmpty()) {
             if (widgets_.isEmpty()) {
               widgets_ = other.widgets_;
-              bitField0_ = (bitField0_ & ~0x00000008);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureWidgetsIsMutable();
               widgets_.addAll(other.widgets_);
@@ -4517,7 +4528,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Columns.Column other) {
               widgetsBuilder_.dispose();
               widgetsBuilder_ = null;
               widgets_ = other.widgets_;
-              bitField0_ = (bitField0_ & ~0x00000008);
+              bitField0_ = (bitField0_ & ~0x00000001);
               widgetsBuilder_ =
                   com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                       ? getWidgetsFieldBuilder()
@@ -4556,19 +4567,19 @@ public Builder mergeFrom(
               case 8:
                 {
                   horizontalSizeStyle_ = input.readEnum();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 8
               case 16:
                 {
                   horizontalAlignment_ = input.readEnum();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 16
               case 24:
                 {
                   verticalAlignment_ = input.readEnum();
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 24
               case 34:
@@ -4637,8 +4648,8 @@ public int getHorizontalSizeStyleValue() {
        * @return This builder for chaining.
        */
       public Builder setHorizontalSizeStyleValue(int value) {
+
         horizontalSizeStyle_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4657,8 +4668,9 @@ public Builder setHorizontalSizeStyleValue(int value) {
        */
       @java.lang.Override
       public com.google.apps.card.v1.Columns.Column.HorizontalSizeStyle getHorizontalSizeStyle() {
+        @SuppressWarnings("deprecation")
         com.google.apps.card.v1.Columns.Column.HorizontalSizeStyle result =
-            com.google.apps.card.v1.Columns.Column.HorizontalSizeStyle.forNumber(
+            com.google.apps.card.v1.Columns.Column.HorizontalSizeStyle.valueOf(
                 horizontalSizeStyle_);
         return result == null
             ? com.google.apps.card.v1.Columns.Column.HorizontalSizeStyle.UNRECOGNIZED
@@ -4683,7 +4695,7 @@ public Builder setHorizontalSizeStyle(
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000001;
+
         horizontalSizeStyle_ = value.getNumber();
         onChanged();
         return this;
@@ -4702,7 +4714,7 @@ public Builder setHorizontalSizeStyle(
        * @return This builder for chaining.
        */
       public Builder clearHorizontalSizeStyle() {
-        bitField0_ = (bitField0_ & ~0x00000001);
+
         horizontalSizeStyle_ = 0;
         onChanged();
         return this;
@@ -4741,8 +4753,8 @@ public int getHorizontalAlignmentValue() {
        * @return This builder for chaining.
        */
       public Builder setHorizontalAlignmentValue(int value) {
+
         horizontalAlignment_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4761,8 +4773,9 @@ public Builder setHorizontalAlignmentValue(int value) {
        */
       @java.lang.Override
       public com.google.apps.card.v1.Widget.HorizontalAlignment getHorizontalAlignment() {
+        @SuppressWarnings("deprecation")
         com.google.apps.card.v1.Widget.HorizontalAlignment result =
-            com.google.apps.card.v1.Widget.HorizontalAlignment.forNumber(horizontalAlignment_);
+            com.google.apps.card.v1.Widget.HorizontalAlignment.valueOf(horizontalAlignment_);
         return result == null
             ? com.google.apps.card.v1.Widget.HorizontalAlignment.UNRECOGNIZED
             : result;
@@ -4786,7 +4799,7 @@ public Builder setHorizontalAlignment(
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000002;
+
         horizontalAlignment_ = value.getNumber();
         onChanged();
         return this;
@@ -4805,7 +4818,7 @@ public Builder setHorizontalAlignment(
        * @return This builder for chaining.
        */
       public Builder clearHorizontalAlignment() {
-        bitField0_ = (bitField0_ & ~0x00000002);
+
         horizontalAlignment_ = 0;
         onChanged();
         return this;
@@ -4844,8 +4857,8 @@ public int getVerticalAlignmentValue() {
        * @return This builder for chaining.
        */
       public Builder setVerticalAlignmentValue(int value) {
+
         verticalAlignment_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -4864,8 +4877,9 @@ public Builder setVerticalAlignmentValue(int value) {
        */
       @java.lang.Override
       public com.google.apps.card.v1.Columns.Column.VerticalAlignment getVerticalAlignment() {
+        @SuppressWarnings("deprecation")
         com.google.apps.card.v1.Columns.Column.VerticalAlignment result =
-            com.google.apps.card.v1.Columns.Column.VerticalAlignment.forNumber(verticalAlignment_);
+            com.google.apps.card.v1.Columns.Column.VerticalAlignment.valueOf(verticalAlignment_);
         return result == null
             ? com.google.apps.card.v1.Columns.Column.VerticalAlignment.UNRECOGNIZED
             : result;
@@ -4889,7 +4903,7 @@ public Builder setVerticalAlignment(
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000004;
+
         verticalAlignment_ = value.getNumber();
         onChanged();
         return this;
@@ -4908,7 +4922,7 @@ public Builder setVerticalAlignment(
        * @return This builder for chaining.
        */
       public Builder clearVerticalAlignment() {
-        bitField0_ = (bitField0_ & ~0x00000004);
+
         verticalAlignment_ = 0;
         onChanged();
         return this;
@@ -4918,10 +4932,10 @@ public Builder clearVerticalAlignment() {
           java.util.Collections.emptyList();
 
       private void ensureWidgetsIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           widgets_ =
               new java.util.ArrayList(widgets_);
-          bitField0_ |= 0x00000008;
+          bitField0_ |= 0x00000001;
         }
       }
 
@@ -5158,7 +5172,7 @@ public Builder addAllWidgets(
       public Builder clearWidgets() {
         if (widgetsBuilder_ == null) {
           widgets_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
           widgetsBuilder_.clear();
@@ -5295,7 +5309,7 @@ public com.google.apps.card.v1.Columns.Column.Widgets.Builder addWidgetsBuilder(
                   com.google.apps.card.v1.Columns.Column.Widgets,
                   com.google.apps.card.v1.Columns.Column.Widgets.Builder,
                   com.google.apps.card.v1.Columns.Column.WidgetsOrBuilder>(
-                  widgets_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
+                  widgets_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
           widgets_ = null;
         }
         return widgetsBuilder_;
@@ -5366,8 +5380,6 @@ public com.google.apps.card.v1.Columns.Column getDefaultInstanceForType() {
   }
 
   public static final int COLUMN_ITEMS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List columnItems_;
 
   /**
@@ -5610,31 +5622,25 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * specified. For an example in Google Chat apps, see
    * [Display cards and dialogs in
    * columns](https://developers.google.com/workspace/chat/format-structure-card-dialog#display_cards_and_dialogs_in_columns).
-   *
    * The height of each column is determined by the taller column. For example, if
    * the first column is taller than the second column, both columns have the
    * height of the first column. Because each column can contain a different
    * number of widgets, you can't define rows or align widgets between the
    * columns.
-   *
    * Columns are displayed side-by-side. You can customize the width of each
    * column using the `HorizontalSizeStyle` field. If the user's
    * screen width is too narrow, the second column wraps below the first:
-   *
    * * On web, the second column wraps if the screen width is less than or equal
    *   to 480 pixels.
    * * On iOS devices, the second column wraps if the screen width is
    *   less than or equal to 300 pt.
    * * On Android devices, the second column wraps if the screen width is
    *   less than or equal to 320 dp.
-   *
    * To include more than two columns, or to use rows, use the
    * [`Grid`][google.apps.card.v1.Grid] widget.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * The add-on UIs that support columns include:
-   *
    * * The dialog displayed when users open the add-on from an email draft.
    * * The dialog displayed when users open the add-on from the
    * **Add attachment** menu in a Google Calendar event.
@@ -5670,7 +5676,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (columnItemsBuilder_ == null) {
         columnItems_ = java.util.Collections.emptyList();
       } else {
@@ -5704,15 +5709,7 @@ public com.google.apps.card.v1.Columns build() {
     @java.lang.Override
     public com.google.apps.card.v1.Columns buildPartial() {
       com.google.apps.card.v1.Columns result = new com.google.apps.card.v1.Columns(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.apps.card.v1.Columns result) {
+      int from_bitField0_ = bitField0_;
       if (columnItemsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           columnItems_ = java.util.Collections.unmodifiableList(columnItems_);
@@ -5722,10 +5719,8 @@ private void buildPartialRepeatedFields(com.google.apps.card.v1.Columns result)
       } else {
         result.columnItems_ = columnItemsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.apps.card.v1.Columns result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ColumnsOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ColumnsOrBuilder.java
index b52ffbcfc2..cfb9c49e23 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ColumnsOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ColumnsOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface ColumnsOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DateTimePicker.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DateTimePicker.java
index d31bf14514..7b0e2e3703 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DateTimePicker.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DateTimePicker.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -29,11 +28,9 @@
  * the submission action is blocked unless a value is selected. For an example
  * in Google Chat apps, see [Let a user pick a date and
  * time](https://developers.google.com/workspace/chat/design-interactive-card-dialog#let_a_user_pick_a_date_and_time).
- *
  * Users can input text or use the picker to select dates and times. If users
  * input an invalid date or time, the picker shows an error that prompts users
  * to input the information correctly.
- *
  * [Google Workspace
  * add-ons and Chat apps](https://developers.google.com/workspace/extend):
  * 

@@ -63,6 +60,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DateTimePicker();
   }
 
+  @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.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_DateTimePicker_descriptor;
@@ -84,7 +86,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * The format for the date and time in the `DateTimePicker` widget.
    * Determines whether users can input a date, a time, or both a date and time.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -246,16 +247,13 @@ private DateTimePickerType(int value) {
 
   private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
    *
    * 
    * The name by which the `DateTimePicker` is identified in a form input event.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -282,7 +280,6 @@ public java.lang.String getName() {
    *
    * 
    * The name by which the `DateTimePicker` is identified in a form input event.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -305,9 +302,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int LABEL_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object label_ = "";
+  private volatile java.lang.Object label_;
 
   /**
    *
@@ -362,7 +357,7 @@ public com.google.protobuf.ByteString getLabelBytes() {
   }
 
   public static final int TYPE_FIELD_NUMBER = 3;
-  private int type_ = 0;
+  private int type_;
 
   /**
    *
@@ -393,15 +388,16 @@ public int getTypeValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.DateTimePicker.DateTimePickerType getType() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.DateTimePicker.DateTimePickerType result =
-        com.google.apps.card.v1.DateTimePicker.DateTimePickerType.forNumber(type_);
+        com.google.apps.card.v1.DateTimePicker.DateTimePickerType.valueOf(type_);
     return result == null
         ? com.google.apps.card.v1.DateTimePicker.DateTimePickerType.UNRECOGNIZED
         : result;
   }
 
   public static final int VALUE_MS_EPOCH_FIELD_NUMBER = 4;
-  private long valueMsEpoch_ = 0L;
+  private long valueMsEpoch_;
 
   /**
    *
@@ -409,9 +405,7 @@ public com.google.apps.card.v1.DateTimePicker.DateTimePickerType getType() {
    * 
    * Optional. The default value displayed in the widget, in milliseconds since
    * [Unix epoch time](https://en.wikipedia.org/wiki/Unix_time).
-   *
    * Specify the value based on the type of picker (`DateTimePickerType`):
-   *
    * * `DATE_AND_TIME`: a calendar date and time in UTC. For example, to
    *   represent January 1, 2023 at 12:00 PM UTC, use `1672574400000`.
    * * `DATE_ONLY`: a calendar date at 00:00:00 UTC. For example, to represent
@@ -435,9 +429,7 @@ public boolean hasValueMsEpoch() {
    * 
    * Optional. The default value displayed in the widget, in milliseconds since
    * [Unix epoch time](https://en.wikipedia.org/wiki/Unix_time).
-   *
    * Specify the value based on the type of picker (`DateTimePickerType`):
-   *
    * * `DATE_AND_TIME`: a calendar date and time in UTC. For example, to
    *   represent January 1, 2023 at 12:00 PM UTC, use `1672574400000`.
    * * `DATE_ONLY`: a calendar date at 00:00:00 UTC. For example, to represent
@@ -456,7 +448,7 @@ public long getValueMsEpoch() {
   }
 
   public static final int TIMEZONE_OFFSET_DATE_FIELD_NUMBER = 5;
-  private int timezoneOffsetDate_ = 0;
+  private int timezoneOffsetDate_;
 
   /**
    *
@@ -493,7 +485,7 @@ public int getTimezoneOffsetDate() {
    */
   @java.lang.Override
   public boolean hasOnChangeAction() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return onChangeAction_ != null;
   }
 
   /**
@@ -527,9 +519,7 @@ public com.google.apps.card.v1.Action getOnChangeAction() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.ActionOrBuilder getOnChangeActionOrBuilder() {
-    return onChangeAction_ == null
-        ? com.google.apps.card.v1.Action.getDefaultInstance()
-        : onChangeAction_;
+    return getOnChangeAction();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -562,7 +552,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (timezoneOffsetDate_ != 0) {
       output.writeInt32(5, timezoneOffsetDate_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (onChangeAction_ != null) {
       output.writeMessage(6, getOnChangeAction());
     }
     getUnknownFields().writeTo(output);
@@ -590,7 +580,7 @@ public int getSerializedSize() {
     if (timezoneOffsetDate_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(5, timezoneOffsetDate_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (onChangeAction_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getOnChangeAction());
     }
     size += getUnknownFields().getSerializedSize();
@@ -758,11 +748,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * the submission action is blocked unless a value is selected. For an example
    * in Google Chat apps, see [Let a user pick a date and
    * time](https://developers.google.com/workspace/chat/design-interactive-card-dialog#let_a_user_pick_a_date_and_time).
-   *
    * Users can input text or use the picker to select dates and times. If users
    * input an invalid date or time, the picker shows an error that prompts users
    * to input the information correctly.
-   *
    * [Google Workspace
    * add-ons and Chat apps](https://developers.google.com/workspace/extend):
    * 

@@ -789,33 +777,29 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.DateTimePicker.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getOnChangeActionFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       label_ = "";
+
       type_ = 0;
+
       valueMsEpoch_ = 0L;
+      bitField0_ = (bitField0_ & ~0x00000001);
       timezoneOffsetDate_ = 0;
-      onChangeAction_ = null;
-      if (onChangeActionBuilder_ != null) {
-        onChangeActionBuilder_.dispose();
+
+      if (onChangeActionBuilder_ == null) {
+        onChangeAction_ = null;
+      } else {
+        onChangeAction_ = null;
         onChangeActionBuilder_ = null;
       }
       return this;
@@ -845,38 +829,24 @@ public com.google.apps.card.v1.DateTimePicker build() {
     public com.google.apps.card.v1.DateTimePicker buildPartial() {
       com.google.apps.card.v1.DateTimePicker result =
           new com.google.apps.card.v1.DateTimePicker(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.apps.card.v1.DateTimePicker result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.label_ = label_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.type_ = type_;
-      }
       int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000008) != 0)) {
+      result.name_ = name_;
+      result.label_ = label_;
+      result.type_ = type_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
         result.valueMsEpoch_ = valueMsEpoch_;
         to_bitField0_ |= 0x00000001;
       }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.timezoneOffsetDate_ = timezoneOffsetDate_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.onChangeAction_ =
-            onChangeActionBuilder_ == null ? onChangeAction_ : onChangeActionBuilder_.build();
-        to_bitField0_ |= 0x00000002;
+      result.timezoneOffsetDate_ = timezoneOffsetDate_;
+      if (onChangeActionBuilder_ == null) {
+        result.onChangeAction_ = onChangeAction_;
+      } else {
+        result.onChangeAction_ = onChangeActionBuilder_.build();
       }
-      result.bitField0_ |= to_bitField0_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -926,12 +896,10 @@ public Builder mergeFrom(com.google.apps.card.v1.DateTimePicker other) {
       if (other == com.google.apps.card.v1.DateTimePicker.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLabel().isEmpty()) {
         label_ = other.label_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.type_ != 0) {
@@ -975,37 +943,37 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 label_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 24:
               {
                 type_ = input.readEnum();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 32:
               {
                 valueMsEpoch_ = input.readInt64();
-                bitField0_ |= 0x00000008;
+                bitField0_ |= 0x00000001;
                 break;
               } // case 32
             case 40:
               {
                 timezoneOffsetDate_ = input.readInt32();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 40
             case 50:
               {
                 input.readMessage(getOnChangeActionFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 50
             default:
@@ -1034,7 +1002,6 @@ public Builder mergeFrom(
      *
      * 
      * The name by which the `DateTimePicker` is identified in a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -1060,7 +1027,6 @@ public java.lang.String getName() {
      *
      * 
      * The name by which the `DateTimePicker` is identified in a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -1086,7 +1052,6 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * 
      * The name by which the `DateTimePicker` is identified in a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -1100,8 +1065,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1111,7 +1076,6 @@ public Builder setName(java.lang.String value) {
      *
      * 
      * The name by which the `DateTimePicker` is identified in a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -1121,8 +1085,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1132,7 +1096,6 @@ public Builder clearName() {
      *
      * 
      * The name by which the `DateTimePicker` is identified in a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -1147,8 +1110,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1223,8 +1186,8 @@ public Builder setLabel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       label_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1243,8 +1206,8 @@ public Builder setLabel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLabel() {
+
       label_ = getDefaultInstance().getLabel();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1268,8 +1231,8 @@ public Builder setLabelBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       label_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1305,8 +1268,8 @@ public int getTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setTypeValue(int value) {
+
       type_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1324,8 +1287,9 @@ public Builder setTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.DateTimePicker.DateTimePickerType getType() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.DateTimePicker.DateTimePickerType result =
-          com.google.apps.card.v1.DateTimePicker.DateTimePickerType.forNumber(type_);
+          com.google.apps.card.v1.DateTimePicker.DateTimePickerType.valueOf(type_);
       return result == null
           ? com.google.apps.card.v1.DateTimePicker.DateTimePickerType.UNRECOGNIZED
           : result;
@@ -1347,7 +1311,7 @@ public Builder setType(com.google.apps.card.v1.DateTimePicker.DateTimePickerType
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000004;
+
       type_ = value.getNumber();
       onChanged();
       return this;
@@ -1365,7 +1329,7 @@ public Builder setType(com.google.apps.card.v1.DateTimePicker.DateTimePickerType
      * @return This builder for chaining.
      */
     public Builder clearType() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       type_ = 0;
       onChanged();
       return this;
@@ -1379,9 +1343,7 @@ public Builder clearType() {
      * 
      * Optional. The default value displayed in the widget, in milliseconds since
      * [Unix epoch time](https://en.wikipedia.org/wiki/Unix_time).
-     *
      * Specify the value based on the type of picker (`DateTimePickerType`):
-     *
      * * `DATE_AND_TIME`: a calendar date and time in UTC. For example, to
      *   represent January 1, 2023 at 12:00 PM UTC, use `1672574400000`.
      * * `DATE_ONLY`: a calendar date at 00:00:00 UTC. For example, to represent
@@ -1396,7 +1358,7 @@ public Builder clearType() {
      */
     @java.lang.Override
     public boolean hasValueMsEpoch() {
-      return ((bitField0_ & 0x00000008) != 0);
+      return ((bitField0_ & 0x00000001) != 0);
     }
 
     /**
@@ -1405,9 +1367,7 @@ public boolean hasValueMsEpoch() {
      * 
      * Optional. The default value displayed in the widget, in milliseconds since
      * [Unix epoch time](https://en.wikipedia.org/wiki/Unix_time).
-     *
      * Specify the value based on the type of picker (`DateTimePickerType`):
-     *
      * * `DATE_AND_TIME`: a calendar date and time in UTC. For example, to
      *   represent January 1, 2023 at 12:00 PM UTC, use `1672574400000`.
      * * `DATE_ONLY`: a calendar date at 00:00:00 UTC. For example, to represent
@@ -1431,9 +1391,7 @@ public long getValueMsEpoch() {
      * 
      * Optional. The default value displayed in the widget, in milliseconds since
      * [Unix epoch time](https://en.wikipedia.org/wiki/Unix_time).
-     *
      * Specify the value based on the type of picker (`DateTimePickerType`):
-     *
      * * `DATE_AND_TIME`: a calendar date and time in UTC. For example, to
      *   represent January 1, 2023 at 12:00 PM UTC, use `1672574400000`.
      * * `DATE_ONLY`: a calendar date at 00:00:00 UTC. For example, to represent
@@ -1448,9 +1406,8 @@ public long getValueMsEpoch() {
      * @return This builder for chaining.
      */
     public Builder setValueMsEpoch(long value) {
-
+      bitField0_ |= 0x00000001;
       valueMsEpoch_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1461,9 +1418,7 @@ public Builder setValueMsEpoch(long value) {
      * 
      * Optional. The default value displayed in the widget, in milliseconds since
      * [Unix epoch time](https://en.wikipedia.org/wiki/Unix_time).
-     *
      * Specify the value based on the type of picker (`DateTimePickerType`):
-     *
      * * `DATE_AND_TIME`: a calendar date and time in UTC. For example, to
      *   represent January 1, 2023 at 12:00 PM UTC, use `1672574400000`.
      * * `DATE_ONLY`: a calendar date at 00:00:00 UTC. For example, to represent
@@ -1477,7 +1432,7 @@ public Builder setValueMsEpoch(long value) {
      * @return This builder for chaining.
      */
     public Builder clearValueMsEpoch() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+      bitField0_ = (bitField0_ & ~0x00000001);
       valueMsEpoch_ = 0L;
       onChanged();
       return this;
@@ -1520,7 +1475,6 @@ public int getTimezoneOffsetDate() {
     public Builder setTimezoneOffsetDate(int value) {
 
       timezoneOffsetDate_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1539,7 +1493,7 @@ public Builder setTimezoneOffsetDate(int value) {
      * @return This builder for chaining.
      */
     public Builder clearTimezoneOffsetDate() {
-      bitField0_ = (bitField0_ & ~0x00000010);
+
       timezoneOffsetDate_ = 0;
       onChanged();
       return this;
@@ -1565,7 +1519,7 @@ public Builder clearTimezoneOffsetDate() {
      * @return Whether the onChangeAction field is set.
      */
     public boolean hasOnChangeAction() {
-      return ((bitField0_ & 0x00000020) != 0);
+      return onChangeActionBuilder_ != null || onChangeAction_ != null;
     }
 
     /**
@@ -1606,11 +1560,11 @@ public Builder setOnChangeAction(com.google.apps.card.v1.Action value) {
           throw new NullPointerException();
         }
         onChangeAction_ = value;
+        onChanged();
       } else {
         onChangeActionBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000020;
-      onChanged();
+
       return this;
     }
 
@@ -1627,11 +1581,11 @@ public Builder setOnChangeAction(com.google.apps.card.v1.Action value) {
     public Builder setOnChangeAction(com.google.apps.card.v1.Action.Builder builderForValue) {
       if (onChangeActionBuilder_ == null) {
         onChangeAction_ = builderForValue.build();
+        onChanged();
       } else {
         onChangeActionBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000020;
-      onChanged();
+
       return this;
     }
 
@@ -1647,20 +1601,19 @@ public Builder setOnChangeAction(com.google.apps.card.v1.Action.Builder builderF
      */
     public Builder mergeOnChangeAction(com.google.apps.card.v1.Action value) {
       if (onChangeActionBuilder_ == null) {
-        if (((bitField0_ & 0x00000020) != 0)
-            && onChangeAction_ != null
-            && onChangeAction_ != com.google.apps.card.v1.Action.getDefaultInstance()) {
-          getOnChangeActionBuilder().mergeFrom(value);
+        if (onChangeAction_ != null) {
+          onChangeAction_ =
+              com.google.apps.card.v1.Action.newBuilder(onChangeAction_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           onChangeAction_ = value;
         }
+        onChanged();
       } else {
         onChangeActionBuilder_.mergeFrom(value);
       }
-      if (onChangeAction_ != null) {
-        bitField0_ |= 0x00000020;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1675,13 +1628,14 @@ public Builder mergeOnChangeAction(com.google.apps.card.v1.Action value) {
      * .google.apps.card.v1.Action on_change_action = 6;
      */
     public Builder clearOnChangeAction() {
-      bitField0_ = (bitField0_ & ~0x00000020);
-      onChangeAction_ = null;
-      if (onChangeActionBuilder_ != null) {
-        onChangeActionBuilder_.dispose();
+      if (onChangeActionBuilder_ == null) {
+        onChangeAction_ = null;
+        onChanged();
+      } else {
+        onChangeAction_ = null;
         onChangeActionBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1696,7 +1650,7 @@ public Builder clearOnChangeAction() {
      * .google.apps.card.v1.Action on_change_action = 6;
      */
     public com.google.apps.card.v1.Action.Builder getOnChangeActionBuilder() {
-      bitField0_ |= 0x00000020;
+
       onChanged();
       return getOnChangeActionFieldBuilder().getBuilder();
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DateTimePickerOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DateTimePickerOrBuilder.java
index ed1ba5fa41..a2c56ca947 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DateTimePickerOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DateTimePickerOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface DateTimePickerOrBuilder
@@ -29,7 +28,6 @@ public interface DateTimePickerOrBuilder
    *
    * 
    * The name by which the `DateTimePicker` is identified in a form input event.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -45,7 +43,6 @@ public interface DateTimePickerOrBuilder
    *
    * 
    * The name by which the `DateTimePicker` is identified in a form input event.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -118,9 +115,7 @@ public interface DateTimePickerOrBuilder
    * 
    * Optional. The default value displayed in the widget, in milliseconds since
    * [Unix epoch time](https://en.wikipedia.org/wiki/Unix_time).
-   *
    * Specify the value based on the type of picker (`DateTimePickerType`):
-   *
    * * `DATE_AND_TIME`: a calendar date and time in UTC. For example, to
    *   represent January 1, 2023 at 12:00 PM UTC, use `1672574400000`.
    * * `DATE_ONLY`: a calendar date at 00:00:00 UTC. For example, to represent
@@ -141,9 +136,7 @@ public interface DateTimePickerOrBuilder
    * 
    * Optional. The default value displayed in the widget, in milliseconds since
    * [Unix epoch time](https://en.wikipedia.org/wiki/Unix_time).
-   *
    * Specify the value based on the type of picker (`DateTimePickerType`):
-   *
    * * `DATE_AND_TIME`: a calendar date and time in UTC. For example, to
    *   represent January 1, 2023 at 12:00 PM UTC, use `1672574400000`.
    * * `DATE_ONLY`: a calendar date at 00:00:00 UTC. For example, to represent
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DecoratedText.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DecoratedText.java
index 74f771058f..1dcaf9d9c3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DecoratedText.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DecoratedText.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -28,7 +27,6 @@
  * button after the text. For an example in
  * Google Chat apps, see [Display text with decorative
  * text](https://developers.google.com/workspace/chat/add-text-image-card-dialog#display_text_with_decorative_elements).
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
  * 

@@ -59,6 +57,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DecoratedText();
   }
 
+  @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.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_DecoratedText_descriptor;
@@ -84,7 +87,6 @@ public interface SwitchControlOrBuilder
      *
      * 
      * The name by which the switch widget is identified in a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -100,7 +102,6 @@ public interface SwitchControlOrBuilder
      *
      * 
      * The name by which the switch widget is identified in a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -116,7 +117,6 @@ public interface SwitchControlOrBuilder
      *
      * 
      * The value entered by a user, returned as part of a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -132,7 +132,6 @@ public interface SwitchControlOrBuilder
      *
      * 
      * The value entered by a user, returned as part of a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -201,7 +200,6 @@ public interface SwitchControlOrBuilder
      *
      * 
      * How the switch appears in the user interface.
-     *
      * [Google Workspace add-ons
      * and Chat apps](https://developers.google.com/workspace/extend):
      * 

@@ -217,7 +215,6 @@ public interface SwitchControlOrBuilder
      *
      * 
      * How the switch appears in the user interface.
-     *
      * [Google Workspace add-ons
      * and Chat apps](https://developers.google.com/workspace/extend):
      * 

@@ -234,10 +231,8 @@ public interface SwitchControlOrBuilder
    *
    * 
    * Either a toggle-style switch or a checkbox inside a `decoratedText` widget.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
-   *
    * Only supported in the `decoratedText` widget.
    * 

    *
@@ -266,6 +261,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new SwitchControl();
     }
 
+    @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.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_DecoratedText_SwitchControl_descriptor;
@@ -286,7 +286,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      *
      * 
      * How the switch appears in the user interface.
-     *
      * [Google Workspace add-ons
      * and Chat apps](https://developers.google.com/workspace/extend):
      * 

@@ -445,18 +444,14 @@ private ControlType(int value) {
       // @@protoc_insertion_point(enum_scope:google.apps.card.v1.DecoratedText.SwitchControl.ControlType)
     }
 
-    private int bitField0_;
     public static final int NAME_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object name_ = "";
+    private volatile java.lang.Object name_;
 
     /**
      *
      *
      * 
      * The name by which the switch widget is identified in a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -483,7 +478,6 @@ public java.lang.String getName() {
      *
      * 
      * The name by which the switch widget is identified in a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -506,16 +500,13 @@ public com.google.protobuf.ByteString getNameBytes() {
     }
 
     public static final int VALUE_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object value_ = "";
+    private volatile java.lang.Object value_;
 
     /**
      *
      *
      * 
      * The value entered by a user, returned as part of a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -542,7 +533,6 @@ public java.lang.String getValue() {
      *
      * 
      * The value entered by a user, returned as part of a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -565,7 +555,7 @@ public com.google.protobuf.ByteString getValueBytes() {
     }
 
     public static final int SELECTED_FIELD_NUMBER = 3;
-    private boolean selected_ = false;
+    private boolean selected_;
 
     /**
      *
@@ -600,7 +590,7 @@ public boolean getSelected() {
      */
     @java.lang.Override
     public boolean hasOnChangeAction() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return onChangeAction_ != null;
     }
 
     /**
@@ -634,20 +624,17 @@ public com.google.apps.card.v1.Action getOnChangeAction() {
      */
     @java.lang.Override
     public com.google.apps.card.v1.ActionOrBuilder getOnChangeActionOrBuilder() {
-      return onChangeAction_ == null
-          ? com.google.apps.card.v1.Action.getDefaultInstance()
-          : onChangeAction_;
+      return getOnChangeAction();
     }
 
     public static final int CONTROL_TYPE_FIELD_NUMBER = 5;
-    private int controlType_ = 0;
+    private int controlType_;
 
     /**
      *
      *
      * 
      * How the switch appears in the user interface.
-     *
      * [Google Workspace add-ons
      * and Chat apps](https://developers.google.com/workspace/extend):
      * 

@@ -666,7 +653,6 @@ public int getControlTypeValue() {
      *
      * 
      * How the switch appears in the user interface.
-     *
      * [Google Workspace add-ons
      * and Chat apps](https://developers.google.com/workspace/extend):
      * 

@@ -677,8 +663,9 @@ public int getControlTypeValue() {
      */
     @java.lang.Override
     public com.google.apps.card.v1.DecoratedText.SwitchControl.ControlType getControlType() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.DecoratedText.SwitchControl.ControlType result =
-          com.google.apps.card.v1.DecoratedText.SwitchControl.ControlType.forNumber(controlType_);
+          com.google.apps.card.v1.DecoratedText.SwitchControl.ControlType.valueOf(controlType_);
       return result == null
           ? com.google.apps.card.v1.DecoratedText.SwitchControl.ControlType.UNRECOGNIZED
           : result;
@@ -707,7 +694,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (selected_ != false) {
         output.writeBool(3, selected_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (onChangeAction_ != null) {
         output.writeMessage(4, getOnChangeAction());
       }
       if (controlType_
@@ -732,7 +719,7 @@ public int getSerializedSize() {
       if (selected_ != false) {
         size += com.google.protobuf.CodedOutputStream.computeBoolSize(3, selected_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (onChangeAction_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getOnChangeAction());
       }
       if (controlType_
@@ -894,10 +881,8 @@ protected Builder newBuilderForType(
      *
      * 
      * Either a toggle-style switch or a checkbox inside a `decoratedText` widget.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
-     *
      * Only supported in the `decoratedText` widget.
      * 

      *
@@ -924,34 +909,29 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.DecoratedText.SwitchControl.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getOnChangeActionFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         name_ = "";
+
         value_ = "";
+
         selected_ = false;
-        onChangeAction_ = null;
-        if (onChangeActionBuilder_ != null) {
-          onChangeActionBuilder_.dispose();
+
+        if (onChangeActionBuilder_ == null) {
+          onChangeAction_ = null;
+        } else {
+          onChangeAction_ = null;
           onChangeActionBuilder_ = null;
         }
         controlType_ = 0;
+
         return this;
       }
 
@@ -979,36 +959,19 @@ public com.google.apps.card.v1.DecoratedText.SwitchControl build() {
       public com.google.apps.card.v1.DecoratedText.SwitchControl buildPartial() {
         com.google.apps.card.v1.DecoratedText.SwitchControl result =
             new com.google.apps.card.v1.DecoratedText.SwitchControl(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        result.name_ = name_;
+        result.value_ = value_;
+        result.selected_ = selected_;
+        if (onChangeActionBuilder_ == null) {
+          result.onChangeAction_ = onChangeAction_;
+        } else {
+          result.onChangeAction_ = onChangeActionBuilder_.build();
         }
+        result.controlType_ = controlType_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.apps.card.v1.DecoratedText.SwitchControl result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.name_ = name_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.value_ = value_;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.selected_ = selected_;
-        }
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000008) != 0)) {
-          result.onChangeAction_ =
-              onChangeActionBuilder_ == null ? onChangeAction_ : onChangeActionBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        if (((from_bitField0_ & 0x00000010) != 0)) {
-          result.controlType_ = controlType_;
-        }
-        result.bitField0_ |= to_bitField0_;
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1059,12 +1022,10 @@ public Builder mergeFrom(com.google.apps.card.v1.DecoratedText.SwitchControl oth
           return this;
         if (!other.getName().isEmpty()) {
           name_ = other.name_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getValue().isEmpty()) {
           value_ = other.value_;
-          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.getSelected() != false) {
@@ -1105,32 +1066,32 @@ public Builder mergeFrom(
               case 10:
                 {
                   name_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   value_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               case 24:
                 {
                   selected_ = input.readBool();
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 24
               case 34:
                 {
                   input.readMessage(
                       getOnChangeActionFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000008;
+
                   break;
                 } // case 34
               case 40:
                 {
                   controlType_ = input.readEnum();
-                  bitField0_ |= 0x00000010;
+
                   break;
                 } // case 40
               default:
@@ -1150,8 +1111,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private java.lang.Object name_ = "";
 
       /**
@@ -1159,7 +1118,6 @@ public Builder mergeFrom(
        *
        * 
        * The name by which the switch widget is identified in a form input event.
-       *
        * For details about working with form inputs, see [Receive form
        * data](https://developers.google.com/workspace/chat/read-form-data).
        * 

@@ -1185,7 +1143,6 @@ public java.lang.String getName() {
        *
        * 
        * The name by which the switch widget is identified in a form input event.
-       *
        * For details about working with form inputs, see [Receive form
        * data](https://developers.google.com/workspace/chat/read-form-data).
        * 

@@ -1211,7 +1168,6 @@ public com.google.protobuf.ByteString getNameBytes() {
        *
        * 
        * The name by which the switch widget is identified in a form input event.
-       *
        * For details about working with form inputs, see [Receive form
        * data](https://developers.google.com/workspace/chat/read-form-data).
        * 

@@ -1225,8 +1181,8 @@ public Builder setName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         name_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1236,7 +1192,6 @@ public Builder setName(java.lang.String value) {
        *
        * 
        * The name by which the switch widget is identified in a form input event.
-       *
        * For details about working with form inputs, see [Receive form
        * data](https://developers.google.com/workspace/chat/read-form-data).
        * 

@@ -1246,8 +1201,8 @@ public Builder setName(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearName() {
+
         name_ = getDefaultInstance().getName();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1257,7 +1212,6 @@ public Builder clearName() {
        *
        * 
        * The name by which the switch widget is identified in a form input event.
-       *
        * For details about working with form inputs, see [Receive form
        * data](https://developers.google.com/workspace/chat/read-form-data).
        * 

@@ -1272,8 +1226,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         name_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1285,7 +1239,6 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
        *
        * 
        * The value entered by a user, returned as part of a form input event.
-       *
        * For details about working with form inputs, see [Receive form
        * data](https://developers.google.com/workspace/chat/read-form-data).
        * 

@@ -1311,7 +1264,6 @@ public java.lang.String getValue() {
        *
        * 
        * The value entered by a user, returned as part of a form input event.
-       *
        * For details about working with form inputs, see [Receive form
        * data](https://developers.google.com/workspace/chat/read-form-data).
        * 

@@ -1337,7 +1289,6 @@ public com.google.protobuf.ByteString getValueBytes() {
        *
        * 
        * The value entered by a user, returned as part of a form input event.
-       *
        * For details about working with form inputs, see [Receive form
        * data](https://developers.google.com/workspace/chat/read-form-data).
        * 

@@ -1351,8 +1302,8 @@ public Builder setValue(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         value_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1362,7 +1313,6 @@ public Builder setValue(java.lang.String value) {
        *
        * 
        * The value entered by a user, returned as part of a form input event.
-       *
        * For details about working with form inputs, see [Receive form
        * data](https://developers.google.com/workspace/chat/read-form-data).
        * 

@@ -1372,8 +1322,8 @@ public Builder setValue(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearValue() {
+
         value_ = getDefaultInstance().getValue();
-        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1383,7 +1333,6 @@ public Builder clearValue() {
        *
        * 
        * The value entered by a user, returned as part of a form input event.
-       *
        * For details about working with form inputs, see [Receive form
        * data](https://developers.google.com/workspace/chat/read-form-data).
        * 

@@ -1398,8 +1347,8 @@ public Builder setValueBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         value_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1437,7 +1386,6 @@ public boolean getSelected() {
       public Builder setSelected(boolean value) {
 
         selected_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1454,7 +1402,7 @@ public Builder setSelected(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearSelected() {
-        bitField0_ = (bitField0_ & ~0x00000004);
+
         selected_ = false;
         onChanged();
         return this;
@@ -1480,7 +1428,7 @@ public Builder clearSelected() {
        * @return Whether the onChangeAction field is set.
        */
       public boolean hasOnChangeAction() {
-        return ((bitField0_ & 0x00000008) != 0);
+        return onChangeActionBuilder_ != null || onChangeAction_ != null;
       }
 
       /**
@@ -1521,11 +1469,11 @@ public Builder setOnChangeAction(com.google.apps.card.v1.Action value) {
             throw new NullPointerException();
           }
           onChangeAction_ = value;
+          onChanged();
         } else {
           onChangeActionBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000008;
-        onChanged();
+
         return this;
       }
 
@@ -1542,11 +1490,11 @@ public Builder setOnChangeAction(com.google.apps.card.v1.Action value) {
       public Builder setOnChangeAction(com.google.apps.card.v1.Action.Builder builderForValue) {
         if (onChangeActionBuilder_ == null) {
           onChangeAction_ = builderForValue.build();
+          onChanged();
         } else {
           onChangeActionBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000008;
-        onChanged();
+
         return this;
       }
 
@@ -1562,20 +1510,19 @@ public Builder setOnChangeAction(com.google.apps.card.v1.Action.Builder builderF
        */
       public Builder mergeOnChangeAction(com.google.apps.card.v1.Action value) {
         if (onChangeActionBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) != 0)
-              && onChangeAction_ != null
-              && onChangeAction_ != com.google.apps.card.v1.Action.getDefaultInstance()) {
-            getOnChangeActionBuilder().mergeFrom(value);
+          if (onChangeAction_ != null) {
+            onChangeAction_ =
+                com.google.apps.card.v1.Action.newBuilder(onChangeAction_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             onChangeAction_ = value;
           }
+          onChanged();
         } else {
           onChangeActionBuilder_.mergeFrom(value);
         }
-        if (onChangeAction_ != null) {
-          bitField0_ |= 0x00000008;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -1590,13 +1537,14 @@ public Builder mergeOnChangeAction(com.google.apps.card.v1.Action value) {
        * .google.apps.card.v1.Action on_change_action = 4;
        */
       public Builder clearOnChangeAction() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        onChangeAction_ = null;
-        if (onChangeActionBuilder_ != null) {
-          onChangeActionBuilder_.dispose();
+        if (onChangeActionBuilder_ == null) {
+          onChangeAction_ = null;
+          onChanged();
+        } else {
+          onChangeAction_ = null;
           onChangeActionBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1611,7 +1559,7 @@ public Builder clearOnChangeAction() {
        * .google.apps.card.v1.Action on_change_action = 4;
        */
       public com.google.apps.card.v1.Action.Builder getOnChangeActionBuilder() {
-        bitField0_ |= 0x00000008;
+
         onChanged();
         return getOnChangeActionFieldBuilder().getBuilder();
       }
@@ -1670,7 +1618,6 @@ public com.google.apps.card.v1.ActionOrBuilder getOnChangeActionOrBuilder() {
        *
        * 
        * How the switch appears in the user interface.
-       *
        * [Google Workspace add-ons
        * and Chat apps](https://developers.google.com/workspace/extend):
        * 

@@ -1689,7 +1636,6 @@ public int getControlTypeValue() {
        *
        * 
        * How the switch appears in the user interface.
-       *
        * [Google Workspace add-ons
        * and Chat apps](https://developers.google.com/workspace/extend):
        * 

@@ -1700,8 +1646,8 @@ public int getControlTypeValue() {
        * @return This builder for chaining.
        */
       public Builder setControlTypeValue(int value) {
+
         controlType_ = value;
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1711,7 +1657,6 @@ public Builder setControlTypeValue(int value) {
        *
        * 
        * How the switch appears in the user interface.
-       *
        * [Google Workspace add-ons
        * and Chat apps](https://developers.google.com/workspace/extend):
        * 

@@ -1722,8 +1667,9 @@ public Builder setControlTypeValue(int value) {
        */
       @java.lang.Override
       public com.google.apps.card.v1.DecoratedText.SwitchControl.ControlType getControlType() {
+        @SuppressWarnings("deprecation")
         com.google.apps.card.v1.DecoratedText.SwitchControl.ControlType result =
-            com.google.apps.card.v1.DecoratedText.SwitchControl.ControlType.forNumber(controlType_);
+            com.google.apps.card.v1.DecoratedText.SwitchControl.ControlType.valueOf(controlType_);
         return result == null
             ? com.google.apps.card.v1.DecoratedText.SwitchControl.ControlType.UNRECOGNIZED
             : result;
@@ -1734,7 +1680,6 @@ public com.google.apps.card.v1.DecoratedText.SwitchControl.ControlType getContro
        *
        * 
        * How the switch appears in the user interface.
-       *
        * [Google Workspace add-ons
        * and Chat apps](https://developers.google.com/workspace/extend):
        * 

@@ -1749,7 +1694,7 @@ public Builder setControlType(
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000010;
+
         controlType_ = value.getNumber();
         onChanged();
         return this;
@@ -1760,7 +1705,6 @@ public Builder setControlType(
        *
        * 
        * How the switch appears in the user interface.
-       *
        * [Google Workspace add-ons
        * and Chat apps](https://developers.google.com/workspace/extend):
        * 

@@ -1770,7 +1714,7 @@ public Builder setControlType(
        * @return This builder for chaining.
        */
       public Builder clearControlType() {
-        bitField0_ = (bitField0_ & ~0x00000010);
+
         controlType_ = 0;
         onChanged();
         return this;
@@ -1840,10 +1784,7 @@ public com.google.apps.card.v1.DecoratedText.SwitchControl getDefaultInstanceFor
     }
   }
 
-  private int bitField0_;
   private int controlCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object control_;
 
   public enum ControlCase
@@ -1913,7 +1854,7 @@ public ControlCase getControlCase() {
   @java.lang.Override
   @java.lang.Deprecated
   public boolean hasIcon() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return icon_ != null;
   }
 
   /**
@@ -1947,7 +1888,7 @@ public com.google.apps.card.v1.Icon getIcon() {
   @java.lang.Override
   @java.lang.Deprecated
   public com.google.apps.card.v1.IconOrBuilder getIconOrBuilder() {
-    return icon_ == null ? com.google.apps.card.v1.Icon.getDefaultInstance() : icon_;
+    return getIcon();
   }
 
   public static final int START_ICON_FIELD_NUMBER = 12;
@@ -1966,7 +1907,7 @@ public com.google.apps.card.v1.IconOrBuilder getIconOrBuilder() {
    */
   @java.lang.Override
   public boolean hasStartIcon() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return startIcon_ != null;
   }
 
   /**
@@ -1996,11 +1937,11 @@ public com.google.apps.card.v1.Icon getStartIcon() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.IconOrBuilder getStartIconOrBuilder() {
-    return startIcon_ == null ? com.google.apps.card.v1.Icon.getDefaultInstance() : startIcon_;
+    return getStartIcon();
   }
 
   public static final int START_ICON_VERTICAL_ALIGNMENT_FIELD_NUMBER = 13;
-  private int startIconVerticalAlignment_ = 0;
+  private int startIconVerticalAlignment_;
 
   /**
    *
@@ -2008,7 +1949,6 @@ public com.google.apps.card.v1.IconOrBuilder getStartIconOrBuilder() {
    * 
    * Optional. Vertical alignment of the start icon. If not set, the icon
    * will be vertically centered.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -2027,7 +1967,6 @@ public int getStartIconVerticalAlignmentValue() {
    * 
    * Optional. Vertical alignment of the start icon. If not set, the icon
    * will be vertically centered.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -2037,15 +1976,14 @@ public int getStartIconVerticalAlignmentValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.Widget.VerticalAlignment getStartIconVerticalAlignment() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.Widget.VerticalAlignment result =
-        com.google.apps.card.v1.Widget.VerticalAlignment.forNumber(startIconVerticalAlignment_);
+        com.google.apps.card.v1.Widget.VerticalAlignment.valueOf(startIconVerticalAlignment_);
     return result == null ? com.google.apps.card.v1.Widget.VerticalAlignment.UNRECOGNIZED : result;
   }
 
   public static final int TOP_LABEL_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object topLabel_ = "";
+  private volatile java.lang.Object topLabel_;
 
   /**
    *
@@ -2104,7 +2042,6 @@ public com.google.protobuf.ByteString getTopLabelBytes() {
    * 
    * `TextParagraph` equivalent of `top_label`. Always truncates. Allows for
    * more complex formatting than `top_label`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -2114,7 +2051,7 @@ public com.google.protobuf.ByteString getTopLabelBytes() {
    */
   @java.lang.Override
   public boolean hasTopLabelText() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return topLabelText_ != null;
   }
 
   /**
@@ -2123,7 +2060,6 @@ public boolean hasTopLabelText() {
    * 
    * `TextParagraph` equivalent of `top_label`. Always truncates. Allows for
    * more complex formatting than `top_label`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -2144,7 +2080,6 @@ public com.google.apps.card.v1.TextParagraph getTopLabelText() {
    * 
    * `TextParagraph` equivalent of `top_label`. Always truncates. Allows for
    * more complex formatting than `top_label`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -2152,22 +2087,17 @@ public com.google.apps.card.v1.TextParagraph getTopLabelText() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.TextParagraphOrBuilder getTopLabelTextOrBuilder() {
-    return topLabelText_ == null
-        ? com.google.apps.card.v1.TextParagraph.getDefaultInstance()
-        : topLabelText_;
+    return getTopLabelText();
   }
 
   public static final int TEXT_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object text_ = "";
+  private volatile java.lang.Object text_;
 
   /**
    *
    *
    * 
    * Required. The primary text.
-   *
    * Supports simple formatting. For more information
    * about formatting text, see
    * [Formatting text in Google Chat
@@ -2200,7 +2130,6 @@ public java.lang.String getText() {
    *
    * 
    * Required. The primary text.
-   *
    * Supports simple formatting. For more information
    * about formatting text, see
    * [Formatting text in Google Chat
@@ -2237,7 +2166,6 @@ public com.google.protobuf.ByteString getTextBytes() {
    * 
    * `TextParagraph` equivalent of `text`. Allows for more complex formatting
    * than `text`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -2247,7 +2175,7 @@ public com.google.protobuf.ByteString getTextBytes() {
    */
   @java.lang.Override
   public boolean hasContentText() {
-    return ((bitField0_ & 0x00000008) != 0);
+    return contentText_ != null;
   }
 
   /**
@@ -2256,7 +2184,6 @@ public boolean hasContentText() {
    * 
    * `TextParagraph` equivalent of `text`. Allows for more complex formatting
    * than `text`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -2277,7 +2204,6 @@ public com.google.apps.card.v1.TextParagraph getContentText() {
    * 
    * `TextParagraph` equivalent of `text`. Allows for more complex formatting
    * than `text`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -2285,13 +2211,11 @@ public com.google.apps.card.v1.TextParagraph getContentText() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.TextParagraphOrBuilder getContentTextOrBuilder() {
-    return contentText_ == null
-        ? com.google.apps.card.v1.TextParagraph.getDefaultInstance()
-        : contentText_;
+    return getContentText();
   }
 
   public static final int WRAP_TEXT_FIELD_NUMBER = 5;
-  private boolean wrapText_ = false;
+  private boolean wrapText_;
 
   /**
    *
@@ -2299,7 +2223,6 @@ public com.google.apps.card.v1.TextParagraphOrBuilder getContentTextOrBuilder()
    * 
    * The wrap text setting. If `true`, the text wraps and displays on
    * multiple lines. Otherwise, the text is truncated.
-   *
    * Only applies to `text`, not `topLabel` and `bottomLabel`.
    * 

    *
@@ -2313,9 +2236,7 @@ public boolean getWrapText() {
   }
 
   public static final int BOTTOM_LABEL_FIELD_NUMBER = 6;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object bottomLabel_ = "";
+  private volatile java.lang.Object bottomLabel_;
 
   /**
    *
@@ -2374,7 +2295,6 @@ public com.google.protobuf.ByteString getBottomLabelBytes() {
    * 
    * `TextParagraph` equivalent of `bottom_label`. Always wraps. Allows for
    * more complex formatting than `bottom_label`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -2384,7 +2304,7 @@ public com.google.protobuf.ByteString getBottomLabelBytes() {
    */
   @java.lang.Override
   public boolean hasBottomLabelText() {
-    return ((bitField0_ & 0x00000010) != 0);
+    return bottomLabelText_ != null;
   }
 
   /**
@@ -2393,7 +2313,6 @@ public boolean hasBottomLabelText() {
    * 
    * `TextParagraph` equivalent of `bottom_label`. Always wraps. Allows for
    * more complex formatting than `bottom_label`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -2414,7 +2333,6 @@ public com.google.apps.card.v1.TextParagraph getBottomLabelText() {
    * 
    * `TextParagraph` equivalent of `bottom_label`. Always wraps. Allows for
    * more complex formatting than `bottom_label`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -2422,9 +2340,7 @@ public com.google.apps.card.v1.TextParagraph getBottomLabelText() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.TextParagraphOrBuilder getBottomLabelTextOrBuilder() {
-    return bottomLabelText_ == null
-        ? com.google.apps.card.v1.TextParagraph.getDefaultInstance()
-        : bottomLabelText_;
+    return getBottomLabelText();
   }
 
   public static final int ON_CLICK_FIELD_NUMBER = 7;
@@ -2443,7 +2359,7 @@ public com.google.apps.card.v1.TextParagraphOrBuilder getBottomLabelTextOrBuilde
    */
   @java.lang.Override
   public boolean hasOnClick() {
-    return ((bitField0_ & 0x00000020) != 0);
+    return onClick_ != null;
   }
 
   /**
@@ -2473,7 +2389,7 @@ public com.google.apps.card.v1.OnClick getOnClick() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.OnClickOrBuilder getOnClickOrBuilder() {
-    return onClick_ == null ? com.google.apps.card.v1.OnClick.getDefaultInstance() : onClick_;
+    return getOnClick();
   }
 
   public static final int BUTTON_FIELD_NUMBER = 8;
@@ -2594,7 +2510,6 @@ public com.google.apps.card.v1.DecoratedText.SwitchControlOrBuilder getSwitchCon
    *
    * 
    * An icon displayed after the text.
-   *
    * Supports
    * [built-in](https://developers.google.com/workspace/chat/format-messages#builtinicons)
    * and
@@ -2616,7 +2531,6 @@ public boolean hasEndIcon() {
    *
    * 
    * An icon displayed after the text.
-   *
    * Supports
    * [built-in](https://developers.google.com/workspace/chat/format-messages#builtinicons)
    * and
@@ -2641,7 +2555,6 @@ public com.google.apps.card.v1.Icon getEndIcon() {
    *
    * 
    * An icon displayed after the text.
-   *
    * Supports
    * [built-in](https://developers.google.com/workspace/chat/format-messages#builtinicons)
    * and
@@ -2673,7 +2586,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (icon_ != null) {
       output.writeMessage(1, getIcon());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(topLabel_)) {
@@ -2688,7 +2601,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bottomLabel_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 6, bottomLabel_);
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (onClick_ != null) {
       output.writeMessage(7, getOnClick());
     }
     if (controlCase_ == 8) {
@@ -2700,7 +2613,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (controlCase_ == 11) {
       output.writeMessage(11, (com.google.apps.card.v1.Icon) control_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (startIcon_ != null) {
       output.writeMessage(12, getStartIcon());
     }
     if (startIconVerticalAlignment_
@@ -2708,13 +2621,13 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
             .getNumber()) {
       output.writeEnum(13, startIconVerticalAlignment_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (topLabelText_ != null) {
       output.writeMessage(17, getTopLabelText());
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (contentText_ != null) {
       output.writeMessage(18, getContentText());
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (bottomLabelText_ != null) {
       output.writeMessage(19, getBottomLabelText());
     }
     getUnknownFields().writeTo(output);
@@ -2726,7 +2639,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (icon_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getIcon());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(topLabel_)) {
@@ -2741,7 +2654,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bottomLabel_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, bottomLabel_);
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (onClick_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getOnClick());
     }
     if (controlCase_ == 8) {
@@ -2759,7 +2672,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               11, (com.google.apps.card.v1.Icon) control_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (startIcon_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(12, getStartIcon());
     }
     if (startIconVerticalAlignment_
@@ -2768,13 +2681,13 @@ public int getSerializedSize() {
       size +=
           com.google.protobuf.CodedOutputStream.computeEnumSize(13, startIconVerticalAlignment_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (topLabelText_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(17, getTopLabelText());
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (contentText_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(18, getContentText());
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (bottomLabelText_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(19, getBottomLabelText());
     }
     size += getUnknownFields().getSerializedSize();
@@ -3005,7 +2918,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * button after the text. For an example in
    * Google Chat apps, see [Display text with decorative
    * text](https://developers.google.com/workspace/chat/add-text-image-card-dialog#display_text_with_decorative_elements).
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -3032,63 +2944,59 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.DecoratedText.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getIconFieldBuilder();
-        getStartIconFieldBuilder();
-        getTopLabelTextFieldBuilder();
-        getContentTextFieldBuilder();
-        getBottomLabelTextFieldBuilder();
-        getOnClickFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      icon_ = null;
-      if (iconBuilder_ != null) {
-        iconBuilder_.dispose();
+      if (iconBuilder_ == null) {
+        icon_ = null;
+      } else {
+        icon_ = null;
         iconBuilder_ = null;
       }
-      startIcon_ = null;
-      if (startIconBuilder_ != null) {
-        startIconBuilder_.dispose();
+      if (startIconBuilder_ == null) {
+        startIcon_ = null;
+      } else {
+        startIcon_ = null;
         startIconBuilder_ = null;
       }
       startIconVerticalAlignment_ = 0;
+
       topLabel_ = "";
-      topLabelText_ = null;
-      if (topLabelTextBuilder_ != null) {
-        topLabelTextBuilder_.dispose();
+
+      if (topLabelTextBuilder_ == null) {
+        topLabelText_ = null;
+      } else {
+        topLabelText_ = null;
         topLabelTextBuilder_ = null;
       }
       text_ = "";
-      contentText_ = null;
-      if (contentTextBuilder_ != null) {
-        contentTextBuilder_.dispose();
+
+      if (contentTextBuilder_ == null) {
+        contentText_ = null;
+      } else {
+        contentText_ = null;
         contentTextBuilder_ = null;
       }
       wrapText_ = false;
+
       bottomLabel_ = "";
-      bottomLabelText_ = null;
-      if (bottomLabelTextBuilder_ != null) {
-        bottomLabelTextBuilder_.dispose();
+
+      if (bottomLabelTextBuilder_ == null) {
+        bottomLabelText_ = null;
+      } else {
+        bottomLabelText_ = null;
         bottomLabelTextBuilder_ = null;
       }
-      onClick_ = null;
-      if (onClickBuilder_ != null) {
-        onClickBuilder_.dispose();
+      if (onClickBuilder_ == null) {
+        onClick_ = null;
+      } else {
+        onClick_ = null;
         onClickBuilder_ = null;
       }
       if (buttonBuilder_ != null) {
@@ -3129,74 +3037,65 @@ public com.google.apps.card.v1.DecoratedText build() {
     public com.google.apps.card.v1.DecoratedText buildPartial() {
       com.google.apps.card.v1.DecoratedText result =
           new com.google.apps.card.v1.DecoratedText(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      buildPartialOneofs(result);
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.apps.card.v1.DecoratedText result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.icon_ = iconBuilder_ == null ? icon_ : iconBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.startIcon_ = startIconBuilder_ == null ? startIcon_ : startIconBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.startIconVerticalAlignment_ = startIconVerticalAlignment_;
+      if (iconBuilder_ == null) {
+        result.icon_ = icon_;
+      } else {
+        result.icon_ = iconBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.topLabel_ = topLabel_;
+      if (startIconBuilder_ == null) {
+        result.startIcon_ = startIcon_;
+      } else {
+        result.startIcon_ = startIconBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.topLabelText_ =
-            topLabelTextBuilder_ == null ? topLabelText_ : topLabelTextBuilder_.build();
-        to_bitField0_ |= 0x00000004;
+      result.startIconVerticalAlignment_ = startIconVerticalAlignment_;
+      result.topLabel_ = topLabel_;
+      if (topLabelTextBuilder_ == null) {
+        result.topLabelText_ = topLabelText_;
+      } else {
+        result.topLabelText_ = topLabelTextBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.text_ = text_;
+      result.text_ = text_;
+      if (contentTextBuilder_ == null) {
+        result.contentText_ = contentText_;
+      } else {
+        result.contentText_ = contentTextBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.contentText_ =
-            contentTextBuilder_ == null ? contentText_ : contentTextBuilder_.build();
-        to_bitField0_ |= 0x00000008;
+      result.wrapText_ = wrapText_;
+      result.bottomLabel_ = bottomLabel_;
+      if (bottomLabelTextBuilder_ == null) {
+        result.bottomLabelText_ = bottomLabelText_;
+      } else {
+        result.bottomLabelText_ = bottomLabelTextBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.wrapText_ = wrapText_;
+      if (onClickBuilder_ == null) {
+        result.onClick_ = onClick_;
+      } else {
+        result.onClick_ = onClickBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000100) != 0)) {
-        result.bottomLabel_ = bottomLabel_;
+      if (controlCase_ == 8) {
+        if (buttonBuilder_ == null) {
+          result.control_ = control_;
+        } else {
+          result.control_ = buttonBuilder_.build();
+        }
       }
-      if (((from_bitField0_ & 0x00000200) != 0)) {
-        result.bottomLabelText_ =
-            bottomLabelTextBuilder_ == null ? bottomLabelText_ : bottomLabelTextBuilder_.build();
-        to_bitField0_ |= 0x00000010;
+      if (controlCase_ == 9) {
+        if (switchControlBuilder_ == null) {
+          result.control_ = control_;
+        } else {
+          result.control_ = switchControlBuilder_.build();
+        }
       }
-      if (((from_bitField0_ & 0x00000400) != 0)) {
-        result.onClick_ = onClickBuilder_ == null ? onClick_ : onClickBuilder_.build();
-        to_bitField0_ |= 0x00000020;
+      if (controlCase_ == 11) {
+        if (endIconBuilder_ == null) {
+          result.control_ = control_;
+        } else {
+          result.control_ = endIconBuilder_.build();
+        }
       }
-      result.bitField0_ |= to_bitField0_;
-    }
-
-    private void buildPartialOneofs(com.google.apps.card.v1.DecoratedText result) {
       result.controlCase_ = controlCase_;
-      result.control_ = this.control_;
-      if (controlCase_ == 8 && buttonBuilder_ != null) {
-        result.control_ = buttonBuilder_.build();
-      }
-      if (controlCase_ == 9 && switchControlBuilder_ != null) {
-        result.control_ = switchControlBuilder_.build();
-      }
-      if (controlCase_ == 11 && endIconBuilder_ != null) {
-        result.control_ = endIconBuilder_.build();
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -3255,7 +3154,6 @@ public Builder mergeFrom(com.google.apps.card.v1.DecoratedText other) {
       }
       if (!other.getTopLabel().isEmpty()) {
         topLabel_ = other.topLabel_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (other.hasTopLabelText()) {
@@ -3263,7 +3161,6 @@ public Builder mergeFrom(com.google.apps.card.v1.DecoratedText other) {
       }
       if (!other.getText().isEmpty()) {
         text_ = other.text_;
-        bitField0_ |= 0x00000020;
         onChanged();
       }
       if (other.hasContentText()) {
@@ -3274,7 +3171,6 @@ public Builder mergeFrom(com.google.apps.card.v1.DecoratedText other) {
       }
       if (!other.getBottomLabel().isEmpty()) {
         bottomLabel_ = other.bottomLabel_;
-        bitField0_ |= 0x00000100;
         onChanged();
       }
       if (other.hasBottomLabelText()) {
@@ -3333,37 +3229,37 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getIconFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 26:
               {
                 topLabel_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 26
             case 34:
               {
                 text_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 34
             case 40:
               {
                 wrapText_ = input.readBool();
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 40
             case 50:
               {
                 bottomLabel_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000100;
+
                 break;
               } // case 50
             case 58:
               {
                 input.readMessage(getOnClickFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000400;
+
                 break;
               } // case 58
             case 66:
@@ -3387,31 +3283,31 @@ public Builder mergeFrom(
             case 98:
               {
                 input.readMessage(getStartIconFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 98
             case 104:
               {
                 startIconVerticalAlignment_ = input.readEnum();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 104
             case 138:
               {
                 input.readMessage(getTopLabelTextFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 138
             case 146:
               {
                 input.readMessage(getContentTextFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 146
             case 154:
               {
                 input.readMessage(getBottomLabelTextFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000200;
+
                 break;
               } // case 154
             default:
@@ -3445,8 +3341,6 @@ public Builder clearControl() {
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.apps.card.v1.Icon icon_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.apps.card.v1.Icon,
@@ -3469,7 +3363,7 @@ public Builder clearControl() {
      */
     @java.lang.Deprecated
     public boolean hasIcon() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return iconBuilder_ != null || icon_ != null;
     }
 
     /**
@@ -3510,11 +3404,11 @@ public Builder setIcon(com.google.apps.card.v1.Icon value) {
           throw new NullPointerException();
         }
         icon_ = value;
+        onChanged();
       } else {
         iconBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -3531,11 +3425,11 @@ public Builder setIcon(com.google.apps.card.v1.Icon value) {
     public Builder setIcon(com.google.apps.card.v1.Icon.Builder builderForValue) {
       if (iconBuilder_ == null) {
         icon_ = builderForValue.build();
+        onChanged();
       } else {
         iconBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -3551,20 +3445,16 @@ public Builder setIcon(com.google.apps.card.v1.Icon.Builder builderForValue) {
     @java.lang.Deprecated
     public Builder mergeIcon(com.google.apps.card.v1.Icon value) {
       if (iconBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && icon_ != null
-            && icon_ != com.google.apps.card.v1.Icon.getDefaultInstance()) {
-          getIconBuilder().mergeFrom(value);
+        if (icon_ != null) {
+          icon_ = com.google.apps.card.v1.Icon.newBuilder(icon_).mergeFrom(value).buildPartial();
         } else {
           icon_ = value;
         }
+        onChanged();
       } else {
         iconBuilder_.mergeFrom(value);
       }
-      if (icon_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -3579,13 +3469,14 @@ public Builder mergeIcon(com.google.apps.card.v1.Icon value) {
      */
     @java.lang.Deprecated
     public Builder clearIcon() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      icon_ = null;
-      if (iconBuilder_ != null) {
-        iconBuilder_.dispose();
+      if (iconBuilder_ == null) {
+        icon_ = null;
+        onChanged();
+      } else {
+        icon_ = null;
         iconBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -3600,7 +3491,7 @@ public Builder clearIcon() {
      */
     @java.lang.Deprecated
     public com.google.apps.card.v1.Icon.Builder getIconBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getIconFieldBuilder().getBuilder();
     }
@@ -3668,7 +3559,7 @@ public com.google.apps.card.v1.IconOrBuilder getIconOrBuilder() {
      * @return Whether the startIcon field is set.
      */
     public boolean hasStartIcon() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return startIconBuilder_ != null || startIcon_ != null;
     }
 
     /**
@@ -3705,11 +3596,11 @@ public Builder setStartIcon(com.google.apps.card.v1.Icon value) {
           throw new NullPointerException();
         }
         startIcon_ = value;
+        onChanged();
       } else {
         startIconBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -3725,11 +3616,11 @@ public Builder setStartIcon(com.google.apps.card.v1.Icon value) {
     public Builder setStartIcon(com.google.apps.card.v1.Icon.Builder builderForValue) {
       if (startIconBuilder_ == null) {
         startIcon_ = builderForValue.build();
+        onChanged();
       } else {
         startIconBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -3744,20 +3635,17 @@ public Builder setStartIcon(com.google.apps.card.v1.Icon.Builder builderForValue
      */
     public Builder mergeStartIcon(com.google.apps.card.v1.Icon value) {
       if (startIconBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && startIcon_ != null
-            && startIcon_ != com.google.apps.card.v1.Icon.getDefaultInstance()) {
-          getStartIconBuilder().mergeFrom(value);
+        if (startIcon_ != null) {
+          startIcon_ =
+              com.google.apps.card.v1.Icon.newBuilder(startIcon_).mergeFrom(value).buildPartial();
         } else {
           startIcon_ = value;
         }
+        onChanged();
       } else {
         startIconBuilder_.mergeFrom(value);
       }
-      if (startIcon_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -3771,13 +3659,14 @@ public Builder mergeStartIcon(com.google.apps.card.v1.Icon value) {
      * .google.apps.card.v1.Icon start_icon = 12;
      */
     public Builder clearStartIcon() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      startIcon_ = null;
-      if (startIconBuilder_ != null) {
-        startIconBuilder_.dispose();
+      if (startIconBuilder_ == null) {
+        startIcon_ = null;
+        onChanged();
+      } else {
+        startIcon_ = null;
         startIconBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -3791,7 +3680,7 @@ public Builder clearStartIcon() {
      * .google.apps.card.v1.Icon start_icon = 12;
      */
     public com.google.apps.card.v1.Icon.Builder getStartIconBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getStartIconFieldBuilder().getBuilder();
     }
@@ -3847,7 +3736,6 @@ public com.google.apps.card.v1.IconOrBuilder getStartIconOrBuilder() {
      * 
      * Optional. Vertical alignment of the start icon. If not set, the icon
      * will be vertically centered.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -3867,7 +3755,6 @@ public int getStartIconVerticalAlignmentValue() {
      * 
      * Optional. Vertical alignment of the start icon. If not set, the icon
      * will be vertically centered.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -3878,8 +3765,8 @@ public int getStartIconVerticalAlignmentValue() {
      * @return This builder for chaining.
      */
     public Builder setStartIconVerticalAlignmentValue(int value) {
+
       startIconVerticalAlignment_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -3890,7 +3777,6 @@ public Builder setStartIconVerticalAlignmentValue(int value) {
      * 
      * Optional. Vertical alignment of the start icon. If not set, the icon
      * will be vertically centered.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -3901,8 +3787,9 @@ public Builder setStartIconVerticalAlignmentValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.Widget.VerticalAlignment getStartIconVerticalAlignment() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.Widget.VerticalAlignment result =
-          com.google.apps.card.v1.Widget.VerticalAlignment.forNumber(startIconVerticalAlignment_);
+          com.google.apps.card.v1.Widget.VerticalAlignment.valueOf(startIconVerticalAlignment_);
       return result == null
           ? com.google.apps.card.v1.Widget.VerticalAlignment.UNRECOGNIZED
           : result;
@@ -3914,7 +3801,6 @@ public com.google.apps.card.v1.Widget.VerticalAlignment getStartIconVerticalAlig
      * 
      * Optional. Vertical alignment of the start icon. If not set, the icon
      * will be vertically centered.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -3929,7 +3815,7 @@ public Builder setStartIconVerticalAlignment(
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000004;
+
       startIconVerticalAlignment_ = value.getNumber();
       onChanged();
       return this;
@@ -3941,7 +3827,6 @@ public Builder setStartIconVerticalAlignment(
      * 
      * Optional. Vertical alignment of the start icon. If not set, the icon
      * will be vertically centered.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -3951,7 +3836,7 @@ public Builder setStartIconVerticalAlignment(
      * @return This builder for chaining.
      */
     public Builder clearStartIconVerticalAlignment() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       startIconVerticalAlignment_ = 0;
       onChanged();
       return this;
@@ -4021,8 +3906,8 @@ public Builder setTopLabel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       topLabel_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -4039,8 +3924,8 @@ public Builder setTopLabel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTopLabel() {
+
       topLabel_ = getDefaultInstance().getTopLabel();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -4062,8 +3947,8 @@ public Builder setTopLabelBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       topLabel_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -4081,7 +3966,6 @@ public Builder setTopLabelBytes(com.google.protobuf.ByteString value) {
      * 
      * `TextParagraph` equivalent of `top_label`. Always truncates. Allows for
      * more complex formatting than `top_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4090,7 +3974,7 @@ public Builder setTopLabelBytes(com.google.protobuf.ByteString value) {
      * @return Whether the topLabelText field is set.
      */
     public boolean hasTopLabelText() {
-      return ((bitField0_ & 0x00000010) != 0);
+      return topLabelTextBuilder_ != null || topLabelText_ != null;
     }
 
     /**
@@ -4099,7 +3983,6 @@ public boolean hasTopLabelText() {
      * 
      * `TextParagraph` equivalent of `top_label`. Always truncates. Allows for
      * more complex formatting than `top_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4123,7 +4006,6 @@ public com.google.apps.card.v1.TextParagraph getTopLabelText() {
      * 
      * `TextParagraph` equivalent of `top_label`. Always truncates. Allows for
      * more complex formatting than `top_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4135,11 +4017,11 @@ public Builder setTopLabelText(com.google.apps.card.v1.TextParagraph value) {
           throw new NullPointerException();
         }
         topLabelText_ = value;
+        onChanged();
       } else {
         topLabelTextBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -4149,7 +4031,6 @@ public Builder setTopLabelText(com.google.apps.card.v1.TextParagraph value) {
      * 
      * `TextParagraph` equivalent of `top_label`. Always truncates. Allows for
      * more complex formatting than `top_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4158,11 +4039,11 @@ public Builder setTopLabelText(com.google.apps.card.v1.TextParagraph value) {
     public Builder setTopLabelText(com.google.apps.card.v1.TextParagraph.Builder builderForValue) {
       if (topLabelTextBuilder_ == null) {
         topLabelText_ = builderForValue.build();
+        onChanged();
       } else {
         topLabelTextBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -4172,7 +4053,6 @@ public Builder setTopLabelText(com.google.apps.card.v1.TextParagraph.Builder bui
      * 
      * `TextParagraph` equivalent of `top_label`. Always truncates. Allows for
      * more complex formatting than `top_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4180,20 +4060,19 @@ public Builder setTopLabelText(com.google.apps.card.v1.TextParagraph.Builder bui
      */
     public Builder mergeTopLabelText(com.google.apps.card.v1.TextParagraph value) {
       if (topLabelTextBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)
-            && topLabelText_ != null
-            && topLabelText_ != com.google.apps.card.v1.TextParagraph.getDefaultInstance()) {
-          getTopLabelTextBuilder().mergeFrom(value);
+        if (topLabelText_ != null) {
+          topLabelText_ =
+              com.google.apps.card.v1.TextParagraph.newBuilder(topLabelText_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           topLabelText_ = value;
         }
+        onChanged();
       } else {
         topLabelTextBuilder_.mergeFrom(value);
       }
-      if (topLabelText_ != null) {
-        bitField0_ |= 0x00000010;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -4203,20 +4082,20 @@ public Builder mergeTopLabelText(com.google.apps.card.v1.TextParagraph value) {
      * 
      * `TextParagraph` equivalent of `top_label`. Always truncates. Allows for
      * more complex formatting than `top_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
      * .google.apps.card.v1.TextParagraph top_label_text = 17;
      */
     public Builder clearTopLabelText() {
-      bitField0_ = (bitField0_ & ~0x00000010);
-      topLabelText_ = null;
-      if (topLabelTextBuilder_ != null) {
-        topLabelTextBuilder_.dispose();
+      if (topLabelTextBuilder_ == null) {
+        topLabelText_ = null;
+        onChanged();
+      } else {
+        topLabelText_ = null;
         topLabelTextBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -4226,14 +4105,13 @@ public Builder clearTopLabelText() {
      * 
      * `TextParagraph` equivalent of `top_label`. Always truncates. Allows for
      * more complex formatting than `top_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
      * .google.apps.card.v1.TextParagraph top_label_text = 17;
      */
     public com.google.apps.card.v1.TextParagraph.Builder getTopLabelTextBuilder() {
-      bitField0_ |= 0x00000010;
+
       onChanged();
       return getTopLabelTextFieldBuilder().getBuilder();
     }
@@ -4244,7 +4122,6 @@ public com.google.apps.card.v1.TextParagraph.Builder getTopLabelTextBuilder() {
      * 
      * `TextParagraph` equivalent of `top_label`. Always truncates. Allows for
      * more complex formatting than `top_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4266,7 +4143,6 @@ public com.google.apps.card.v1.TextParagraphOrBuilder getTopLabelTextOrBuilder()
      * 
      * `TextParagraph` equivalent of `top_label`. Always truncates. Allows for
      * more complex formatting than `top_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4296,7 +4172,6 @@ public com.google.apps.card.v1.TextParagraphOrBuilder getTopLabelTextOrBuilder()
      *
      * 
      * Required. The primary text.
-     *
      * Supports simple formatting. For more information
      * about formatting text, see
      * [Formatting text in Google Chat
@@ -4328,7 +4203,6 @@ public java.lang.String getText() {
      *
      * 
      * Required. The primary text.
-     *
      * Supports simple formatting. For more information
      * about formatting text, see
      * [Formatting text in Google Chat
@@ -4360,7 +4234,6 @@ public com.google.protobuf.ByteString getTextBytes() {
      *
      * 
      * Required. The primary text.
-     *
      * Supports simple formatting. For more information
      * about formatting text, see
      * [Formatting text in Google Chat
@@ -4380,8 +4253,8 @@ public Builder setText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       text_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -4391,7 +4264,6 @@ public Builder setText(java.lang.String value) {
      *
      * 
      * Required. The primary text.
-     *
      * Supports simple formatting. For more information
      * about formatting text, see
      * [Formatting text in Google Chat
@@ -4407,8 +4279,8 @@ public Builder setText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearText() {
+
       text_ = getDefaultInstance().getText();
-      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -4418,7 +4290,6 @@ public Builder clearText() {
      *
      * 
      * Required. The primary text.
-     *
      * Supports simple formatting. For more information
      * about formatting text, see
      * [Formatting text in Google Chat
@@ -4439,8 +4310,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       text_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -4458,7 +4329,6 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
      * 
      * `TextParagraph` equivalent of `text`. Allows for more complex formatting
      * than `text`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4467,7 +4337,7 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
      * @return Whether the contentText field is set.
      */
     public boolean hasContentText() {
-      return ((bitField0_ & 0x00000040) != 0);
+      return contentTextBuilder_ != null || contentText_ != null;
     }
 
     /**
@@ -4476,7 +4346,6 @@ public boolean hasContentText() {
      * 
      * `TextParagraph` equivalent of `text`. Allows for more complex formatting
      * than `text`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4500,7 +4369,6 @@ public com.google.apps.card.v1.TextParagraph getContentText() {
      * 
      * `TextParagraph` equivalent of `text`. Allows for more complex formatting
      * than `text`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4512,11 +4380,11 @@ public Builder setContentText(com.google.apps.card.v1.TextParagraph value) {
           throw new NullPointerException();
         }
         contentText_ = value;
+        onChanged();
       } else {
         contentTextBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -4526,7 +4394,6 @@ public Builder setContentText(com.google.apps.card.v1.TextParagraph value) {
      * 
      * `TextParagraph` equivalent of `text`. Allows for more complex formatting
      * than `text`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4535,11 +4402,11 @@ public Builder setContentText(com.google.apps.card.v1.TextParagraph value) {
     public Builder setContentText(com.google.apps.card.v1.TextParagraph.Builder builderForValue) {
       if (contentTextBuilder_ == null) {
         contentText_ = builderForValue.build();
+        onChanged();
       } else {
         contentTextBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -4549,7 +4416,6 @@ public Builder setContentText(com.google.apps.card.v1.TextParagraph.Builder buil
      * 
      * `TextParagraph` equivalent of `text`. Allows for more complex formatting
      * than `text`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4557,20 +4423,19 @@ public Builder setContentText(com.google.apps.card.v1.TextParagraph.Builder buil
      */
     public Builder mergeContentText(com.google.apps.card.v1.TextParagraph value) {
       if (contentTextBuilder_ == null) {
-        if (((bitField0_ & 0x00000040) != 0)
-            && contentText_ != null
-            && contentText_ != com.google.apps.card.v1.TextParagraph.getDefaultInstance()) {
-          getContentTextBuilder().mergeFrom(value);
+        if (contentText_ != null) {
+          contentText_ =
+              com.google.apps.card.v1.TextParagraph.newBuilder(contentText_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           contentText_ = value;
         }
+        onChanged();
       } else {
         contentTextBuilder_.mergeFrom(value);
       }
-      if (contentText_ != null) {
-        bitField0_ |= 0x00000040;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -4580,20 +4445,20 @@ public Builder mergeContentText(com.google.apps.card.v1.TextParagraph value) {
      * 
      * `TextParagraph` equivalent of `text`. Allows for more complex formatting
      * than `text`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
      * .google.apps.card.v1.TextParagraph content_text = 18;
      */
     public Builder clearContentText() {
-      bitField0_ = (bitField0_ & ~0x00000040);
-      contentText_ = null;
-      if (contentTextBuilder_ != null) {
-        contentTextBuilder_.dispose();
+      if (contentTextBuilder_ == null) {
+        contentText_ = null;
+        onChanged();
+      } else {
+        contentText_ = null;
         contentTextBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -4603,14 +4468,13 @@ public Builder clearContentText() {
      * 
      * `TextParagraph` equivalent of `text`. Allows for more complex formatting
      * than `text`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
      * .google.apps.card.v1.TextParagraph content_text = 18;
      */
     public com.google.apps.card.v1.TextParagraph.Builder getContentTextBuilder() {
-      bitField0_ |= 0x00000040;
+
       onChanged();
       return getContentTextFieldBuilder().getBuilder();
     }
@@ -4621,7 +4485,6 @@ public com.google.apps.card.v1.TextParagraph.Builder getContentTextBuilder() {
      * 
      * `TextParagraph` equivalent of `text`. Allows for more complex formatting
      * than `text`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4643,7 +4506,6 @@ public com.google.apps.card.v1.TextParagraphOrBuilder getContentTextOrBuilder()
      * 
      * `TextParagraph` equivalent of `text`. Allows for more complex formatting
      * than `text`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4674,7 +4536,6 @@ public com.google.apps.card.v1.TextParagraphOrBuilder getContentTextOrBuilder()
      * 
      * The wrap text setting. If `true`, the text wraps and displays on
      * multiple lines. Otherwise, the text is truncated.
-     *
      * Only applies to `text`, not `topLabel` and `bottomLabel`.
      * 

      *
@@ -4693,7 +4554,6 @@ public boolean getWrapText() {
      * 
      * The wrap text setting. If `true`, the text wraps and displays on
      * multiple lines. Otherwise, the text is truncated.
-     *
      * Only applies to `text`, not `topLabel` and `bottomLabel`.
      * 

      *
@@ -4705,7 +4565,6 @@ public boolean getWrapText() {
     public Builder setWrapText(boolean value) {
 
       wrapText_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -4716,7 +4575,6 @@ public Builder setWrapText(boolean value) {
      * 
      * The wrap text setting. If `true`, the text wraps and displays on
      * multiple lines. Otherwise, the text is truncated.
-     *
      * Only applies to `text`, not `topLabel` and `bottomLabel`.
      * 

      *
@@ -4725,7 +4583,7 @@ public Builder setWrapText(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearWrapText() {
-      bitField0_ = (bitField0_ & ~0x00000080);
+
       wrapText_ = false;
       onChanged();
       return this;
@@ -4795,8 +4653,8 @@ public Builder setBottomLabel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       bottomLabel_ = value;
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -4813,8 +4671,8 @@ public Builder setBottomLabel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearBottomLabel() {
+
       bottomLabel_ = getDefaultInstance().getBottomLabel();
-      bitField0_ = (bitField0_ & ~0x00000100);
       onChanged();
       return this;
     }
@@ -4836,8 +4694,8 @@ public Builder setBottomLabelBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       bottomLabel_ = value;
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -4855,7 +4713,6 @@ public Builder setBottomLabelBytes(com.google.protobuf.ByteString value) {
      * 
      * `TextParagraph` equivalent of `bottom_label`. Always wraps. Allows for
      * more complex formatting than `bottom_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4864,7 +4721,7 @@ public Builder setBottomLabelBytes(com.google.protobuf.ByteString value) {
      * @return Whether the bottomLabelText field is set.
      */
     public boolean hasBottomLabelText() {
-      return ((bitField0_ & 0x00000200) != 0);
+      return bottomLabelTextBuilder_ != null || bottomLabelText_ != null;
     }
 
     /**
@@ -4873,7 +4730,6 @@ public boolean hasBottomLabelText() {
      * 
      * `TextParagraph` equivalent of `bottom_label`. Always wraps. Allows for
      * more complex formatting than `bottom_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4897,7 +4753,6 @@ public com.google.apps.card.v1.TextParagraph getBottomLabelText() {
      * 
      * `TextParagraph` equivalent of `bottom_label`. Always wraps. Allows for
      * more complex formatting than `bottom_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4909,11 +4764,11 @@ public Builder setBottomLabelText(com.google.apps.card.v1.TextParagraph value) {
           throw new NullPointerException();
         }
         bottomLabelText_ = value;
+        onChanged();
       } else {
         bottomLabelTextBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000200;
-      onChanged();
+
       return this;
     }
 
@@ -4923,7 +4778,6 @@ public Builder setBottomLabelText(com.google.apps.card.v1.TextParagraph value) {
      * 
      * `TextParagraph` equivalent of `bottom_label`. Always wraps. Allows for
      * more complex formatting than `bottom_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4933,11 +4787,11 @@ public Builder setBottomLabelText(
         com.google.apps.card.v1.TextParagraph.Builder builderForValue) {
       if (bottomLabelTextBuilder_ == null) {
         bottomLabelText_ = builderForValue.build();
+        onChanged();
       } else {
         bottomLabelTextBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000200;
-      onChanged();
+
       return this;
     }
 
@@ -4947,7 +4801,6 @@ public Builder setBottomLabelText(
      * 
      * `TextParagraph` equivalent of `bottom_label`. Always wraps. Allows for
      * more complex formatting than `bottom_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -4955,20 +4808,19 @@ public Builder setBottomLabelText(
      */
     public Builder mergeBottomLabelText(com.google.apps.card.v1.TextParagraph value) {
       if (bottomLabelTextBuilder_ == null) {
-        if (((bitField0_ & 0x00000200) != 0)
-            && bottomLabelText_ != null
-            && bottomLabelText_ != com.google.apps.card.v1.TextParagraph.getDefaultInstance()) {
-          getBottomLabelTextBuilder().mergeFrom(value);
+        if (bottomLabelText_ != null) {
+          bottomLabelText_ =
+              com.google.apps.card.v1.TextParagraph.newBuilder(bottomLabelText_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           bottomLabelText_ = value;
         }
+        onChanged();
       } else {
         bottomLabelTextBuilder_.mergeFrom(value);
       }
-      if (bottomLabelText_ != null) {
-        bitField0_ |= 0x00000200;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -4978,20 +4830,20 @@ public Builder mergeBottomLabelText(com.google.apps.card.v1.TextParagraph value)
      * 
      * `TextParagraph` equivalent of `bottom_label`. Always wraps. Allows for
      * more complex formatting than `bottom_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
      * .google.apps.card.v1.TextParagraph bottom_label_text = 19;
      */
     public Builder clearBottomLabelText() {
-      bitField0_ = (bitField0_ & ~0x00000200);
-      bottomLabelText_ = null;
-      if (bottomLabelTextBuilder_ != null) {
-        bottomLabelTextBuilder_.dispose();
+      if (bottomLabelTextBuilder_ == null) {
+        bottomLabelText_ = null;
+        onChanged();
+      } else {
+        bottomLabelText_ = null;
         bottomLabelTextBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -5001,14 +4853,13 @@ public Builder clearBottomLabelText() {
      * 
      * `TextParagraph` equivalent of `bottom_label`. Always wraps. Allows for
      * more complex formatting than `bottom_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
      * .google.apps.card.v1.TextParagraph bottom_label_text = 19;
      */
     public com.google.apps.card.v1.TextParagraph.Builder getBottomLabelTextBuilder() {
-      bitField0_ |= 0x00000200;
+
       onChanged();
       return getBottomLabelTextFieldBuilder().getBuilder();
     }
@@ -5019,7 +4870,6 @@ public com.google.apps.card.v1.TextParagraph.Builder getBottomLabelTextBuilder()
      * 
      * `TextParagraph` equivalent of `bottom_label`. Always wraps. Allows for
      * more complex formatting than `bottom_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -5041,7 +4891,6 @@ public com.google.apps.card.v1.TextParagraphOrBuilder getBottomLabelTextOrBuilde
      * 
      * `TextParagraph` equivalent of `bottom_label`. Always wraps. Allows for
      * more complex formatting than `bottom_label`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -5083,7 +4932,7 @@ public com.google.apps.card.v1.TextParagraphOrBuilder getBottomLabelTextOrBuilde
      * @return Whether the onClick field is set.
      */
     public boolean hasOnClick() {
-      return ((bitField0_ & 0x00000400) != 0);
+      return onClickBuilder_ != null || onClick_ != null;
     }
 
     /**
@@ -5120,11 +4969,11 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick value) {
           throw new NullPointerException();
         }
         onClick_ = value;
+        onChanged();
       } else {
         onClickBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000400;
-      onChanged();
+
       return this;
     }
 
@@ -5140,11 +4989,11 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick value) {
     public Builder setOnClick(com.google.apps.card.v1.OnClick.Builder builderForValue) {
       if (onClickBuilder_ == null) {
         onClick_ = builderForValue.build();
+        onChanged();
       } else {
         onClickBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000400;
-      onChanged();
+
       return this;
     }
 
@@ -5159,20 +5008,17 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick.Builder builderForValu
      */
     public Builder mergeOnClick(com.google.apps.card.v1.OnClick value) {
       if (onClickBuilder_ == null) {
-        if (((bitField0_ & 0x00000400) != 0)
-            && onClick_ != null
-            && onClick_ != com.google.apps.card.v1.OnClick.getDefaultInstance()) {
-          getOnClickBuilder().mergeFrom(value);
+        if (onClick_ != null) {
+          onClick_ =
+              com.google.apps.card.v1.OnClick.newBuilder(onClick_).mergeFrom(value).buildPartial();
         } else {
           onClick_ = value;
         }
+        onChanged();
       } else {
         onClickBuilder_.mergeFrom(value);
       }
-      if (onClick_ != null) {
-        bitField0_ |= 0x00000400;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -5186,13 +5032,14 @@ public Builder mergeOnClick(com.google.apps.card.v1.OnClick value) {
      * .google.apps.card.v1.OnClick on_click = 7;
      */
     public Builder clearOnClick() {
-      bitField0_ = (bitField0_ & ~0x00000400);
-      onClick_ = null;
-      if (onClickBuilder_ != null) {
-        onClickBuilder_.dispose();
+      if (onClickBuilder_ == null) {
+        onClick_ = null;
+        onChanged();
+      } else {
+        onClick_ = null;
         onClickBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -5206,7 +5053,7 @@ public Builder clearOnClick() {
      * .google.apps.card.v1.OnClick on_click = 7;
      */
     public com.google.apps.card.v1.OnClick.Builder getOnClickBuilder() {
-      bitField0_ |= 0x00000400;
+
       onChanged();
       return getOnClickFieldBuilder().getBuilder();
     }
@@ -5464,6 +5311,7 @@ public com.google.apps.card.v1.ButtonOrBuilder getButtonOrBuilder() {
       }
       controlCase_ = 8;
       onChanged();
+      ;
       return buttonBuilder_;
     }
 
@@ -5693,6 +5541,7 @@ public com.google.apps.card.v1.DecoratedText.SwitchControl.Builder getSwitchCont
       }
       controlCase_ = 9;
       onChanged();
+      ;
       return switchControlBuilder_;
     }
 
@@ -5707,7 +5556,6 @@ public com.google.apps.card.v1.DecoratedText.SwitchControl.Builder getSwitchCont
      *
      * 
      * An icon displayed after the text.
-     *
      * Supports
      * [built-in](https://developers.google.com/workspace/chat/format-messages#builtinicons)
      * and
@@ -5729,7 +5577,6 @@ public boolean hasEndIcon() {
      *
      * 
      * An icon displayed after the text.
-     *
      * Supports
      * [built-in](https://developers.google.com/workspace/chat/format-messages#builtinicons)
      * and
@@ -5761,7 +5608,6 @@ public com.google.apps.card.v1.Icon getEndIcon() {
      *
      * 
      * An icon displayed after the text.
-     *
      * Supports
      * [built-in](https://developers.google.com/workspace/chat/format-messages#builtinicons)
      * and
@@ -5790,7 +5636,6 @@ public Builder setEndIcon(com.google.apps.card.v1.Icon value) {
      *
      * 
      * An icon displayed after the text.
-     *
      * Supports
      * [built-in](https://developers.google.com/workspace/chat/format-messages#builtinicons)
      * and
@@ -5816,7 +5661,6 @@ public Builder setEndIcon(com.google.apps.card.v1.Icon.Builder builderForValue)
      *
      * 
      * An icon displayed after the text.
-     *
      * Supports
      * [built-in](https://developers.google.com/workspace/chat/format-messages#builtinicons)
      * and
@@ -5853,7 +5697,6 @@ public Builder mergeEndIcon(com.google.apps.card.v1.Icon value) {
      *
      * 
      * An icon displayed after the text.
-     *
      * Supports
      * [built-in](https://developers.google.com/workspace/chat/format-messages#builtinicons)
      * and
@@ -5885,7 +5728,6 @@ public Builder clearEndIcon() {
      *
      * 
      * An icon displayed after the text.
-     *
      * Supports
      * [built-in](https://developers.google.com/workspace/chat/format-messages#builtinicons)
      * and
@@ -5904,7 +5746,6 @@ public com.google.apps.card.v1.Icon.Builder getEndIconBuilder() {
      *
      * 
      * An icon displayed after the text.
-     *
      * Supports
      * [built-in](https://developers.google.com/workspace/chat/format-messages#builtinicons)
      * and
@@ -5931,7 +5772,6 @@ public com.google.apps.card.v1.IconOrBuilder getEndIconOrBuilder() {
      *
      * 
      * An icon displayed after the text.
-     *
      * Supports
      * [built-in](https://developers.google.com/workspace/chat/format-messages#builtinicons)
      * and
@@ -5960,6 +5800,7 @@ public com.google.apps.card.v1.IconOrBuilder getEndIconOrBuilder() {
       }
       controlCase_ = 11;
       onChanged();
+      ;
       return endIconBuilder_;
     }
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DecoratedTextOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DecoratedTextOrBuilder.java
index b8b384859a..a6e9610a80 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DecoratedTextOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DecoratedTextOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface DecoratedTextOrBuilder
@@ -111,7 +110,6 @@ public interface DecoratedTextOrBuilder
    * 
    * Optional. Vertical alignment of the start icon. If not set, the icon
    * will be vertically centered.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -127,7 +125,6 @@ public interface DecoratedTextOrBuilder
    * 
    * Optional. Vertical alignment of the start icon. If not set, the icon
    * will be vertically centered.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -169,7 +166,6 @@ public interface DecoratedTextOrBuilder
    * 
    * `TextParagraph` equivalent of `top_label`. Always truncates. Allows for
    * more complex formatting than `top_label`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -185,7 +181,6 @@ public interface DecoratedTextOrBuilder
    * 
    * `TextParagraph` equivalent of `top_label`. Always truncates. Allows for
    * more complex formatting than `top_label`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -201,7 +196,6 @@ public interface DecoratedTextOrBuilder
    * 
    * `TextParagraph` equivalent of `top_label`. Always truncates. Allows for
    * more complex formatting than `top_label`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -214,7 +208,6 @@ public interface DecoratedTextOrBuilder
    *
    * 
    * Required. The primary text.
-   *
    * Supports simple formatting. For more information
    * about formatting text, see
    * [Formatting text in Google Chat
@@ -236,7 +229,6 @@ public interface DecoratedTextOrBuilder
    *
    * 
    * Required. The primary text.
-   *
    * Supports simple formatting. For more information
    * about formatting text, see
    * [Formatting text in Google Chat
@@ -259,7 +251,6 @@ public interface DecoratedTextOrBuilder
    * 
    * `TextParagraph` equivalent of `text`. Allows for more complex formatting
    * than `text`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -275,7 +266,6 @@ public interface DecoratedTextOrBuilder
    * 
    * `TextParagraph` equivalent of `text`. Allows for more complex formatting
    * than `text`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -291,7 +281,6 @@ public interface DecoratedTextOrBuilder
    * 
    * `TextParagraph` equivalent of `text`. Allows for more complex formatting
    * than `text`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -305,7 +294,6 @@ public interface DecoratedTextOrBuilder
    * 
    * The wrap text setting. If `true`, the text wraps and displays on
    * multiple lines. Otherwise, the text is truncated.
-   *
    * Only applies to `text`, not `topLabel` and `bottomLabel`.
    * 

    *
@@ -347,7 +335,6 @@ public interface DecoratedTextOrBuilder
    * 
    * `TextParagraph` equivalent of `bottom_label`. Always wraps. Allows for
    * more complex formatting than `bottom_label`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -363,7 +350,6 @@ public interface DecoratedTextOrBuilder
    * 
    * `TextParagraph` equivalent of `bottom_label`. Always wraps. Allows for
    * more complex formatting than `bottom_label`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -379,7 +365,6 @@ public interface DecoratedTextOrBuilder
    * 
    * `TextParagraph` equivalent of `bottom_label`. Always wraps. Allows for
    * more complex formatting than `bottom_label`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -506,7 +491,6 @@ public interface DecoratedTextOrBuilder
    *
    * 
    * An icon displayed after the text.
-   *
    * Supports
    * [built-in](https://developers.google.com/workspace/chat/format-messages#builtinicons)
    * and
@@ -525,7 +509,6 @@ public interface DecoratedTextOrBuilder
    *
    * 
    * An icon displayed after the text.
-   *
    * Supports
    * [built-in](https://developers.google.com/workspace/chat/format-messages#builtinicons)
    * and
@@ -544,7 +527,6 @@ public interface DecoratedTextOrBuilder
    *
    * 
    * An icon displayed after the text.
-   *
    * Supports
    * [built-in](https://developers.google.com/workspace/chat/format-messages#builtinicons)
    * and
@@ -556,5 +538,5 @@ public interface DecoratedTextOrBuilder
    */
   com.google.apps.card.v1.IconOrBuilder getEndIconOrBuilder();
 
-  com.google.apps.card.v1.DecoratedText.ControlCase getControlCase();
+  public com.google.apps.card.v1.DecoratedText.ControlCase getControlCase();
 }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Divider.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Divider.java
index 29a0061e03..d1954de7aa 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Divider.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Divider.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -27,12 +26,9 @@
  * Google Chat apps, see
  * [Add a horizontal divider between
  * widgets](https://developers.google.com/workspace/chat/format-structure-card-dialog#add_a_horizontal_divider_between_widgets).
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
- *
  * For example, the following JSON creates a divider:
- *
  * ```
  * "divider": {}
  * ```
@@ -59,6 +55,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Divider();
   }
 
+  @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.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Divider_descriptor;
   }
@@ -229,12 +230,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * Google Chat apps, see
    * [Add a horizontal divider between
    * widgets](https://developers.google.com/workspace/chat/format-structure-card-dialog#add_a_horizontal_divider_between_widgets).
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
-   *
    * For example, the following JSON creates a divider:
-   *
    * ```
    * "divider": {}
    * ```
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DividerOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DividerOrBuilder.java
index f2ed166f5d..1f030997dd 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DividerOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DividerOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface DividerOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Grid.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Grid.java
index 036de6de1b..c31ed36a98 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Grid.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Grid.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -28,18 +27,14 @@
  * [`Columns`][google.apps.card.v1.Columns]. For an example in Google Chat apps,
  * see [Display a Grid with a collection of
  * items](https://developers.google.com/workspace/chat/format-structure-card-dialog#display_a_grid_with_a_collection_of_items).
- *
  * A grid supports any number of columns and items. The number of rows is
  * determined by items divided by columns. A grid with
  * 10 items and 2 columns has 5 rows. A grid with 11 items and 2 columns
  * has 6 rows.
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
- *
  * For example, the following JSON creates a 2 column grid with a single
  * item:
- *
  * ```
  * "grid": {
  *   "title": "A fine collection of items",
@@ -96,6 +91,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Grid();
   }
 
+  @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.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Grid_descriptor;
   }
@@ -264,7 +264,6 @@ public interface GridItemOrBuilder
    * 
    * Represents an item in a grid layout. Items can contain text, an image, or
    * both text and an image.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -295,6 +294,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new GridItem();
     }
 
+    @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.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Grid_GridItem_descriptor;
@@ -315,7 +319,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      *
      * 
      * Represents the various layout options available for a grid item.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -474,11 +477,8 @@ private GridItemLayout(int value) {
       // @@protoc_insertion_point(enum_scope:google.apps.card.v1.Grid.GridItem.GridItemLayout)
     }
 
-    private int bitField0_;
     public static final int ID_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object id_ = "";
+    private volatile java.lang.Object id_;
 
     /**
      *
@@ -546,7 +546,7 @@ public com.google.protobuf.ByteString getIdBytes() {
      */
     @java.lang.Override
     public boolean hasImage() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return image_ != null;
     }
 
     /**
@@ -576,13 +576,11 @@ public com.google.apps.card.v1.ImageComponent getImage() {
      */
     @java.lang.Override
     public com.google.apps.card.v1.ImageComponentOrBuilder getImageOrBuilder() {
-      return image_ == null ? com.google.apps.card.v1.ImageComponent.getDefaultInstance() : image_;
+      return getImage();
     }
 
     public static final int TITLE_FIELD_NUMBER = 3;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object title_ = "";
+    private volatile java.lang.Object title_;
 
     /**
      *
@@ -633,9 +631,7 @@ public com.google.protobuf.ByteString getTitleBytes() {
     }
 
     public static final int SUBTITLE_FIELD_NUMBER = 4;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object subtitle_ = "";
+    private volatile java.lang.Object subtitle_;
 
     /**
      *
@@ -686,7 +682,7 @@ public com.google.protobuf.ByteString getSubtitleBytes() {
     }
 
     public static final int LAYOUT_FIELD_NUMBER = 9;
-    private int layout_ = 0;
+    private int layout_;
 
     /**
      *
@@ -717,8 +713,9 @@ public int getLayoutValue() {
      */
     @java.lang.Override
     public com.google.apps.card.v1.Grid.GridItem.GridItemLayout getLayout() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.Grid.GridItem.GridItemLayout result =
-          com.google.apps.card.v1.Grid.GridItem.GridItemLayout.forNumber(layout_);
+          com.google.apps.card.v1.Grid.GridItem.GridItemLayout.valueOf(layout_);
       return result == null
           ? com.google.apps.card.v1.Grid.GridItem.GridItemLayout.UNRECOGNIZED
           : result;
@@ -741,7 +738,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, id_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (image_ != null) {
         output.writeMessage(2, getImage());
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(title_)) {
@@ -767,7 +764,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, id_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (image_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getImage());
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(title_)) {
@@ -935,7 +932,6 @@ protected Builder newBuilderForType(
      * 
      * Represents an item in a grid layout. Items can contain text, an image, or
      * both text and an image.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -963,34 +959,29 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.Grid.GridItem.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getImageFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         id_ = "";
-        image_ = null;
-        if (imageBuilder_ != null) {
-          imageBuilder_.dispose();
+
+        if (imageBuilder_ == null) {
+          image_ = null;
+        } else {
+          image_ = null;
           imageBuilder_ = null;
         }
         title_ = "";
+
         subtitle_ = "";
+
         layout_ = 0;
+
         return this;
       }
 
@@ -1018,35 +1009,19 @@ public com.google.apps.card.v1.Grid.GridItem build() {
       public com.google.apps.card.v1.Grid.GridItem buildPartial() {
         com.google.apps.card.v1.Grid.GridItem result =
             new com.google.apps.card.v1.Grid.GridItem(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        result.id_ = id_;
+        if (imageBuilder_ == null) {
+          result.image_ = image_;
+        } else {
+          result.image_ = imageBuilder_.build();
         }
+        result.title_ = title_;
+        result.subtitle_ = subtitle_;
+        result.layout_ = layout_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.apps.card.v1.Grid.GridItem result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.id_ = id_;
-        }
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.image_ = imageBuilder_ == null ? image_ : imageBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.title_ = title_;
-        }
-        if (((from_bitField0_ & 0x00000008) != 0)) {
-          result.subtitle_ = subtitle_;
-        }
-        if (((from_bitField0_ & 0x00000010) != 0)) {
-          result.layout_ = layout_;
-        }
-        result.bitField0_ |= to_bitField0_;
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1096,7 +1071,6 @@ public Builder mergeFrom(com.google.apps.card.v1.Grid.GridItem other) {
         if (other == com.google.apps.card.v1.Grid.GridItem.getDefaultInstance()) return this;
         if (!other.getId().isEmpty()) {
           id_ = other.id_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasImage()) {
@@ -1104,12 +1078,10 @@ public Builder mergeFrom(com.google.apps.card.v1.Grid.GridItem other) {
         }
         if (!other.getTitle().isEmpty()) {
           title_ = other.title_;
-          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (!other.getSubtitle().isEmpty()) {
           subtitle_ = other.subtitle_;
-          bitField0_ |= 0x00000008;
           onChanged();
         }
         if (other.layout_ != 0) {
@@ -1144,31 +1116,31 @@ public Builder mergeFrom(
               case 10:
                 {
                   id_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   input.readMessage(getImageFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               case 26:
                 {
                   title_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 26
               case 34:
                 {
                   subtitle_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000008;
+
                   break;
                 } // case 34
               case 72:
                 {
                   layout_ = input.readEnum();
-                  bitField0_ |= 0x00000010;
+
                   break;
                 } // case 72
               default:
@@ -1188,8 +1160,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private java.lang.Object id_ = "";
 
       /**
@@ -1257,8 +1227,8 @@ public Builder setId(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         id_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1276,8 +1246,8 @@ public Builder setId(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearId() {
+
         id_ = getDefaultInstance().getId();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1300,8 +1270,8 @@ public Builder setIdBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         id_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1325,7 +1295,7 @@ public Builder setIdBytes(com.google.protobuf.ByteString value) {
        * @return Whether the image field is set.
        */
       public boolean hasImage() {
-        return ((bitField0_ & 0x00000002) != 0);
+        return imageBuilder_ != null || image_ != null;
       }
 
       /**
@@ -1364,11 +1334,11 @@ public Builder setImage(com.google.apps.card.v1.ImageComponent value) {
             throw new NullPointerException();
           }
           image_ = value;
+          onChanged();
         } else {
           imageBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -1384,11 +1354,11 @@ public Builder setImage(com.google.apps.card.v1.ImageComponent value) {
       public Builder setImage(com.google.apps.card.v1.ImageComponent.Builder builderForValue) {
         if (imageBuilder_ == null) {
           image_ = builderForValue.build();
+          onChanged();
         } else {
           imageBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -1403,20 +1373,19 @@ public Builder setImage(com.google.apps.card.v1.ImageComponent.Builder builderFo
        */
       public Builder mergeImage(com.google.apps.card.v1.ImageComponent value) {
         if (imageBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)
-              && image_ != null
-              && image_ != com.google.apps.card.v1.ImageComponent.getDefaultInstance()) {
-            getImageBuilder().mergeFrom(value);
+          if (image_ != null) {
+            image_ =
+                com.google.apps.card.v1.ImageComponent.newBuilder(image_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             image_ = value;
           }
+          onChanged();
         } else {
           imageBuilder_.mergeFrom(value);
         }
-        if (image_ != null) {
-          bitField0_ |= 0x00000002;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -1430,13 +1399,14 @@ public Builder mergeImage(com.google.apps.card.v1.ImageComponent value) {
        * .google.apps.card.v1.ImageComponent image = 2;
        */
       public Builder clearImage() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        image_ = null;
-        if (imageBuilder_ != null) {
-          imageBuilder_.dispose();
+        if (imageBuilder_ == null) {
+          image_ = null;
+          onChanged();
+        } else {
+          image_ = null;
           imageBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1450,7 +1420,7 @@ public Builder clearImage() {
        * .google.apps.card.v1.ImageComponent image = 2;
        */
       public com.google.apps.card.v1.ImageComponent.Builder getImageBuilder() {
-        bitField0_ |= 0x00000002;
+
         onChanged();
         return getImageFieldBuilder().getBuilder();
       }
@@ -1564,8 +1534,8 @@ public Builder setTitle(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         title_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1582,8 +1552,8 @@ public Builder setTitle(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearTitle() {
+
         title_ = getDefaultInstance().getTitle();
-        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -1605,8 +1575,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         title_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1675,8 +1645,8 @@ public Builder setSubtitle(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         subtitle_ = value;
-        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1693,8 +1663,8 @@ public Builder setSubtitle(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearSubtitle() {
+
         subtitle_ = getDefaultInstance().getSubtitle();
-        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -1716,8 +1686,8 @@ public Builder setSubtitleBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         subtitle_ = value;
-        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1753,8 +1723,8 @@ public int getLayoutValue() {
        * @return This builder for chaining.
        */
       public Builder setLayoutValue(int value) {
+
         layout_ = value;
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1772,8 +1742,9 @@ public Builder setLayoutValue(int value) {
        */
       @java.lang.Override
       public com.google.apps.card.v1.Grid.GridItem.GridItemLayout getLayout() {
+        @SuppressWarnings("deprecation")
         com.google.apps.card.v1.Grid.GridItem.GridItemLayout result =
-            com.google.apps.card.v1.Grid.GridItem.GridItemLayout.forNumber(layout_);
+            com.google.apps.card.v1.Grid.GridItem.GridItemLayout.valueOf(layout_);
         return result == null
             ? com.google.apps.card.v1.Grid.GridItem.GridItemLayout.UNRECOGNIZED
             : result;
@@ -1795,7 +1766,7 @@ public Builder setLayout(com.google.apps.card.v1.Grid.GridItem.GridItemLayout va
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000010;
+
         layout_ = value.getNumber();
         onChanged();
         return this;
@@ -1813,7 +1784,7 @@ public Builder setLayout(com.google.apps.card.v1.Grid.GridItem.GridItemLayout va
        * @return This builder for chaining.
        */
       public Builder clearLayout() {
-        bitField0_ = (bitField0_ & ~0x00000010);
+
         layout_ = 0;
         onChanged();
         return this;
@@ -1883,11 +1854,8 @@ public com.google.apps.card.v1.Grid.GridItem getDefaultInstanceForType() {
     }
   }
 
-  private int bitField0_;
   public static final int TITLE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object title_ = "";
+  private volatile java.lang.Object title_;
 
   /**
    *
@@ -1938,8 +1906,6 @@ public com.google.protobuf.ByteString getTitleBytes() {
   }
 
   public static final int ITEMS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List items_;
 
   /**
@@ -2029,7 +1995,7 @@ public com.google.apps.card.v1.Grid.GridItemOrBuilder getItemsOrBuilder(int inde
    */
   @java.lang.Override
   public boolean hasBorderStyle() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return borderStyle_ != null;
   }
 
   /**
@@ -2061,13 +2027,11 @@ public com.google.apps.card.v1.BorderStyle getBorderStyle() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.BorderStyleOrBuilder getBorderStyleOrBuilder() {
-    return borderStyle_ == null
-        ? com.google.apps.card.v1.BorderStyle.getDefaultInstance()
-        : borderStyle_;
+    return getBorderStyle();
   }
 
   public static final int COLUMN_COUNT_FIELD_NUMBER = 4;
-  private int columnCount_ = 0;
+  private int columnCount_;
 
   /**
    *
@@ -2105,7 +2069,7 @@ public int getColumnCount() {
    */
   @java.lang.Override
   public boolean hasOnClick() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return onClick_ != null;
   }
 
   /**
@@ -2139,7 +2103,7 @@ public com.google.apps.card.v1.OnClick getOnClick() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.OnClickOrBuilder getOnClickOrBuilder() {
-    return onClick_ == null ? com.google.apps.card.v1.OnClick.getDefaultInstance() : onClick_;
+    return getOnClick();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -2162,13 +2126,13 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < items_.size(); i++) {
       output.writeMessage(2, items_.get(i));
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (borderStyle_ != null) {
       output.writeMessage(3, getBorderStyle());
     }
     if (columnCount_ != 0) {
       output.writeInt32(4, columnCount_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (onClick_ != null) {
       output.writeMessage(5, getOnClick());
     }
     getUnknownFields().writeTo(output);
@@ -2186,13 +2150,13 @@ public int getSerializedSize() {
     for (int i = 0; i < items_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, items_.get(i));
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (borderStyle_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getBorderStyle());
     }
     if (columnCount_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(4, columnCount_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (onClick_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getOnClick());
     }
     size += getUnknownFields().getSerializedSize();
@@ -2357,18 +2321,14 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * [`Columns`][google.apps.card.v1.Columns]. For an example in Google Chat apps,
    * see [Display a Grid with a collection of
    * items](https://developers.google.com/workspace/chat/format-structure-card-dialog#display_a_grid_with_a_collection_of_items).
-   *
    * A grid supports any number of columns and items. The number of rows is
    * determined by items divided by columns. A grid with
    * 10 items and 2 columns has 5 rows. A grid with 11 items and 2 columns
    * has 6 rows.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
-   *
    * For example, the following JSON creates a 2 column grid with a single
    * item:
-   *
    * ```
    * "grid": {
    *   "title": "A fine collection of items",
@@ -2421,44 +2381,36 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Grid.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getItemsFieldBuilder();
-        getBorderStyleFieldBuilder();
-        getOnClickFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       title_ = "";
+
       if (itemsBuilder_ == null) {
         items_ = java.util.Collections.emptyList();
       } else {
         items_ = null;
         itemsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
-      borderStyle_ = null;
-      if (borderStyleBuilder_ != null) {
-        borderStyleBuilder_.dispose();
+      bitField0_ = (bitField0_ & ~0x00000001);
+      if (borderStyleBuilder_ == null) {
+        borderStyle_ = null;
+      } else {
+        borderStyle_ = null;
         borderStyleBuilder_ = null;
       }
       columnCount_ = 0;
-      onClick_ = null;
-      if (onClickBuilder_ != null) {
-        onClickBuilder_.dispose();
+
+      if (onClickBuilder_ == null) {
+        onClick_ = null;
+      } else {
+        onClick_ = null;
         onClickBuilder_ = null;
       }
       return this;
@@ -2486,45 +2438,30 @@ public com.google.apps.card.v1.Grid build() {
     @java.lang.Override
     public com.google.apps.card.v1.Grid buildPartial() {
       com.google.apps.card.v1.Grid result = new com.google.apps.card.v1.Grid(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.apps.card.v1.Grid result) {
+      int from_bitField0_ = bitField0_;
+      result.title_ = title_;
       if (itemsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           items_ = java.util.Collections.unmodifiableList(items_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.items_ = items_;
       } else {
         result.items_ = itemsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.apps.card.v1.Grid result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.title_ = title_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.borderStyle_ =
-            borderStyleBuilder_ == null ? borderStyle_ : borderStyleBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.columnCount_ = columnCount_;
+      if (borderStyleBuilder_ == null) {
+        result.borderStyle_ = borderStyle_;
+      } else {
+        result.borderStyle_ = borderStyleBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.onClick_ = onClickBuilder_ == null ? onClick_ : onClickBuilder_.build();
-        to_bitField0_ |= 0x00000002;
+      result.columnCount_ = columnCount_;
+      if (onClickBuilder_ == null) {
+        result.onClick_ = onClick_;
+      } else {
+        result.onClick_ = onClickBuilder_.build();
       }
-      result.bitField0_ |= to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -2574,14 +2511,13 @@ public Builder mergeFrom(com.google.apps.card.v1.Grid other) {
       if (other == com.google.apps.card.v1.Grid.getDefaultInstance()) return this;
       if (!other.getTitle().isEmpty()) {
         title_ = other.title_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (itemsBuilder_ == null) {
         if (!other.items_.isEmpty()) {
           if (items_.isEmpty()) {
             items_ = other.items_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureItemsIsMutable();
             items_.addAll(other.items_);
@@ -2594,7 +2530,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Grid other) {
             itemsBuilder_.dispose();
             itemsBuilder_ = null;
             items_ = other.items_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             itemsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getItemsFieldBuilder()
@@ -2642,7 +2578,7 @@ public Builder mergeFrom(
             case 10:
               {
                 title_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -2661,19 +2597,19 @@ public Builder mergeFrom(
             case 26:
               {
                 input.readMessage(getBorderStyleFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 32:
               {
                 columnCount_ = input.readInt32();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             case 42:
               {
                 input.readMessage(getOnClickFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 42
             default:
@@ -2759,8 +2695,8 @@ public Builder setTitle(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       title_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2777,8 +2713,8 @@ public Builder setTitle(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTitle() {
+
       title_ = getDefaultInstance().getTitle();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -2800,8 +2736,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       title_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2810,9 +2746,9 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureItemsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         items_ = new java.util.ArrayList(items_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -3037,7 +2973,7 @@ public Builder addAllItems(
     public Builder clearItems() {
       if (itemsBuilder_ == null) {
         items_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         itemsBuilder_.clear();
@@ -3165,7 +3101,7 @@ public java.util.List getItemsBui
                 com.google.apps.card.v1.Grid.GridItem,
                 com.google.apps.card.v1.Grid.GridItem.Builder,
                 com.google.apps.card.v1.Grid.GridItemOrBuilder>(
-                items_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                items_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         items_ = null;
       }
       return itemsBuilder_;
@@ -3190,7 +3126,7 @@ public java.util.List getItemsBui
      * @return Whether the borderStyle field is set.
      */
     public boolean hasBorderStyle() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return borderStyleBuilder_ != null || borderStyle_ != null;
     }
 
     /**
@@ -3229,11 +3165,11 @@ public Builder setBorderStyle(com.google.apps.card.v1.BorderStyle value) {
           throw new NullPointerException();
         }
         borderStyle_ = value;
+        onChanged();
       } else {
         borderStyleBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -3249,11 +3185,11 @@ public Builder setBorderStyle(com.google.apps.card.v1.BorderStyle value) {
     public Builder setBorderStyle(com.google.apps.card.v1.BorderStyle.Builder builderForValue) {
       if (borderStyleBuilder_ == null) {
         borderStyle_ = builderForValue.build();
+        onChanged();
       } else {
         borderStyleBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -3268,20 +3204,19 @@ public Builder setBorderStyle(com.google.apps.card.v1.BorderStyle.Builder builde
      */
     public Builder mergeBorderStyle(com.google.apps.card.v1.BorderStyle value) {
       if (borderStyleBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && borderStyle_ != null
-            && borderStyle_ != com.google.apps.card.v1.BorderStyle.getDefaultInstance()) {
-          getBorderStyleBuilder().mergeFrom(value);
+        if (borderStyle_ != null) {
+          borderStyle_ =
+              com.google.apps.card.v1.BorderStyle.newBuilder(borderStyle_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           borderStyle_ = value;
         }
+        onChanged();
       } else {
         borderStyleBuilder_.mergeFrom(value);
       }
-      if (borderStyle_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -3295,13 +3230,14 @@ public Builder mergeBorderStyle(com.google.apps.card.v1.BorderStyle value) {
      * .google.apps.card.v1.BorderStyle border_style = 3;
      */
     public Builder clearBorderStyle() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      borderStyle_ = null;
-      if (borderStyleBuilder_ != null) {
-        borderStyleBuilder_.dispose();
+      if (borderStyleBuilder_ == null) {
+        borderStyle_ = null;
+        onChanged();
+      } else {
+        borderStyle_ = null;
         borderStyleBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -3315,7 +3251,7 @@ public Builder clearBorderStyle() {
      * .google.apps.card.v1.BorderStyle border_style = 3;
      */
     public com.google.apps.card.v1.BorderStyle.Builder getBorderStyleBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getBorderStyleFieldBuilder().getBuilder();
     }
@@ -3402,7 +3338,6 @@ public int getColumnCount() {
     public Builder setColumnCount(int value) {
 
       columnCount_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -3421,7 +3356,7 @@ public Builder setColumnCount(int value) {
      * @return This builder for chaining.
      */
     public Builder clearColumnCount() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       columnCount_ = 0;
       onChanged();
       return this;
@@ -3448,7 +3383,7 @@ public Builder clearColumnCount() {
      * @return Whether the onClick field is set.
      */
     public boolean hasOnClick() {
-      return ((bitField0_ & 0x00000010) != 0);
+      return onClickBuilder_ != null || onClick_ != null;
     }
 
     /**
@@ -3489,11 +3424,11 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick value) {
           throw new NullPointerException();
         }
         onClick_ = value;
+        onChanged();
       } else {
         onClickBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -3511,11 +3446,11 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick value) {
     public Builder setOnClick(com.google.apps.card.v1.OnClick.Builder builderForValue) {
       if (onClickBuilder_ == null) {
         onClick_ = builderForValue.build();
+        onChanged();
       } else {
         onClickBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -3532,20 +3467,17 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick.Builder builderForValu
      */
     public Builder mergeOnClick(com.google.apps.card.v1.OnClick value) {
       if (onClickBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)
-            && onClick_ != null
-            && onClick_ != com.google.apps.card.v1.OnClick.getDefaultInstance()) {
-          getOnClickBuilder().mergeFrom(value);
+        if (onClick_ != null) {
+          onClick_ =
+              com.google.apps.card.v1.OnClick.newBuilder(onClick_).mergeFrom(value).buildPartial();
         } else {
           onClick_ = value;
         }
+        onChanged();
       } else {
         onClickBuilder_.mergeFrom(value);
       }
-      if (onClick_ != null) {
-        bitField0_ |= 0x00000010;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -3561,13 +3493,14 @@ public Builder mergeOnClick(com.google.apps.card.v1.OnClick value) {
      * .google.apps.card.v1.OnClick on_click = 5;
      */
     public Builder clearOnClick() {
-      bitField0_ = (bitField0_ & ~0x00000010);
-      onClick_ = null;
-      if (onClickBuilder_ != null) {
-        onClickBuilder_.dispose();
+      if (onClickBuilder_ == null) {
+        onClick_ = null;
+        onChanged();
+      } else {
+        onClick_ = null;
         onClickBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -3583,7 +3516,7 @@ public Builder clearOnClick() {
      * .google.apps.card.v1.OnClick on_click = 5;
      */
     public com.google.apps.card.v1.OnClick.Builder getOnClickBuilder() {
-      bitField0_ |= 0x00000010;
+
       onChanged();
       return getOnClickFieldBuilder().getBuilder();
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/GridOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/GridOrBuilder.java
index 58b81d425e..4fe241c9a8 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/GridOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/GridOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface GridOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Icon.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Icon.java
index 6b5aa976c4..ecf142a858 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Icon.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Icon.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -26,13 +25,11 @@
  * An icon displayed in a widget on a card. For an example in Google Chat apps,
  * see [Add an
  * icon](https://developers.google.com/workspace/chat/add-text-image-card-dialog#add_an_icon).
- *
  * Supports
  * [built-in](https://developers.google.com/workspace/chat/format-messages#builtinicons)
  * and
  * [custom](https://developers.google.com/workspace/chat/format-messages#customicons)
  * icons.
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
  * 

@@ -61,6 +58,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Icon();
   }
 
+  @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.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Icon_descriptor;
   }
@@ -75,8 +77,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   private int iconsCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object icons_;
 
   public enum IconsCase
@@ -134,10 +134,8 @@ public IconsCase getIconsCase() {
    *
    * 
    * Display one of the built-in icons provided by Google Workspace.
-   *
    * For example, to display an airplane icon, specify `AIRPLANE`.
    * For a bus, specify `BUS`.
-   *
    * For a full list of supported icons, see [built-in
    * icons](https://developers.google.com/workspace/chat/format-messages#builtinicons).
    * 

@@ -155,10 +153,8 @@ public boolean hasKnownIcon() {
    *
    * 
    * Display one of the built-in icons provided by Google Workspace.
-   *
    * For example, to display an airplane icon, specify `AIRPLANE`.
    * For a bus, specify `BUS`.
-   *
    * For a full list of supported icons, see [built-in
    * icons](https://developers.google.com/workspace/chat/format-messages#builtinicons).
    * 

@@ -189,10 +185,8 @@ public java.lang.String getKnownIcon() {
    *
    * 
    * Display one of the built-in icons provided by Google Workspace.
-   *
    * For example, to display an airplane icon, specify `AIRPLANE`.
    * For a bus, specify `BUS`.
-   *
    * For a full list of supported icons, see [built-in
    * icons](https://developers.google.com/workspace/chat/format-messages#builtinicons).
    * 

@@ -225,14 +219,11 @@ public com.google.protobuf.ByteString getKnownIconBytes() {
    *
    * 
    * Display a custom icon hosted at an HTTPS URL.
-   *
    * For example:
-   *
    * ```
    * "iconUrl":
    * "https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png"
    * ```
-   *
    * Supported file types include `.png` and `.jpg`.
    * 

    *
@@ -249,14 +240,11 @@ public boolean hasIconUrl() {
    *
    * 
    * Display a custom icon hosted at an HTTPS URL.
-   *
    * For example:
-   *
    * ```
    * "iconUrl":
    * "https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png"
    * ```
-   *
    * Supported file types include `.png` and `.jpg`.
    * 

    *
@@ -286,14 +274,11 @@ public java.lang.String getIconUrl() {
    *
    * 
    * Display a custom icon hosted at an HTTPS URL.
-   *
    * For example:
-   *
    * ```
    * "iconUrl":
    * "https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png"
    * ```
-   *
    * Supported file types include `.png` and `.jpg`.
    * 

    *
@@ -326,7 +311,6 @@ public com.google.protobuf.ByteString getIconUrlBytes() {
    * 
    * Display one of the [Google Material
    * Icons](https://fonts.google.com/icons).
-   *
    * For example, to display a [checkbox
    * icon](https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Acheck_box%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048),
    * use
@@ -335,7 +319,6 @@ public com.google.protobuf.ByteString getIconUrlBytes() {
    *   "name": "check_box"
    * }
    * ```
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -354,7 +337,6 @@ public boolean hasMaterialIcon() {
    * 
    * Display one of the [Google Material
    * Icons](https://fonts.google.com/icons).
-   *
    * For example, to display a [checkbox
    * icon](https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Acheck_box%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048),
    * use
@@ -363,7 +345,6 @@ public boolean hasMaterialIcon() {
    *   "name": "check_box"
    * }
    * ```
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -385,7 +366,6 @@ public com.google.apps.card.v1.MaterialIcon getMaterialIcon() {
    * 
    * Display one of the [Google Material
    * Icons](https://fonts.google.com/icons).
-   *
    * For example, to display a [checkbox
    * icon](https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Acheck_box%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048),
    * use
@@ -394,7 +374,6 @@ public com.google.apps.card.v1.MaterialIcon getMaterialIcon() {
    *   "name": "check_box"
    * }
    * ```
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -409,9 +388,7 @@ public com.google.apps.card.v1.MaterialIconOrBuilder getMaterialIconOrBuilder()
   }
 
   public static final int ALT_TEXT_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object altText_ = "";
+  private volatile java.lang.Object altText_;
 
   /**
    *
@@ -423,7 +400,6 @@ public com.google.apps.card.v1.MaterialIconOrBuilder getMaterialIconOrBuilder()
    * applicable, what it does. For example, `A user's account portrait`, or
    * `Opens a new browser tab and navigates to the Google Chat developer
    * documentation at https://developers.google.com/workspace/chat`.
-   *
    * If the icon is set in a [`Button`][google.apps.card.v1.Button], the
    * `altText` appears as helper text when the user hovers over the button.
    * However, if the button also sets `text`, the icon's `altText` is ignored.
@@ -456,7 +432,6 @@ public java.lang.String getAltText() {
    * applicable, what it does. For example, `A user's account portrait`, or
    * `Opens a new browser tab and navigates to the Google Chat developer
    * documentation at https://developers.google.com/workspace/chat`.
-   *
    * If the icon is set in a [`Button`][google.apps.card.v1.Button], the
    * `altText` appears as helper text when the user hovers over the button.
    * However, if the button also sets `text`, the icon's `altText` is ignored.
@@ -480,7 +455,7 @@ public com.google.protobuf.ByteString getAltTextBytes() {
   }
 
   public static final int IMAGE_TYPE_FIELD_NUMBER = 4;
-  private int imageType_ = 0;
+  private int imageType_;
 
   /**
    *
@@ -515,8 +490,9 @@ public int getImageTypeValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.Widget.ImageType getImageType() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.Widget.ImageType result =
-        com.google.apps.card.v1.Widget.ImageType.forNumber(imageType_);
+        com.google.apps.card.v1.Widget.ImageType.valueOf(imageType_);
     return result == null ? com.google.apps.card.v1.Widget.ImageType.UNRECOGNIZED : result;
   }
 
@@ -744,13 +720,11 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * An icon displayed in a widget on a card. For an example in Google Chat apps,
    * see [Add an
    * icon](https://developers.google.com/workspace/chat/add-text-image-card-dialog#add_an_icon).
-   *
    * Supports
    * [built-in](https://developers.google.com/workspace/chat/format-messages#builtinicons)
    * and
    * [custom](https://developers.google.com/workspace/chat/format-messages#customicons)
    * icons.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -784,12 +758,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (materialIconBuilder_ != null) {
         materialIconBuilder_.clear();
       }
       altText_ = "";
+
       imageType_ = 0;
+
       iconsCase_ = 0;
       icons_ = null;
       return this;
@@ -817,30 +792,24 @@ public com.google.apps.card.v1.Icon build() {
     @java.lang.Override
     public com.google.apps.card.v1.Icon buildPartial() {
       com.google.apps.card.v1.Icon result = new com.google.apps.card.v1.Icon(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (iconsCase_ == 1) {
+        result.icons_ = icons_;
       }
-      buildPartialOneofs(result);
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.apps.card.v1.Icon result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.altText_ = altText_;
+      if (iconsCase_ == 2) {
+        result.icons_ = icons_;
       }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.imageType_ = imageType_;
+      if (iconsCase_ == 5) {
+        if (materialIconBuilder_ == null) {
+          result.icons_ = icons_;
+        } else {
+          result.icons_ = materialIconBuilder_.build();
+        }
       }
-    }
-
-    private void buildPartialOneofs(com.google.apps.card.v1.Icon result) {
+      result.altText_ = altText_;
+      result.imageType_ = imageType_;
       result.iconsCase_ = iconsCase_;
-      result.icons_ = this.icons_;
-      if (iconsCase_ == 5 && materialIconBuilder_ != null) {
-        result.icons_ = materialIconBuilder_.build();
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -890,7 +859,6 @@ public Builder mergeFrom(com.google.apps.card.v1.Icon other) {
       if (other == com.google.apps.card.v1.Icon.getDefaultInstance()) return this;
       if (!other.getAltText().isEmpty()) {
         altText_ = other.altText_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (other.imageType_ != 0) {
@@ -964,13 +932,13 @@ public Builder mergeFrom(
             case 26:
               {
                 altText_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 26
             case 32:
               {
                 imageType_ = input.readEnum();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 32
             case 42:
@@ -1010,17 +978,13 @@ public Builder clearIcons() {
       return this;
     }
 
-    private int bitField0_;
-
     /**
      *
      *
      * 
      * Display one of the built-in icons provided by Google Workspace.
-     *
      * For example, to display an airplane icon, specify `AIRPLANE`.
      * For a bus, specify `BUS`.
-     *
      * For a full list of supported icons, see [built-in
      * icons](https://developers.google.com/workspace/chat/format-messages#builtinicons).
      * 

@@ -1039,10 +1003,8 @@ public boolean hasKnownIcon() {
      *
      * 
      * Display one of the built-in icons provided by Google Workspace.
-     *
      * For example, to display an airplane icon, specify `AIRPLANE`.
      * For a bus, specify `BUS`.
-     *
      * For a full list of supported icons, see [built-in
      * icons](https://developers.google.com/workspace/chat/format-messages#builtinicons).
      * 

@@ -1074,10 +1036,8 @@ public java.lang.String getKnownIcon() {
      *
      * 
      * Display one of the built-in icons provided by Google Workspace.
-     *
      * For example, to display an airplane icon, specify `AIRPLANE`.
      * For a bus, specify `BUS`.
-     *
      * For a full list of supported icons, see [built-in
      * icons](https://developers.google.com/workspace/chat/format-messages#builtinicons).
      * 

@@ -1109,10 +1069,8 @@ public com.google.protobuf.ByteString getKnownIconBytes() {
      *
      * 
      * Display one of the built-in icons provided by Google Workspace.
-     *
      * For example, to display an airplane icon, specify `AIRPLANE`.
      * For a bus, specify `BUS`.
-     *
      * For a full list of supported icons, see [built-in
      * icons](https://developers.google.com/workspace/chat/format-messages#builtinicons).
      * 

@@ -1137,10 +1095,8 @@ public Builder setKnownIcon(java.lang.String value) {
      *
      * 
      * Display one of the built-in icons provided by Google Workspace.
-     *
      * For example, to display an airplane icon, specify `AIRPLANE`.
      * For a bus, specify `BUS`.
-     *
      * For a full list of supported icons, see [built-in
      * icons](https://developers.google.com/workspace/chat/format-messages#builtinicons).
      * 

@@ -1163,10 +1119,8 @@ public Builder clearKnownIcon() {
      *
      * 
      * Display one of the built-in icons provided by Google Workspace.
-     *
      * For example, to display an airplane icon, specify `AIRPLANE`.
      * For a bus, specify `BUS`.
-     *
      * For a full list of supported icons, see [built-in
      * icons](https://developers.google.com/workspace/chat/format-messages#builtinicons).
      * 

@@ -1192,14 +1146,11 @@ public Builder setKnownIconBytes(com.google.protobuf.ByteString value) {
      *
      * 
      * Display a custom icon hosted at an HTTPS URL.
-     *
      * For example:
-     *
      * ```
      * "iconUrl":
      * "https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png"
      * ```
-     *
      * Supported file types include `.png` and `.jpg`.
      * 

      *
@@ -1217,14 +1168,11 @@ public boolean hasIconUrl() {
      *
      * 
      * Display a custom icon hosted at an HTTPS URL.
-     *
      * For example:
-     *
      * ```
      * "iconUrl":
      * "https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png"
      * ```
-     *
      * Supported file types include `.png` and `.jpg`.
      * 

      *
@@ -1255,14 +1203,11 @@ public java.lang.String getIconUrl() {
      *
      * 
      * Display a custom icon hosted at an HTTPS URL.
-     *
      * For example:
-     *
      * ```
      * "iconUrl":
      * "https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png"
      * ```
-     *
      * Supported file types include `.png` and `.jpg`.
      * 

      *
@@ -1293,14 +1238,11 @@ public com.google.protobuf.ByteString getIconUrlBytes() {
      *
      * 
      * Display a custom icon hosted at an HTTPS URL.
-     *
      * For example:
-     *
      * ```
      * "iconUrl":
      * "https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png"
      * ```
-     *
      * Supported file types include `.png` and `.jpg`.
      * 

      *
@@ -1324,14 +1266,11 @@ public Builder setIconUrl(java.lang.String value) {
      *
      * 
      * Display a custom icon hosted at an HTTPS URL.
-     *
      * For example:
-     *
      * ```
      * "iconUrl":
      * "https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png"
      * ```
-     *
      * Supported file types include `.png` and `.jpg`.
      * 

      *
@@ -1353,14 +1292,11 @@ public Builder clearIconUrl() {
      *
      * 
      * Display a custom icon hosted at an HTTPS URL.
-     *
      * For example:
-     *
      * ```
      * "iconUrl":
      * "https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png"
      * ```
-     *
      * Supported file types include `.png` and `.jpg`.
      * 

      *
@@ -1392,7 +1328,6 @@ public Builder setIconUrlBytes(com.google.protobuf.ByteString value) {
      * 
      * Display one of the [Google Material
      * Icons](https://fonts.google.com/icons).
-     *
      * For example, to display a [checkbox
      * icon](https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Acheck_box%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048),
      * use
@@ -1401,7 +1336,6 @@ public Builder setIconUrlBytes(com.google.protobuf.ByteString value) {
      *   "name": "check_box"
      * }
      * ```
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -1420,7 +1354,6 @@ public boolean hasMaterialIcon() {
      * 
      * Display one of the [Google Material
      * Icons](https://fonts.google.com/icons).
-     *
      * For example, to display a [checkbox
      * icon](https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Acheck_box%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048),
      * use
@@ -1429,7 +1362,6 @@ public boolean hasMaterialIcon() {
      *   "name": "check_box"
      * }
      * ```
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -1458,7 +1390,6 @@ public com.google.apps.card.v1.MaterialIcon getMaterialIcon() {
      * 
      * Display one of the [Google Material
      * Icons](https://fonts.google.com/icons).
-     *
      * For example, to display a [checkbox
      * icon](https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Acheck_box%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048),
      * use
@@ -1467,7 +1398,6 @@ public com.google.apps.card.v1.MaterialIcon getMaterialIcon() {
      *   "name": "check_box"
      * }
      * ```
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -1493,7 +1423,6 @@ public Builder setMaterialIcon(com.google.apps.card.v1.MaterialIcon value) {
      * 
      * Display one of the [Google Material
      * Icons](https://fonts.google.com/icons).
-     *
      * For example, to display a [checkbox
      * icon](https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Acheck_box%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048),
      * use
@@ -1502,7 +1431,6 @@ public Builder setMaterialIcon(com.google.apps.card.v1.MaterialIcon value) {
      *   "name": "check_box"
      * }
      * ```
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -1525,7 +1453,6 @@ public Builder setMaterialIcon(com.google.apps.card.v1.MaterialIcon.Builder buil
      * 
      * Display one of the [Google Material
      * Icons](https://fonts.google.com/icons).
-     *
      * For example, to display a [checkbox
      * icon](https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Acheck_box%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048),
      * use
@@ -1534,7 +1461,6 @@ public Builder setMaterialIcon(com.google.apps.card.v1.MaterialIcon.Builder buil
      *   "name": "check_box"
      * }
      * ```
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -1570,7 +1496,6 @@ public Builder mergeMaterialIcon(com.google.apps.card.v1.MaterialIcon value) {
      * 
      * Display one of the [Google Material
      * Icons](https://fonts.google.com/icons).
-     *
      * For example, to display a [checkbox
      * icon](https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Acheck_box%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048),
      * use
@@ -1579,7 +1504,6 @@ public Builder mergeMaterialIcon(com.google.apps.card.v1.MaterialIcon value) {
      *   "name": "check_box"
      * }
      * ```
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -1608,7 +1532,6 @@ public Builder clearMaterialIcon() {
      * 
      * Display one of the [Google Material
      * Icons](https://fonts.google.com/icons).
-     *
      * For example, to display a [checkbox
      * icon](https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Acheck_box%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048),
      * use
@@ -1617,7 +1540,6 @@ public Builder clearMaterialIcon() {
      *   "name": "check_box"
      * }
      * ```
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -1633,7 +1555,6 @@ public com.google.apps.card.v1.MaterialIcon.Builder getMaterialIconBuilder() {
      * 
      * Display one of the [Google Material
      * Icons](https://fonts.google.com/icons).
-     *
      * For example, to display a [checkbox
      * icon](https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Acheck_box%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048),
      * use
@@ -1642,7 +1563,6 @@ public com.google.apps.card.v1.MaterialIcon.Builder getMaterialIconBuilder() {
      *   "name": "check_box"
      * }
      * ```
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -1666,7 +1586,6 @@ public com.google.apps.card.v1.MaterialIconOrBuilder getMaterialIconOrBuilder()
      * 
      * Display one of the [Google Material
      * Icons](https://fonts.google.com/icons).
-     *
      * For example, to display a [checkbox
      * icon](https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Acheck_box%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048),
      * use
@@ -1675,7 +1594,6 @@ public com.google.apps.card.v1.MaterialIconOrBuilder getMaterialIconOrBuilder()
      *   "name": "check_box"
      * }
      * ```
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -1700,6 +1618,7 @@ public com.google.apps.card.v1.MaterialIconOrBuilder getMaterialIconOrBuilder()
       }
       iconsCase_ = 5;
       onChanged();
+      ;
       return materialIconBuilder_;
     }
 
@@ -1715,7 +1634,6 @@ public com.google.apps.card.v1.MaterialIconOrBuilder getMaterialIconOrBuilder()
      * applicable, what it does. For example, `A user's account portrait`, or
      * `Opens a new browser tab and navigates to the Google Chat developer
      * documentation at https://developers.google.com/workspace/chat`.
-     *
      * If the icon is set in a [`Button`][google.apps.card.v1.Button], the
      * `altText` appears as helper text when the user hovers over the button.
      * However, if the button also sets `text`, the icon's `altText` is ignored.
@@ -1747,7 +1665,6 @@ public java.lang.String getAltText() {
      * applicable, what it does. For example, `A user's account portrait`, or
      * `Opens a new browser tab and navigates to the Google Chat developer
      * documentation at https://developers.google.com/workspace/chat`.
-     *
      * If the icon is set in a [`Button`][google.apps.card.v1.Button], the
      * `altText` appears as helper text when the user hovers over the button.
      * However, if the button also sets `text`, the icon's `altText` is ignored.
@@ -1779,7 +1696,6 @@ public com.google.protobuf.ByteString getAltTextBytes() {
      * applicable, what it does. For example, `A user's account portrait`, or
      * `Opens a new browser tab and navigates to the Google Chat developer
      * documentation at https://developers.google.com/workspace/chat`.
-     *
      * If the icon is set in a [`Button`][google.apps.card.v1.Button], the
      * `altText` appears as helper text when the user hovers over the button.
      * However, if the button also sets `text`, the icon's `altText` is ignored.
@@ -1794,8 +1710,8 @@ public Builder setAltText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       altText_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1810,7 +1726,6 @@ public Builder setAltText(java.lang.String value) {
      * applicable, what it does. For example, `A user's account portrait`, or
      * `Opens a new browser tab and navigates to the Google Chat developer
      * documentation at https://developers.google.com/workspace/chat`.
-     *
      * If the icon is set in a [`Button`][google.apps.card.v1.Button], the
      * `altText` appears as helper text when the user hovers over the button.
      * However, if the button also sets `text`, the icon's `altText` is ignored.
@@ -1821,8 +1736,8 @@ public Builder setAltText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAltText() {
+
       altText_ = getDefaultInstance().getAltText();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1837,7 +1752,6 @@ public Builder clearAltText() {
      * applicable, what it does. For example, `A user's account portrait`, or
      * `Opens a new browser tab and navigates to the Google Chat developer
      * documentation at https://developers.google.com/workspace/chat`.
-     *
      * If the icon is set in a [`Button`][google.apps.card.v1.Button], the
      * `altText` appears as helper text when the user hovers over the button.
      * However, if the button also sets `text`, the icon's `altText` is ignored.
@@ -1853,8 +1767,8 @@ public Builder setAltTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       altText_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1894,8 +1808,8 @@ public int getImageTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setImageTypeValue(int value) {
+
       imageType_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1915,8 +1829,9 @@ public Builder setImageTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.Widget.ImageType getImageType() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.Widget.ImageType result =
-          com.google.apps.card.v1.Widget.ImageType.forNumber(imageType_);
+          com.google.apps.card.v1.Widget.ImageType.valueOf(imageType_);
       return result == null ? com.google.apps.card.v1.Widget.ImageType.UNRECOGNIZED : result;
     }
 
@@ -1938,7 +1853,7 @@ public Builder setImageType(com.google.apps.card.v1.Widget.ImageType value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000010;
+
       imageType_ = value.getNumber();
       onChanged();
       return this;
@@ -1958,7 +1873,7 @@ public Builder setImageType(com.google.apps.card.v1.Widget.ImageType value) {
      * @return This builder for chaining.
      */
     public Builder clearImageType() {
-      bitField0_ = (bitField0_ & ~0x00000010);
+
       imageType_ = 0;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/IconOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/IconOrBuilder.java
index 14e004c8a4..7a19eb1b49 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/IconOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/IconOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface IconOrBuilder
@@ -29,10 +28,8 @@ public interface IconOrBuilder
    *
    * 
    * Display one of the built-in icons provided by Google Workspace.
-   *
    * For example, to display an airplane icon, specify `AIRPLANE`.
    * For a bus, specify `BUS`.
-   *
    * For a full list of supported icons, see [built-in
    * icons](https://developers.google.com/workspace/chat/format-messages#builtinicons).
    * 

@@ -48,10 +45,8 @@ public interface IconOrBuilder
    *
    * 
    * Display one of the built-in icons provided by Google Workspace.
-   *
    * For example, to display an airplane icon, specify `AIRPLANE`.
    * For a bus, specify `BUS`.
-   *
    * For a full list of supported icons, see [built-in
    * icons](https://developers.google.com/workspace/chat/format-messages#builtinicons).
    * 

@@ -67,10 +62,8 @@ public interface IconOrBuilder
    *
    * 
    * Display one of the built-in icons provided by Google Workspace.
-   *
    * For example, to display an airplane icon, specify `AIRPLANE`.
    * For a bus, specify `BUS`.
-   *
    * For a full list of supported icons, see [built-in
    * icons](https://developers.google.com/workspace/chat/format-messages#builtinicons).
    * 

@@ -86,14 +79,11 @@ public interface IconOrBuilder
    *
    * 
    * Display a custom icon hosted at an HTTPS URL.
-   *
    * For example:
-   *
    * ```
    * "iconUrl":
    * "https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png"
    * ```
-   *
    * Supported file types include `.png` and `.jpg`.
    * 

    *
@@ -108,14 +98,11 @@ public interface IconOrBuilder
    *
    * 
    * Display a custom icon hosted at an HTTPS URL.
-   *
    * For example:
-   *
    * ```
    * "iconUrl":
    * "https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png"
    * ```
-   *
    * Supported file types include `.png` and `.jpg`.
    * 

    *
@@ -130,14 +117,11 @@ public interface IconOrBuilder
    *
    * 
    * Display a custom icon hosted at an HTTPS URL.
-   *
    * For example:
-   *
    * ```
    * "iconUrl":
    * "https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png"
    * ```
-   *
    * Supported file types include `.png` and `.jpg`.
    * 

    *
@@ -153,7 +137,6 @@ public interface IconOrBuilder
    * 
    * Display one of the [Google Material
    * Icons](https://fonts.google.com/icons).
-   *
    * For example, to display a [checkbox
    * icon](https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Acheck_box%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048),
    * use
@@ -162,7 +145,6 @@ public interface IconOrBuilder
    *   "name": "check_box"
    * }
    * ```
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -178,7 +160,6 @@ public interface IconOrBuilder
    * 
    * Display one of the [Google Material
    * Icons](https://fonts.google.com/icons).
-   *
    * For example, to display a [checkbox
    * icon](https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Acheck_box%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048),
    * use
@@ -187,7 +168,6 @@ public interface IconOrBuilder
    *   "name": "check_box"
    * }
    * ```
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -203,7 +183,6 @@ public interface IconOrBuilder
    * 
    * Display one of the [Google Material
    * Icons](https://fonts.google.com/icons).
-   *
    * For example, to display a [checkbox
    * icon](https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Acheck_box%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048),
    * use
@@ -212,7 +191,6 @@ public interface IconOrBuilder
    *   "name": "check_box"
    * }
    * ```
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -230,7 +208,6 @@ public interface IconOrBuilder
    * applicable, what it does. For example, `A user's account portrait`, or
    * `Opens a new browser tab and navigates to the Google Chat developer
    * documentation at https://developers.google.com/workspace/chat`.
-   *
    * If the icon is set in a [`Button`][google.apps.card.v1.Button], the
    * `altText` appears as helper text when the user hovers over the button.
    * However, if the button also sets `text`, the icon's `altText` is ignored.
@@ -252,7 +229,6 @@ public interface IconOrBuilder
    * applicable, what it does. For example, `A user's account portrait`, or
    * `Opens a new browser tab and navigates to the Google Chat developer
    * documentation at https://developers.google.com/workspace/chat`.
-   *
    * If the icon is set in a [`Button`][google.apps.card.v1.Button], the
    * `altText` appears as helper text when the user hovers over the button.
    * However, if the button also sets `text`, the icon's `altText` is ignored.
@@ -294,5 +270,5 @@ public interface IconOrBuilder
    */
   com.google.apps.card.v1.Widget.ImageType getImageType();
 
-  com.google.apps.card.v1.Icon.IconsCase getIconsCase();
+  public com.google.apps.card.v1.Icon.IconsCase getIconsCase();
 }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Image.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Image.java
index 6160560d90..4565735438 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Image.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Image.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -26,7 +25,6 @@
  * An image that is specified by a URL and can have an `onClick` action. For an
  * example, see [Add an
  * image](https://developers.google.com/workspace/chat/add-text-image-card-dialog#add_an_image).
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
  * 

@@ -55,6 +53,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Image();
   }
 
+  @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.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Image_descriptor;
   }
@@ -68,20 +71,15 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.apps.card.v1.Image.class, com.google.apps.card.v1.Image.Builder.class);
   }
 
-  private int bitField0_;
   public static final int IMAGE_URL_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object imageUrl_ = "";
+  private volatile java.lang.Object imageUrl_;
 
   /**
    *
    *
    * 
    * The HTTPS URL that hosts the image.
-   *
    * For example:
-   *
    * ```
    * https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png
    * ```
@@ -109,9 +107,7 @@ public java.lang.String getImageUrl() {
    *
    * 
    * The HTTPS URL that hosts the image.
-   *
    * For example:
-   *
    * ```
    * https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png
    * ```
@@ -150,7 +146,7 @@ public com.google.protobuf.ByteString getImageUrlBytes() {
    */
   @java.lang.Override
   public boolean hasOnClick() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return onClick_ != null;
   }
 
   /**
@@ -180,13 +176,11 @@ public com.google.apps.card.v1.OnClick getOnClick() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.OnClickOrBuilder getOnClickOrBuilder() {
-    return onClick_ == null ? com.google.apps.card.v1.OnClick.getDefaultInstance() : onClick_;
+    return getOnClick();
   }
 
   public static final int ALT_TEXT_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object altText_ = "";
+  private volatile java.lang.Object altText_;
 
   /**
    *
@@ -253,7 +247,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(imageUrl_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, imageUrl_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (onClick_ != null) {
       output.writeMessage(2, getOnClick());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(altText_)) {
@@ -271,7 +265,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(imageUrl_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, imageUrl_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (onClick_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getOnClick());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(altText_)) {
@@ -424,7 +418,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * An image that is specified by a URL and can have an `onClick` action. For an
    * example, see [Add an
    * image](https://developers.google.com/workspace/chat/add-text-image-card-dialog#add_an_image).
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -449,32 +442,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Image.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getOnClickFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       imageUrl_ = "";
-      onClick_ = null;
-      if (onClickBuilder_ != null) {
-        onClickBuilder_.dispose();
+
+      if (onClickBuilder_ == null) {
+        onClick_ = null;
+      } else {
+        onClick_ = null;
         onClickBuilder_ = null;
       }
       altText_ = "";
+
       return this;
     }
 
@@ -500,29 +486,17 @@ public com.google.apps.card.v1.Image build() {
     @java.lang.Override
     public com.google.apps.card.v1.Image buildPartial() {
       com.google.apps.card.v1.Image result = new com.google.apps.card.v1.Image(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.imageUrl_ = imageUrl_;
+      if (onClickBuilder_ == null) {
+        result.onClick_ = onClick_;
+      } else {
+        result.onClick_ = onClickBuilder_.build();
       }
+      result.altText_ = altText_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.apps.card.v1.Image result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.imageUrl_ = imageUrl_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.onClick_ = onClickBuilder_ == null ? onClick_ : onClickBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.altText_ = altText_;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -570,7 +544,6 @@ public Builder mergeFrom(com.google.apps.card.v1.Image other) {
       if (other == com.google.apps.card.v1.Image.getDefaultInstance()) return this;
       if (!other.getImageUrl().isEmpty()) {
         imageUrl_ = other.imageUrl_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasOnClick()) {
@@ -578,7 +551,6 @@ public Builder mergeFrom(com.google.apps.card.v1.Image other) {
       }
       if (!other.getAltText().isEmpty()) {
         altText_ = other.altText_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -610,19 +582,19 @@ public Builder mergeFrom(
             case 10:
               {
                 imageUrl_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getOnClickFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 altText_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -642,8 +614,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object imageUrl_ = "";
 
     /**
@@ -651,9 +621,7 @@ public Builder mergeFrom(
      *
      * 
      * The HTTPS URL that hosts the image.
-     *
      * For example:
-     *
      * ```
      * https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png
      * ```
@@ -680,9 +648,7 @@ public java.lang.String getImageUrl() {
      *
      * 
      * The HTTPS URL that hosts the image.
-     *
      * For example:
-     *
      * ```
      * https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png
      * ```
@@ -709,9 +675,7 @@ public com.google.protobuf.ByteString getImageUrlBytes() {
      *
      * 
      * The HTTPS URL that hosts the image.
-     *
      * For example:
-     *
      * ```
      * https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png
      * ```
@@ -726,8 +690,8 @@ public Builder setImageUrl(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       imageUrl_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -737,9 +701,7 @@ public Builder setImageUrl(java.lang.String value) {
      *
      * 
      * The HTTPS URL that hosts the image.
-     *
      * For example:
-     *
      * ```
      * https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png
      * ```
@@ -750,8 +712,8 @@ public Builder setImageUrl(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearImageUrl() {
+
       imageUrl_ = getDefaultInstance().getImageUrl();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -761,9 +723,7 @@ public Builder clearImageUrl() {
      *
      * 
      * The HTTPS URL that hosts the image.
-     *
      * For example:
-     *
      * ```
      * https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png
      * ```
@@ -779,8 +739,8 @@ public Builder setImageUrlBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       imageUrl_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -804,7 +764,7 @@ public Builder setImageUrlBytes(com.google.protobuf.ByteString value) {
      * @return Whether the onClick field is set.
      */
     public boolean hasOnClick() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return onClickBuilder_ != null || onClick_ != null;
     }
 
     /**
@@ -841,11 +801,11 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick value) {
           throw new NullPointerException();
         }
         onClick_ = value;
+        onChanged();
       } else {
         onClickBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -861,11 +821,11 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick value) {
     public Builder setOnClick(com.google.apps.card.v1.OnClick.Builder builderForValue) {
       if (onClickBuilder_ == null) {
         onClick_ = builderForValue.build();
+        onChanged();
       } else {
         onClickBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -880,20 +840,17 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick.Builder builderForValu
      */
     public Builder mergeOnClick(com.google.apps.card.v1.OnClick value) {
       if (onClickBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && onClick_ != null
-            && onClick_ != com.google.apps.card.v1.OnClick.getDefaultInstance()) {
-          getOnClickBuilder().mergeFrom(value);
+        if (onClick_ != null) {
+          onClick_ =
+              com.google.apps.card.v1.OnClick.newBuilder(onClick_).mergeFrom(value).buildPartial();
         } else {
           onClick_ = value;
         }
+        onChanged();
       } else {
         onClickBuilder_.mergeFrom(value);
       }
-      if (onClick_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -907,13 +864,14 @@ public Builder mergeOnClick(com.google.apps.card.v1.OnClick value) {
      * .google.apps.card.v1.OnClick on_click = 2;
      */
     public Builder clearOnClick() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      onClick_ = null;
-      if (onClickBuilder_ != null) {
-        onClickBuilder_.dispose();
+      if (onClickBuilder_ == null) {
+        onClick_ = null;
+        onChanged();
+      } else {
+        onClick_ = null;
         onClickBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -927,7 +885,7 @@ public Builder clearOnClick() {
      * .google.apps.card.v1.OnClick on_click = 2;
      */
     public com.google.apps.card.v1.OnClick.Builder getOnClickBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getOnClickFieldBuilder().getBuilder();
     }
@@ -1039,8 +997,8 @@ public Builder setAltText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       altText_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1057,8 +1015,8 @@ public Builder setAltText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAltText() {
+
       altText_ = getDefaultInstance().getAltText();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1080,8 +1038,8 @@ public Builder setAltTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       altText_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageComponent.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageComponent.java
index c459e84a13..a3c8de5dfa 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageComponent.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageComponent.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -24,7 +23,6 @@
  *
  * 
  * Represents an image.
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
  * 

@@ -53,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ImageComponent();
   }
 
+  @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.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_ImageComponent_descriptor;
@@ -68,11 +71,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.apps.card.v1.ImageComponent.Builder.class);
   }
 
-  private int bitField0_;
   public static final int IMAGE_URI_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object imageUri_ = "";
+  private volatile java.lang.Object imageUri_;
 
   /**
    *
@@ -123,9 +123,7 @@ public com.google.protobuf.ByteString getImageUriBytes() {
   }
 
   public static final int ALT_TEXT_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object altText_ = "";
+  private volatile java.lang.Object altText_;
 
   /**
    *
@@ -191,7 +189,7 @@ public com.google.protobuf.ByteString getAltTextBytes() {
    */
   @java.lang.Override
   public boolean hasCropStyle() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return cropStyle_ != null;
   }
 
   /**
@@ -223,9 +221,7 @@ public com.google.apps.card.v1.ImageCropStyle getCropStyle() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.ImageCropStyleOrBuilder getCropStyleOrBuilder() {
-    return cropStyle_ == null
-        ? com.google.apps.card.v1.ImageCropStyle.getDefaultInstance()
-        : cropStyle_;
+    return getCropStyle();
   }
 
   public static final int BORDER_STYLE_FIELD_NUMBER = 4;
@@ -244,7 +240,7 @@ public com.google.apps.card.v1.ImageCropStyleOrBuilder getCropStyleOrBuilder() {
    */
   @java.lang.Override
   public boolean hasBorderStyle() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return borderStyle_ != null;
   }
 
   /**
@@ -276,9 +272,7 @@ public com.google.apps.card.v1.BorderStyle getBorderStyle() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.BorderStyleOrBuilder getBorderStyleOrBuilder() {
-    return borderStyle_ == null
-        ? com.google.apps.card.v1.BorderStyle.getDefaultInstance()
-        : borderStyle_;
+    return getBorderStyle();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -301,10 +295,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(altText_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, altText_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (cropStyle_ != null) {
       output.writeMessage(3, getCropStyle());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (borderStyle_ != null) {
       output.writeMessage(4, getBorderStyle());
     }
     getUnknownFields().writeTo(output);
@@ -322,10 +316,10 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(altText_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, altText_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (cropStyle_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getCropStyle());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (borderStyle_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getBorderStyle());
     }
     size += getUnknownFields().getSerializedSize();
@@ -482,7 +476,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * Represents an image.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -509,36 +502,29 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.ImageComponent.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCropStyleFieldBuilder();
-        getBorderStyleFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       imageUri_ = "";
+
       altText_ = "";
-      cropStyle_ = null;
-      if (cropStyleBuilder_ != null) {
-        cropStyleBuilder_.dispose();
+
+      if (cropStyleBuilder_ == null) {
+        cropStyle_ = null;
+      } else {
+        cropStyle_ = null;
         cropStyleBuilder_ = null;
       }
-      borderStyle_ = null;
-      if (borderStyleBuilder_ != null) {
-        borderStyleBuilder_.dispose();
+      if (borderStyleBuilder_ == null) {
+        borderStyle_ = null;
+      } else {
+        borderStyle_ = null;
         borderStyleBuilder_ = null;
       }
       return this;
@@ -568,34 +554,22 @@ public com.google.apps.card.v1.ImageComponent build() {
     public com.google.apps.card.v1.ImageComponent buildPartial() {
       com.google.apps.card.v1.ImageComponent result =
           new com.google.apps.card.v1.ImageComponent(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.imageUri_ = imageUri_;
+      result.altText_ = altText_;
+      if (cropStyleBuilder_ == null) {
+        result.cropStyle_ = cropStyle_;
+      } else {
+        result.cropStyle_ = cropStyleBuilder_.build();
+      }
+      if (borderStyleBuilder_ == null) {
+        result.borderStyle_ = borderStyle_;
+      } else {
+        result.borderStyle_ = borderStyleBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.apps.card.v1.ImageComponent result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.imageUri_ = imageUri_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.altText_ = altText_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.cropStyle_ = cropStyleBuilder_ == null ? cropStyle_ : cropStyleBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.borderStyle_ =
-            borderStyleBuilder_ == null ? borderStyle_ : borderStyleBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -643,12 +617,10 @@ public Builder mergeFrom(com.google.apps.card.v1.ImageComponent other) {
       if (other == com.google.apps.card.v1.ImageComponent.getDefaultInstance()) return this;
       if (!other.getImageUri().isEmpty()) {
         imageUri_ = other.imageUri_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getAltText().isEmpty()) {
         altText_ = other.altText_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasCropStyle()) {
@@ -686,25 +658,25 @@ public Builder mergeFrom(
             case 10:
               {
                 imageUri_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 altText_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getCropStyleFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getBorderStyleFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             default:
@@ -724,8 +696,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object imageUri_ = "";
 
     /**
@@ -790,8 +760,8 @@ public Builder setImageUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       imageUri_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -808,8 +778,8 @@ public Builder setImageUri(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearImageUri() {
+
       imageUri_ = getDefaultInstance().getImageUri();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -831,8 +801,8 @@ public Builder setImageUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       imageUri_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -901,8 +871,8 @@ public Builder setAltText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       altText_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -919,8 +889,8 @@ public Builder setAltText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAltText() {
+
       altText_ = getDefaultInstance().getAltText();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -942,8 +912,8 @@ public Builder setAltTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       altText_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -967,7 +937,7 @@ public Builder setAltTextBytes(com.google.protobuf.ByteString value) {
      * @return Whether the cropStyle field is set.
      */
     public boolean hasCropStyle() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return cropStyleBuilder_ != null || cropStyle_ != null;
     }
 
     /**
@@ -1006,11 +976,11 @@ public Builder setCropStyle(com.google.apps.card.v1.ImageCropStyle value) {
           throw new NullPointerException();
         }
         cropStyle_ = value;
+        onChanged();
       } else {
         cropStyleBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1026,11 +996,11 @@ public Builder setCropStyle(com.google.apps.card.v1.ImageCropStyle value) {
     public Builder setCropStyle(com.google.apps.card.v1.ImageCropStyle.Builder builderForValue) {
       if (cropStyleBuilder_ == null) {
         cropStyle_ = builderForValue.build();
+        onChanged();
       } else {
         cropStyleBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1045,20 +1015,19 @@ public Builder setCropStyle(com.google.apps.card.v1.ImageCropStyle.Builder build
      */
     public Builder mergeCropStyle(com.google.apps.card.v1.ImageCropStyle value) {
       if (cropStyleBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && cropStyle_ != null
-            && cropStyle_ != com.google.apps.card.v1.ImageCropStyle.getDefaultInstance()) {
-          getCropStyleBuilder().mergeFrom(value);
+        if (cropStyle_ != null) {
+          cropStyle_ =
+              com.google.apps.card.v1.ImageCropStyle.newBuilder(cropStyle_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           cropStyle_ = value;
         }
+        onChanged();
       } else {
         cropStyleBuilder_.mergeFrom(value);
       }
-      if (cropStyle_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1072,13 +1041,14 @@ public Builder mergeCropStyle(com.google.apps.card.v1.ImageCropStyle value) {
      * .google.apps.card.v1.ImageCropStyle crop_style = 3;
      */
     public Builder clearCropStyle() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      cropStyle_ = null;
-      if (cropStyleBuilder_ != null) {
-        cropStyleBuilder_.dispose();
+      if (cropStyleBuilder_ == null) {
+        cropStyle_ = null;
+        onChanged();
+      } else {
+        cropStyle_ = null;
         cropStyleBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1092,7 +1062,7 @@ public Builder clearCropStyle() {
      * .google.apps.card.v1.ImageCropStyle crop_style = 3;
      */
     public com.google.apps.card.v1.ImageCropStyle.Builder getCropStyleBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getCropStyleFieldBuilder().getBuilder();
     }
@@ -1161,7 +1131,7 @@ public com.google.apps.card.v1.ImageCropStyleOrBuilder getCropStyleOrBuilder() {
      * @return Whether the borderStyle field is set.
      */
     public boolean hasBorderStyle() {
-      return ((bitField0_ & 0x00000008) != 0);
+      return borderStyleBuilder_ != null || borderStyle_ != null;
     }
 
     /**
@@ -1200,11 +1170,11 @@ public Builder setBorderStyle(com.google.apps.card.v1.BorderStyle value) {
           throw new NullPointerException();
         }
         borderStyle_ = value;
+        onChanged();
       } else {
         borderStyleBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -1220,11 +1190,11 @@ public Builder setBorderStyle(com.google.apps.card.v1.BorderStyle value) {
     public Builder setBorderStyle(com.google.apps.card.v1.BorderStyle.Builder builderForValue) {
       if (borderStyleBuilder_ == null) {
         borderStyle_ = builderForValue.build();
+        onChanged();
       } else {
         borderStyleBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -1239,20 +1209,19 @@ public Builder setBorderStyle(com.google.apps.card.v1.BorderStyle.Builder builde
      */
     public Builder mergeBorderStyle(com.google.apps.card.v1.BorderStyle value) {
       if (borderStyleBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)
-            && borderStyle_ != null
-            && borderStyle_ != com.google.apps.card.v1.BorderStyle.getDefaultInstance()) {
-          getBorderStyleBuilder().mergeFrom(value);
+        if (borderStyle_ != null) {
+          borderStyle_ =
+              com.google.apps.card.v1.BorderStyle.newBuilder(borderStyle_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           borderStyle_ = value;
         }
+        onChanged();
       } else {
         borderStyleBuilder_.mergeFrom(value);
       }
-      if (borderStyle_ != null) {
-        bitField0_ |= 0x00000008;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1266,13 +1235,14 @@ public Builder mergeBorderStyle(com.google.apps.card.v1.BorderStyle value) {
      * .google.apps.card.v1.BorderStyle border_style = 4;
      */
     public Builder clearBorderStyle() {
-      bitField0_ = (bitField0_ & ~0x00000008);
-      borderStyle_ = null;
-      if (borderStyleBuilder_ != null) {
-        borderStyleBuilder_.dispose();
+      if (borderStyleBuilder_ == null) {
+        borderStyle_ = null;
+        onChanged();
+      } else {
+        borderStyle_ = null;
         borderStyleBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1286,7 +1256,7 @@ public Builder clearBorderStyle() {
      * .google.apps.card.v1.BorderStyle border_style = 4;
      */
     public com.google.apps.card.v1.BorderStyle.Builder getBorderStyleBuilder() {
-      bitField0_ |= 0x00000008;
+
       onChanged();
       return getBorderStyleFieldBuilder().getBuilder();
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageComponentOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageComponentOrBuilder.java
index 51dafa69f1..552cd9c6e4 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageComponentOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageComponentOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface ImageComponentOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageCropStyle.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageCropStyle.java
index 23474816ba..1becc33259 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageCropStyle.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageCropStyle.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -24,12 +23,9 @@
  *
  * 
  * Represents the crop style applied to an image.
- *
  * [Google Workspace add-ons and
  * Chat apps](https://developers.google.com/workspace/extend):
- *
  * For example, here's how to apply a 16:9 aspect ratio:
- *
  * ```
  * cropStyle {
  *  "type": "RECTANGLE_CUSTOM",
@@ -61,6 +57,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ImageCropStyle();
   }
 
+  @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.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_ImageCropStyle_descriptor;
@@ -81,7 +82,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * Represents the crop style applied to an image.
-   *
    * [Google Workspace add-ons
    * and Chat apps](https://developers.google.com/workspace/extend):
    * 

@@ -287,7 +287,7 @@ private ImageCropType(int value) {
   }
 
   public static final int TYPE_FIELD_NUMBER = 1;
-  private int type_ = 0;
+  private int type_;
 
   /**
    *
@@ -318,24 +318,23 @@ public int getTypeValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.ImageCropStyle.ImageCropType getType() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.ImageCropStyle.ImageCropType result =
-        com.google.apps.card.v1.ImageCropStyle.ImageCropType.forNumber(type_);
+        com.google.apps.card.v1.ImageCropStyle.ImageCropType.valueOf(type_);
     return result == null
         ? com.google.apps.card.v1.ImageCropStyle.ImageCropType.UNRECOGNIZED
         : result;
   }
 
   public static final int ASPECT_RATIO_FIELD_NUMBER = 2;
-  private double aspectRatio_ = 0D;
+  private double aspectRatio_;
 
   /**
    *
    *
    * 
    * The aspect ratio to use if the crop type is `RECTANGLE_CUSTOM`.
-   *
    * For example, here's how to apply a 16:9 aspect ratio:
-   *
    * ```
    * cropStyle {
    *  "type": "RECTANGLE_CUSTOM",
@@ -534,12 +533,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * Represents the crop style applied to an image.
-   *
    * [Google Workspace add-ons and
    * Chat apps](https://developers.google.com/workspace/extend):
-   *
    * For example, here's how to apply a 16:9 aspect ratio:
-   *
    * ```
    * cropStyle {
    *  "type": "RECTANGLE_CUSTOM",
@@ -579,9 +575,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       type_ = 0;
+
       aspectRatio_ = 0D;
+
       return this;
     }
 
@@ -609,23 +606,12 @@ public com.google.apps.card.v1.ImageCropStyle build() {
     public com.google.apps.card.v1.ImageCropStyle buildPartial() {
       com.google.apps.card.v1.ImageCropStyle result =
           new com.google.apps.card.v1.ImageCropStyle(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.type_ = type_;
+      result.aspectRatio_ = aspectRatio_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.apps.card.v1.ImageCropStyle result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.type_ = type_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.aspectRatio_ = aspectRatio_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -706,13 +692,13 @@ public Builder mergeFrom(
             case 8:
               {
                 type_ = input.readEnum();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 17:
               {
                 aspectRatio_ = input.readDouble();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 17
             default:
@@ -732,8 +718,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private int type_ = 0;
 
     /**
@@ -765,8 +749,8 @@ public int getTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setTypeValue(int value) {
+
       type_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -784,8 +768,9 @@ public Builder setTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.ImageCropStyle.ImageCropType getType() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.ImageCropStyle.ImageCropType result =
-          com.google.apps.card.v1.ImageCropStyle.ImageCropType.forNumber(type_);
+          com.google.apps.card.v1.ImageCropStyle.ImageCropType.valueOf(type_);
       return result == null
           ? com.google.apps.card.v1.ImageCropStyle.ImageCropType.UNRECOGNIZED
           : result;
@@ -807,7 +792,7 @@ public Builder setType(com.google.apps.card.v1.ImageCropStyle.ImageCropType valu
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000001;
+
       type_ = value.getNumber();
       onChanged();
       return this;
@@ -825,7 +810,7 @@ public Builder setType(com.google.apps.card.v1.ImageCropStyle.ImageCropType valu
      * @return This builder for chaining.
      */
     public Builder clearType() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       type_ = 0;
       onChanged();
       return this;
@@ -838,9 +823,7 @@ public Builder clearType() {
      *
      * 
      * The aspect ratio to use if the crop type is `RECTANGLE_CUSTOM`.
-     *
      * For example, here's how to apply a 16:9 aspect ratio:
-     *
      * ```
      * cropStyle {
      *  "type": "RECTANGLE_CUSTOM",
@@ -863,9 +846,7 @@ public double getAspectRatio() {
      *
      * 
      * The aspect ratio to use if the crop type is `RECTANGLE_CUSTOM`.
-     *
      * For example, here's how to apply a 16:9 aspect ratio:
-     *
      * ```
      * cropStyle {
      *  "type": "RECTANGLE_CUSTOM",
@@ -882,7 +863,6 @@ public double getAspectRatio() {
     public Builder setAspectRatio(double value) {
 
       aspectRatio_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -892,9 +872,7 @@ public Builder setAspectRatio(double value) {
      *
      * 
      * The aspect ratio to use if the crop type is `RECTANGLE_CUSTOM`.
-     *
      * For example, here's how to apply a 16:9 aspect ratio:
-     *
      * ```
      * cropStyle {
      *  "type": "RECTANGLE_CUSTOM",
@@ -908,7 +886,7 @@ public Builder setAspectRatio(double value) {
      * @return This builder for chaining.
      */
     public Builder clearAspectRatio() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       aspectRatio_ = 0D;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageCropStyleOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageCropStyleOrBuilder.java
index 1fd1de13e9..ffbf24cd7e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageCropStyleOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageCropStyleOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface ImageCropStyleOrBuilder
@@ -55,9 +54,7 @@ public interface ImageCropStyleOrBuilder
    *
    * 
    * The aspect ratio to use if the crop type is `RECTANGLE_CUSTOM`.
-   *
    * For example, here's how to apply a 16:9 aspect ratio:
-   *
    * ```
    * cropStyle {
    *  "type": "RECTANGLE_CUSTOM",
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageOrBuilder.java
index e20cf935da..6c2f24b5b1 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface ImageOrBuilder
@@ -29,9 +28,7 @@ public interface ImageOrBuilder
    *
    * 
    * The HTTPS URL that hosts the image.
-   *
    * For example:
-   *
    * ```
    * https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png
    * ```
@@ -48,9 +45,7 @@ public interface ImageOrBuilder
    *
    * 
    * The HTTPS URL that hosts the image.
-   *
    * For example:
-   *
    * ```
    * https://developers.google.com/workspace/chat/images/quickstart-app-avatar.png
    * ```
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/MaterialIcon.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/MaterialIcon.java
index 7f2cee3074..da9c427710 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/MaterialIcon.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/MaterialIcon.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -25,11 +24,9 @@
  * 
  * A [Google Material Icon](https://fonts.google.com/icons), which includes over
  * 2500+ options.
- *
  * For example, to display a [checkbox
  * icon](https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Acheck_box%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048)
  * with customized weight and grade, write the following:
- *
  * ```
  * {
  *   "name": "check_box",
@@ -38,7 +35,6 @@
  *   "grade": -25
  * }
  * ```
- *
  * [Google Chat apps](https://developers.google.com/workspace/chat):
  * 

  *
@@ -65,6 +61,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new MaterialIcon();
   }
 
+  @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.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_MaterialIcon_descriptor;
@@ -81,9 +82,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -140,14 +139,13 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int FILL_FIELD_NUMBER = 2;
-  private boolean fill_ = false;
+  private boolean fill_;
 
   /**
    *
    *
    * 
    * Whether the icon renders as filled. Default value is false.
-   *
    * To preview different icon settings, go to
    * [Google Font Icons](https://fonts.google.com/icons) and adjust the
    * settings under **Customize**.
@@ -163,7 +161,7 @@ public boolean getFill() {
   }
 
   public static final int WEIGHT_FIELD_NUMBER = 3;
-  private int weight_ = 0;
+  private int weight_;
 
   /**
    *
@@ -172,7 +170,6 @@ public boolean getFill() {
    * The stroke weight of the icon. Choose from {100, 200, 300, 400,
    * 500, 600, 700}. If absent, default value is 400. If any other value is
    * specified, the default value is used.
-   *
    * To preview different icon settings, go to
    * [Google Font Icons](https://fonts.google.com/icons) and adjust the
    * settings under **Customize**.
@@ -188,7 +185,7 @@ public int getWeight() {
   }
 
   public static final int GRADE_FIELD_NUMBER = 4;
-  private int grade_ = 0;
+  private int grade_;
 
   /**
    *
@@ -198,7 +195,6 @@ public int getWeight() {
    * granular than adjustments to weight and have a small impact on the size of
    * the symbol. Choose from {-25, 0, 200}. If absent, default value is 0. If
    * any other value is specified, the default value is used.
-   *
    * To preview different icon settings, go to
    * [Google Font Icons](https://fonts.google.com/icons) and adjust the
    * settings under **Customize**.
@@ -404,11 +400,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * 
    * A [Google Material Icon](https://fonts.google.com/icons), which includes over
    * 2500+ options.
-   *
    * For example, to display a [checkbox
    * icon](https://fonts.google.com/icons?selected=Material%20Symbols%20Outlined%3Acheck_box%3AFILL%400%3Bwght%40400%3BGRAD%400%3Bopsz%4048)
    * with customized weight and grade, write the following:
-   *
    * ```
    * {
    *   "name": "check_box",
@@ -417,7 +411,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *   "grade": -25
    * }
    * ```
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -452,11 +445,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       fill_ = false;
+
       weight_ = 0;
+
       grade_ = 0;
+
       return this;
     }
 
@@ -483,29 +479,14 @@ public com.google.apps.card.v1.MaterialIcon build() {
     @java.lang.Override
     public com.google.apps.card.v1.MaterialIcon buildPartial() {
       com.google.apps.card.v1.MaterialIcon result = new com.google.apps.card.v1.MaterialIcon(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
+      result.fill_ = fill_;
+      result.weight_ = weight_;
+      result.grade_ = grade_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.apps.card.v1.MaterialIcon result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.fill_ = fill_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.weight_ = weight_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.grade_ = grade_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -553,7 +534,6 @@ public Builder mergeFrom(com.google.apps.card.v1.MaterialIcon other) {
       if (other == com.google.apps.card.v1.MaterialIcon.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getFill() != false) {
@@ -594,25 +574,25 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 fill_ = input.readBool();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 24:
               {
                 weight_ = input.readInt32();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 32:
               {
                 grade_ = input.readInt32();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             default:
@@ -632,8 +612,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -707,8 +685,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -728,8 +706,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -754,8 +732,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -767,7 +745,6 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      *
      * 
      * Whether the icon renders as filled. Default value is false.
-     *
      * To preview different icon settings, go to
      * [Google Font Icons](https://fonts.google.com/icons) and adjust the
      * settings under **Customize**.
@@ -787,7 +764,6 @@ public boolean getFill() {
      *
      * 
      * Whether the icon renders as filled. Default value is false.
-     *
      * To preview different icon settings, go to
      * [Google Font Icons](https://fonts.google.com/icons) and adjust the
      * settings under **Customize**.
@@ -801,7 +777,6 @@ public boolean getFill() {
     public Builder setFill(boolean value) {
 
       fill_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -811,7 +786,6 @@ public Builder setFill(boolean value) {
      *
      * 
      * Whether the icon renders as filled. Default value is false.
-     *
      * To preview different icon settings, go to
      * [Google Font Icons](https://fonts.google.com/icons) and adjust the
      * settings under **Customize**.
@@ -822,7 +796,7 @@ public Builder setFill(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearFill() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       fill_ = false;
       onChanged();
       return this;
@@ -837,7 +811,6 @@ public Builder clearFill() {
      * The stroke weight of the icon. Choose from {100, 200, 300, 400,
      * 500, 600, 700}. If absent, default value is 400. If any other value is
      * specified, the default value is used.
-     *
      * To preview different icon settings, go to
      * [Google Font Icons](https://fonts.google.com/icons) and adjust the
      * settings under **Customize**.
@@ -859,7 +832,6 @@ public int getWeight() {
      * The stroke weight of the icon. Choose from {100, 200, 300, 400,
      * 500, 600, 700}. If absent, default value is 400. If any other value is
      * specified, the default value is used.
-     *
      * To preview different icon settings, go to
      * [Google Font Icons](https://fonts.google.com/icons) and adjust the
      * settings under **Customize**.
@@ -873,7 +845,6 @@ public int getWeight() {
     public Builder setWeight(int value) {
 
       weight_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -885,7 +856,6 @@ public Builder setWeight(int value) {
      * The stroke weight of the icon. Choose from {100, 200, 300, 400,
      * 500, 600, 700}. If absent, default value is 400. If any other value is
      * specified, the default value is used.
-     *
      * To preview different icon settings, go to
      * [Google Font Icons](https://fonts.google.com/icons) and adjust the
      * settings under **Customize**.
@@ -896,7 +866,7 @@ public Builder setWeight(int value) {
      * @return This builder for chaining.
      */
     public Builder clearWeight() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       weight_ = 0;
       onChanged();
       return this;
@@ -912,7 +882,6 @@ public Builder clearWeight() {
      * granular than adjustments to weight and have a small impact on the size of
      * the symbol. Choose from {-25, 0, 200}. If absent, default value is 0. If
      * any other value is specified, the default value is used.
-     *
      * To preview different icon settings, go to
      * [Google Font Icons](https://fonts.google.com/icons) and adjust the
      * settings under **Customize**.
@@ -935,7 +904,6 @@ public int getGrade() {
      * granular than adjustments to weight and have a small impact on the size of
      * the symbol. Choose from {-25, 0, 200}. If absent, default value is 0. If
      * any other value is specified, the default value is used.
-     *
      * To preview different icon settings, go to
      * [Google Font Icons](https://fonts.google.com/icons) and adjust the
      * settings under **Customize**.
@@ -949,7 +917,6 @@ public int getGrade() {
     public Builder setGrade(int value) {
 
       grade_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -962,7 +929,6 @@ public Builder setGrade(int value) {
      * granular than adjustments to weight and have a small impact on the size of
      * the symbol. Choose from {-25, 0, 200}. If absent, default value is 0. If
      * any other value is specified, the default value is used.
-     *
      * To preview different icon settings, go to
      * [Google Font Icons](https://fonts.google.com/icons) and adjust the
      * settings under **Customize**.
@@ -973,7 +939,7 @@ public Builder setGrade(int value) {
      * @return This builder for chaining.
      */
     public Builder clearGrade() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       grade_ = 0;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/MaterialIconOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/MaterialIconOrBuilder.java
index 37bce652bc..fda491293f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/MaterialIconOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/MaterialIconOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface MaterialIconOrBuilder
@@ -61,7 +60,6 @@ public interface MaterialIconOrBuilder
    *
    * 
    * Whether the icon renders as filled. Default value is false.
-   *
    * To preview different icon settings, go to
    * [Google Font Icons](https://fonts.google.com/icons) and adjust the
    * settings under **Customize**.
@@ -80,7 +78,6 @@ public interface MaterialIconOrBuilder
    * The stroke weight of the icon. Choose from {100, 200, 300, 400,
    * 500, 600, 700}. If absent, default value is 400. If any other value is
    * specified, the default value is used.
-   *
    * To preview different icon settings, go to
    * [Google Font Icons](https://fonts.google.com/icons) and adjust the
    * settings under **Customize**.
@@ -100,7 +97,6 @@ public interface MaterialIconOrBuilder
    * granular than adjustments to weight and have a small impact on the size of
    * the symbol. Choose from {-25, 0, 200}. If absent, default value is 0. If
    * any other value is specified, the default value is used.
-   *
    * To preview different icon settings, go to
    * [Google Font Icons](https://fonts.google.com/icons) and adjust the
    * settings under **Customize**.
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OnClick.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OnClick.java
index 55e7fc1f61..92ee742fa0 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OnClick.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OnClick.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -25,7 +24,6 @@
  * 
  * Represents how to respond when users click an interactive element on
  * a card, such as a button.
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
  * 

@@ -51,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new OnClick();
   }
 
+  @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.apps.card.v1.CardProto.internal_static_google_apps_card_v1_OnClick_descriptor;
   }
@@ -65,8 +68,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   private int dataCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object data_;
 
   public enum DataCase
@@ -241,7 +242,6 @@ public com.google.apps.card.v1.OpenLinkOrBuilder getOpenLinkOrBuilder() {
    * link. This differs from the `open_link` above in that this needs to talk
    * to server to get the link. Thus some preparation work is required for
    * web client to do before the open link action response comes back.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -263,7 +263,6 @@ public boolean hasOpenDynamicLinkAction() {
    * link. This differs from the `open_link` above in that this needs to talk
    * to server to get the link. Thus some preparation work is required for
    * web client to do before the open link action response comes back.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -288,7 +287,6 @@ public com.google.apps.card.v1.Action getOpenDynamicLinkAction() {
    * link. This differs from the `open_link` above in that this needs to talk
    * to server to get the link. Thus some preparation work is required for
    * web client to do before the open link action response comes back.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -310,7 +308,6 @@ public com.google.apps.card.v1.ActionOrBuilder getOpenDynamicLinkActionOrBuilder
    *
    * 
    * A new card is pushed to the card stack after clicking if specified.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -329,7 +326,6 @@ public boolean hasCard() {
    *
    * 
    * A new card is pushed to the card stack after clicking if specified.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -351,7 +347,6 @@ public com.google.apps.card.v1.Card getCard() {
    *
    * 
    * A new card is pushed to the card stack after clicking if specified.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -659,7 +654,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * 
    * Represents how to respond when users click an interactive element on
    * a card, such as a button.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -694,7 +688,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (actionBuilder_ != null) {
         actionBuilder_.clear();
       }
@@ -738,36 +731,44 @@ public com.google.apps.card.v1.OnClick build() {
     @java.lang.Override
     public com.google.apps.card.v1.OnClick buildPartial() {
       com.google.apps.card.v1.OnClick result = new com.google.apps.card.v1.OnClick(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      buildPartialOneofs(result);
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.apps.card.v1.OnClick result) {
-      int from_bitField0_ = bitField0_;
-    }
-
-    private void buildPartialOneofs(com.google.apps.card.v1.OnClick result) {
-      result.dataCase_ = dataCase_;
-      result.data_ = this.data_;
-      if (dataCase_ == 1 && actionBuilder_ != null) {
-        result.data_ = actionBuilder_.build();
+      if (dataCase_ == 1) {
+        if (actionBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = actionBuilder_.build();
+        }
       }
-      if (dataCase_ == 2 && openLinkBuilder_ != null) {
-        result.data_ = openLinkBuilder_.build();
+      if (dataCase_ == 2) {
+        if (openLinkBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = openLinkBuilder_.build();
+        }
       }
-      if (dataCase_ == 3 && openDynamicLinkActionBuilder_ != null) {
-        result.data_ = openDynamicLinkActionBuilder_.build();
+      if (dataCase_ == 3) {
+        if (openDynamicLinkActionBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = openDynamicLinkActionBuilder_.build();
+        }
       }
-      if (dataCase_ == 4 && cardBuilder_ != null) {
-        result.data_ = cardBuilder_.build();
+      if (dataCase_ == 4) {
+        if (cardBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = cardBuilder_.build();
+        }
       }
-      if (dataCase_ == 8 && overflowMenuBuilder_ != null) {
-        result.data_ = overflowMenuBuilder_.build();
+      if (dataCase_ == 8) {
+        if (overflowMenuBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = overflowMenuBuilder_.build();
+        }
       }
+      result.dataCase_ = dataCase_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -934,8 +935,6 @@ public Builder clearData() {
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.apps.card.v1.Action,
             com.google.apps.card.v1.Action.Builder,
@@ -1146,6 +1145,7 @@ public com.google.apps.card.v1.ActionOrBuilder getActionOrBuilder() {
       }
       dataCase_ = 1;
       onChanged();
+      ;
       return actionBuilder_;
     }
 
@@ -1359,6 +1359,7 @@ public com.google.apps.card.v1.OpenLinkOrBuilder getOpenLinkOrBuilder() {
       }
       dataCase_ = 2;
       onChanged();
+      ;
       return openLinkBuilder_;
     }
 
@@ -1376,7 +1377,6 @@ public com.google.apps.card.v1.OpenLinkOrBuilder getOpenLinkOrBuilder() {
      * link. This differs from the `open_link` above in that this needs to talk
      * to server to get the link. Thus some preparation work is required for
      * web client to do before the open link action response comes back.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1398,7 +1398,6 @@ public boolean hasOpenDynamicLinkAction() {
      * link. This differs from the `open_link` above in that this needs to talk
      * to server to get the link. Thus some preparation work is required for
      * web client to do before the open link action response comes back.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1430,7 +1429,6 @@ public com.google.apps.card.v1.Action getOpenDynamicLinkAction() {
      * link. This differs from the `open_link` above in that this needs to talk
      * to server to get the link. Thus some preparation work is required for
      * web client to do before the open link action response comes back.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1459,7 +1457,6 @@ public Builder setOpenDynamicLinkAction(com.google.apps.card.v1.Action value) {
      * link. This differs from the `open_link` above in that this needs to talk
      * to server to get the link. Thus some preparation work is required for
      * web client to do before the open link action response comes back.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1486,7 +1483,6 @@ public Builder setOpenDynamicLinkAction(
      * link. This differs from the `open_link` above in that this needs to talk
      * to server to get the link. Thus some preparation work is required for
      * web client to do before the open link action response comes back.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1523,7 +1519,6 @@ public Builder mergeOpenDynamicLinkAction(com.google.apps.card.v1.Action value)
      * link. This differs from the `open_link` above in that this needs to talk
      * to server to get the link. Thus some preparation work is required for
      * web client to do before the open link action response comes back.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1555,7 +1550,6 @@ public Builder clearOpenDynamicLinkAction() {
      * link. This differs from the `open_link` above in that this needs to talk
      * to server to get the link. Thus some preparation work is required for
      * web client to do before the open link action response comes back.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1574,7 +1568,6 @@ public com.google.apps.card.v1.Action.Builder getOpenDynamicLinkActionBuilder()
      * link. This differs from the `open_link` above in that this needs to talk
      * to server to get the link. Thus some preparation work is required for
      * web client to do before the open link action response comes back.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1601,7 +1594,6 @@ public com.google.apps.card.v1.ActionOrBuilder getOpenDynamicLinkActionOrBuilder
      * link. This differs from the `open_link` above in that this needs to talk
      * to server to get the link. Thus some preparation work is required for
      * web client to do before the open link action response comes back.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1627,6 +1619,7 @@ public com.google.apps.card.v1.ActionOrBuilder getOpenDynamicLinkActionOrBuilder
       }
       dataCase_ = 3;
       onChanged();
+      ;
       return openDynamicLinkActionBuilder_;
     }
 
@@ -1641,7 +1634,6 @@ public com.google.apps.card.v1.ActionOrBuilder getOpenDynamicLinkActionOrBuilder
      *
      * 
      * A new card is pushed to the card stack after clicking if specified.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1660,7 +1652,6 @@ public boolean hasCard() {
      *
      * 
      * A new card is pushed to the card stack after clicking if specified.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1689,7 +1680,6 @@ public com.google.apps.card.v1.Card getCard() {
      *
      * 
      * A new card is pushed to the card stack after clicking if specified.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1715,7 +1705,6 @@ public Builder setCard(com.google.apps.card.v1.Card value) {
      *
      * 
      * A new card is pushed to the card stack after clicking if specified.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1738,7 +1727,6 @@ public Builder setCard(com.google.apps.card.v1.Card.Builder builderForValue) {
      *
      * 
      * A new card is pushed to the card stack after clicking if specified.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1772,7 +1760,6 @@ public Builder mergeCard(com.google.apps.card.v1.Card value) {
      *
      * 
      * A new card is pushed to the card stack after clicking if specified.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1801,7 +1788,6 @@ public Builder clearCard() {
      *
      * 
      * A new card is pushed to the card stack after clicking if specified.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1817,7 +1803,6 @@ public com.google.apps.card.v1.Card.Builder getCardBuilder() {
      *
      * 
      * A new card is pushed to the card stack after clicking if specified.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1841,7 +1826,6 @@ public com.google.apps.card.v1.CardOrBuilder getCardOrBuilder() {
      *
      * 
      * A new card is pushed to the card stack after clicking if specified.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1867,6 +1851,7 @@ public com.google.apps.card.v1.CardOrBuilder getCardOrBuilder() {
       }
       dataCase_ = 4;
       onChanged();
+      ;
       return cardBuilder_;
     }
 
@@ -2081,6 +2066,7 @@ public com.google.apps.card.v1.OverflowMenuOrBuilder getOverflowMenuOrBuilder()
       }
       dataCase_ = 8;
       onChanged();
+      ;
       return overflowMenuBuilder_;
     }
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OnClickOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OnClickOrBuilder.java
index 0064a41501..333535af2a 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OnClickOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OnClickOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface OnClickOrBuilder
@@ -106,7 +105,6 @@ public interface OnClickOrBuilder
    * link. This differs from the `open_link` above in that this needs to talk
    * to server to get the link. Thus some preparation work is required for
    * web client to do before the open link action response comes back.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -125,7 +123,6 @@ public interface OnClickOrBuilder
    * link. This differs from the `open_link` above in that this needs to talk
    * to server to get the link. Thus some preparation work is required for
    * web client to do before the open link action response comes back.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -144,7 +141,6 @@ public interface OnClickOrBuilder
    * link. This differs from the `open_link` above in that this needs to talk
    * to server to get the link. Thus some preparation work is required for
    * web client to do before the open link action response comes back.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -158,7 +154,6 @@ public interface OnClickOrBuilder
    *
    * 
    * A new card is pushed to the card stack after clicking if specified.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -174,7 +169,6 @@ public interface OnClickOrBuilder
    *
    * 
    * A new card is pushed to the card stack after clicking if specified.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -190,7 +184,6 @@ public interface OnClickOrBuilder
    *
    * 
    * A new card is pushed to the card stack after clicking if specified.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -236,5 +229,5 @@ public interface OnClickOrBuilder
    */
   com.google.apps.card.v1.OverflowMenuOrBuilder getOverflowMenuOrBuilder();
 
-  com.google.apps.card.v1.OnClick.DataCase getDataCase();
+  public com.google.apps.card.v1.OnClick.DataCase getDataCase();
 }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OpenLink.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OpenLink.java
index f43a06ba30..d75f3785ed 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OpenLink.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OpenLink.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -24,7 +23,6 @@
  *
  * 
  * Represents an `onClick` event that opens a hyperlink.
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
  * 

@@ -54,6 +52,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new OpenLink();
   }
 
+  @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.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_OpenLink_descriptor;
@@ -77,7 +80,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * overlay (such as a pop-up). The implementation depends on the client
    * platform capabilities, and the value selected might be ignored if the
    * client doesn't support it. `FULL_SIZE` is supported by all clients.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -218,13 +220,10 @@ private OpenAs(int value) {
    *
    * 
    * What the client does when a link opened by an `OnClick` action is closed.
-   *
    * Implementation depends on client platform capabilities. For example, a web
    * browser might open a link in a pop-up window with an `OnClose` handler.
-   *
    * If both `OnOpen` and `OnClose` handlers are set, and the client platform
    * can't support both values, `OnClose` takes precedence.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -247,7 +246,6 @@ public enum OnClose implements com.google.protobuf.ProtocolMessageEnum {
      *
      * 
      * Reloads the card after the child window closes.
-     *
      * If used in conjunction with
      * [`OpenAs.OVERLAY`](https://developers.google.com/workspace/add-ons/reference/rpc/google.apps.card.v1#openas),
      * the child window acts as a modal dialog and the parent card is blocked
@@ -276,7 +274,6 @@ public enum OnClose implements com.google.protobuf.ProtocolMessageEnum {
      *
      * 
      * Reloads the card after the child window closes.
-     *
      * If used in conjunction with
      * [`OpenAs.OVERLAY`](https://developers.google.com/workspace/add-ons/reference/rpc/google.apps.card.v1#openas),
      * the child window acts as a modal dialog and the parent card is blocked
@@ -369,9 +366,7 @@ private OnClose(int value) {
   }
 
   public static final int URL_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object url_ = "";
+  private volatile java.lang.Object url_;
 
   /**
    *
@@ -422,14 +417,13 @@ public com.google.protobuf.ByteString getUrlBytes() {
   }
 
   public static final int OPEN_AS_FIELD_NUMBER = 2;
-  private int openAs_ = 0;
+  private int openAs_;
 
   /**
    *
    *
    * 
    * How to open a link.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -448,7 +442,6 @@ public int getOpenAsValue() {
    *
    * 
    * How to open a link.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -459,13 +452,14 @@ public int getOpenAsValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.OpenLink.OpenAs getOpenAs() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.OpenLink.OpenAs result =
-        com.google.apps.card.v1.OpenLink.OpenAs.forNumber(openAs_);
+        com.google.apps.card.v1.OpenLink.OpenAs.valueOf(openAs_);
     return result == null ? com.google.apps.card.v1.OpenLink.OpenAs.UNRECOGNIZED : result;
   }
 
   public static final int ON_CLOSE_FIELD_NUMBER = 3;
-  private int onClose_ = 0;
+  private int onClose_;
 
   /**
    *
@@ -473,7 +467,6 @@ public com.google.apps.card.v1.OpenLink.OpenAs getOpenAs() {
    * 
    * Whether the client forgets about a link after opening it, or observes it
    * until the window closes.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -493,7 +486,6 @@ public int getOnCloseValue() {
    * 
    * Whether the client forgets about a link after opening it, or observes it
    * until the window closes.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -504,8 +496,9 @@ public int getOnCloseValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.OpenLink.OnClose getOnClose() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.OpenLink.OnClose result =
-        com.google.apps.card.v1.OpenLink.OnClose.forNumber(onClose_);
+        com.google.apps.card.v1.OpenLink.OnClose.valueOf(onClose_);
     return result == null ? com.google.apps.card.v1.OpenLink.OnClose.UNRECOGNIZED : result;
   }
 
@@ -690,7 +683,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * Represents an `onClick` event that opens a hyperlink.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -726,10 +718,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       url_ = "";
+
       openAs_ = 0;
+
       onClose_ = 0;
+
       return this;
     }
 
@@ -756,26 +750,13 @@ public com.google.apps.card.v1.OpenLink build() {
     @java.lang.Override
     public com.google.apps.card.v1.OpenLink buildPartial() {
       com.google.apps.card.v1.OpenLink result = new com.google.apps.card.v1.OpenLink(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.url_ = url_;
+      result.openAs_ = openAs_;
+      result.onClose_ = onClose_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.apps.card.v1.OpenLink result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.url_ = url_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.openAs_ = openAs_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.onClose_ = onClose_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -823,7 +804,6 @@ public Builder mergeFrom(com.google.apps.card.v1.OpenLink other) {
       if (other == com.google.apps.card.v1.OpenLink.getDefaultInstance()) return this;
       if (!other.getUrl().isEmpty()) {
         url_ = other.url_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.openAs_ != 0) {
@@ -861,19 +841,19 @@ public Builder mergeFrom(
             case 10:
               {
                 url_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 openAs_ = input.readEnum();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 24:
               {
                 onClose_ = input.readEnum();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             default:
@@ -893,8 +873,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object url_ = "";
 
     /**
@@ -959,8 +937,8 @@ public Builder setUrl(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       url_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -977,8 +955,8 @@ public Builder setUrl(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearUrl() {
+
       url_ = getDefaultInstance().getUrl();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1000,8 +978,8 @@ public Builder setUrlBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       url_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1013,7 +991,6 @@ public Builder setUrlBytes(com.google.protobuf.ByteString value) {
      *
      * 
      * How to open a link.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1032,7 +1009,6 @@ public int getOpenAsValue() {
      *
      * 
      * How to open a link.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1043,8 +1019,8 @@ public int getOpenAsValue() {
      * @return This builder for chaining.
      */
     public Builder setOpenAsValue(int value) {
+
       openAs_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1054,7 +1030,6 @@ public Builder setOpenAsValue(int value) {
      *
      * 
      * How to open a link.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1065,8 +1040,9 @@ public Builder setOpenAsValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.OpenLink.OpenAs getOpenAs() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.OpenLink.OpenAs result =
-          com.google.apps.card.v1.OpenLink.OpenAs.forNumber(openAs_);
+          com.google.apps.card.v1.OpenLink.OpenAs.valueOf(openAs_);
       return result == null ? com.google.apps.card.v1.OpenLink.OpenAs.UNRECOGNIZED : result;
     }
 
@@ -1075,7 +1051,6 @@ public com.google.apps.card.v1.OpenLink.OpenAs getOpenAs() {
      *
      * 
      * How to open a link.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1089,7 +1064,7 @@ public Builder setOpenAs(com.google.apps.card.v1.OpenLink.OpenAs value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000002;
+
       openAs_ = value.getNumber();
       onChanged();
       return this;
@@ -1100,7 +1075,6 @@ public Builder setOpenAs(com.google.apps.card.v1.OpenLink.OpenAs value) {
      *
      * 
      * How to open a link.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1110,7 +1084,7 @@ public Builder setOpenAs(com.google.apps.card.v1.OpenLink.OpenAs value) {
      * @return This builder for chaining.
      */
     public Builder clearOpenAs() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       openAs_ = 0;
       onChanged();
       return this;
@@ -1124,7 +1098,6 @@ public Builder clearOpenAs() {
      * 
      * Whether the client forgets about a link after opening it, or observes it
      * until the window closes.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1144,7 +1117,6 @@ public int getOnCloseValue() {
      * 
      * Whether the client forgets about a link after opening it, or observes it
      * until the window closes.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1155,8 +1127,8 @@ public int getOnCloseValue() {
      * @return This builder for chaining.
      */
     public Builder setOnCloseValue(int value) {
+
       onClose_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1167,7 +1139,6 @@ public Builder setOnCloseValue(int value) {
      * 
      * Whether the client forgets about a link after opening it, or observes it
      * until the window closes.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1178,8 +1149,9 @@ public Builder setOnCloseValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.OpenLink.OnClose getOnClose() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.OpenLink.OnClose result =
-          com.google.apps.card.v1.OpenLink.OnClose.forNumber(onClose_);
+          com.google.apps.card.v1.OpenLink.OnClose.valueOf(onClose_);
       return result == null ? com.google.apps.card.v1.OpenLink.OnClose.UNRECOGNIZED : result;
     }
 
@@ -1189,7 +1161,6 @@ public com.google.apps.card.v1.OpenLink.OnClose getOnClose() {
      * 
      * Whether the client forgets about a link after opening it, or observes it
      * until the window closes.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1203,7 +1174,7 @@ public Builder setOnClose(com.google.apps.card.v1.OpenLink.OnClose value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000004;
+
       onClose_ = value.getNumber();
       onChanged();
       return this;
@@ -1215,7 +1186,6 @@ public Builder setOnClose(com.google.apps.card.v1.OpenLink.OnClose value) {
      * 
      * Whether the client forgets about a link after opening it, or observes it
      * until the window closes.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -1225,7 +1195,7 @@ public Builder setOnClose(com.google.apps.card.v1.OpenLink.OnClose value) {
      * @return This builder for chaining.
      */
     public Builder clearOnClose() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       onClose_ = 0;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OpenLinkOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OpenLinkOrBuilder.java
index cafa441c8e..5b0ca7593b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OpenLinkOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OpenLinkOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface OpenLinkOrBuilder
@@ -55,7 +54,6 @@ public interface OpenLinkOrBuilder
    *
    * 
    * How to open a link.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -71,7 +69,6 @@ public interface OpenLinkOrBuilder
    *
    * 
    * How to open a link.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -88,7 +85,6 @@ public interface OpenLinkOrBuilder
    * 
    * Whether the client forgets about a link after opening it, or observes it
    * until the window closes.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -105,7 +101,6 @@ public interface OpenLinkOrBuilder
    * 
    * Whether the client forgets about a link after opening it, or observes it
    * until the window closes.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OverflowMenu.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OverflowMenu.java
index d494c817a4..0cff22c4f1 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OverflowMenu.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OverflowMenu.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -28,7 +27,6 @@
  * widget when actions don't fit in the available space. To use, specify this
  * widget in the `OnClick` action of widgets that support it. For example, in a
  * `Button`.
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
  * 

@@ -56,6 +54,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new OverflowMenu();
   }
 
+  @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.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_OverflowMenu_descriptor;
@@ -202,7 +205,6 @@ public interface OverflowMenuItemOrBuilder
    *
    * 
    * An option that users can invoke in an overflow menu.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -230,6 +232,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new OverflowMenuItem();
     }
 
+    @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.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_OverflowMenu_OverflowMenuItem_descriptor;
@@ -245,7 +252,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
               com.google.apps.card.v1.OverflowMenu.OverflowMenuItem.Builder.class);
     }
 
-    private int bitField0_;
     public static final int START_ICON_FIELD_NUMBER = 1;
     private com.google.apps.card.v1.Icon startIcon_;
 
@@ -262,7 +268,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      */
     @java.lang.Override
     public boolean hasStartIcon() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return startIcon_ != null;
     }
 
     /**
@@ -292,13 +298,11 @@ public com.google.apps.card.v1.Icon getStartIcon() {
      */
     @java.lang.Override
     public com.google.apps.card.v1.IconOrBuilder getStartIconOrBuilder() {
-      return startIcon_ == null ? com.google.apps.card.v1.Icon.getDefaultInstance() : startIcon_;
+      return getStartIcon();
     }
 
     public static final int TEXT_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object text_ = "";
+    private volatile java.lang.Object text_;
 
     /**
      *
@@ -366,7 +370,7 @@ public com.google.protobuf.ByteString getTextBytes() {
      */
     @java.lang.Override
     public boolean hasOnClick() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return onClick_ != null;
     }
 
     /**
@@ -400,11 +404,11 @@ public com.google.apps.card.v1.OnClick getOnClick() {
      */
     @java.lang.Override
     public com.google.apps.card.v1.OnClickOrBuilder getOnClickOrBuilder() {
-      return onClick_ == null ? com.google.apps.card.v1.OnClick.getDefaultInstance() : onClick_;
+      return getOnClick();
     }
 
     public static final int DISABLED_FIELD_NUMBER = 4;
-    private boolean disabled_ = false;
+    private boolean disabled_;
 
     /**
      *
@@ -437,13 +441,13 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (startIcon_ != null) {
         output.writeMessage(1, getStartIcon());
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(text_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, text_);
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (onClick_ != null) {
         output.writeMessage(3, getOnClick());
       }
       if (disabled_ != false) {
@@ -458,13 +462,13 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (startIcon_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getStartIcon());
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(text_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, text_);
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (onClick_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getOnClick());
       }
       if (disabled_ != false) {
@@ -627,7 +631,6 @@ protected Builder newBuilderForType(
      *
      * 
      * An option that users can invoke in an overflow menu.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -655,38 +658,31 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.OverflowMenu.OverflowMenuItem.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getStartIconFieldBuilder();
-          getOnClickFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
-        startIcon_ = null;
-        if (startIconBuilder_ != null) {
-          startIconBuilder_.dispose();
+        if (startIconBuilder_ == null) {
+          startIcon_ = null;
+        } else {
+          startIcon_ = null;
           startIconBuilder_ = null;
         }
         text_ = "";
-        onClick_ = null;
-        if (onClickBuilder_ != null) {
-          onClickBuilder_.dispose();
+
+        if (onClickBuilder_ == null) {
+          onClick_ = null;
+        } else {
+          onClick_ = null;
           onClickBuilder_ = null;
         }
         disabled_ = false;
+
         return this;
       }
 
@@ -714,33 +710,22 @@ public com.google.apps.card.v1.OverflowMenu.OverflowMenuItem build() {
       public com.google.apps.card.v1.OverflowMenu.OverflowMenuItem buildPartial() {
         com.google.apps.card.v1.OverflowMenu.OverflowMenuItem result =
             new com.google.apps.card.v1.OverflowMenu.OverflowMenuItem(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        if (startIconBuilder_ == null) {
+          result.startIcon_ = startIcon_;
+        } else {
+          result.startIcon_ = startIconBuilder_.build();
         }
+        result.text_ = text_;
+        if (onClickBuilder_ == null) {
+          result.onClick_ = onClick_;
+        } else {
+          result.onClick_ = onClickBuilder_.build();
+        }
+        result.disabled_ = disabled_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.apps.card.v1.OverflowMenu.OverflowMenuItem result) {
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.startIcon_ = startIconBuilder_ == null ? startIcon_ : startIconBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.text_ = text_;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.onClick_ = onClickBuilder_ == null ? onClick_ : onClickBuilder_.build();
-          to_bitField0_ |= 0x00000002;
-        }
-        if (((from_bitField0_ & 0x00000008) != 0)) {
-          result.disabled_ = disabled_;
-        }
-        result.bitField0_ |= to_bitField0_;
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -794,7 +779,6 @@ public Builder mergeFrom(com.google.apps.card.v1.OverflowMenu.OverflowMenuItem o
         }
         if (!other.getText().isEmpty()) {
           text_ = other.text_;
-          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasOnClick()) {
@@ -832,25 +816,25 @@ public Builder mergeFrom(
               case 10:
                 {
                   input.readMessage(getStartIconFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   text_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               case 26:
                 {
                   input.readMessage(getOnClickFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 26
               case 32:
                 {
                   disabled_ = input.readBool();
-                  bitField0_ |= 0x00000008;
+
                   break;
                 } // case 32
               default:
@@ -870,8 +854,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private com.google.apps.card.v1.Icon startIcon_;
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.apps.card.v1.Icon,
@@ -891,7 +873,7 @@ public Builder mergeFrom(
        * @return Whether the startIcon field is set.
        */
       public boolean hasStartIcon() {
-        return ((bitField0_ & 0x00000001) != 0);
+        return startIconBuilder_ != null || startIcon_ != null;
       }
 
       /**
@@ -930,11 +912,11 @@ public Builder setStartIcon(com.google.apps.card.v1.Icon value) {
             throw new NullPointerException();
           }
           startIcon_ = value;
+          onChanged();
         } else {
           startIconBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+
         return this;
       }
 
@@ -950,11 +932,11 @@ public Builder setStartIcon(com.google.apps.card.v1.Icon value) {
       public Builder setStartIcon(com.google.apps.card.v1.Icon.Builder builderForValue) {
         if (startIconBuilder_ == null) {
           startIcon_ = builderForValue.build();
+          onChanged();
         } else {
           startIconBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+
         return this;
       }
 
@@ -969,20 +951,17 @@ public Builder setStartIcon(com.google.apps.card.v1.Icon.Builder builderForValue
        */
       public Builder mergeStartIcon(com.google.apps.card.v1.Icon value) {
         if (startIconBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)
-              && startIcon_ != null
-              && startIcon_ != com.google.apps.card.v1.Icon.getDefaultInstance()) {
-            getStartIconBuilder().mergeFrom(value);
+          if (startIcon_ != null) {
+            startIcon_ =
+                com.google.apps.card.v1.Icon.newBuilder(startIcon_).mergeFrom(value).buildPartial();
           } else {
             startIcon_ = value;
           }
+          onChanged();
         } else {
           startIconBuilder_.mergeFrom(value);
         }
-        if (startIcon_ != null) {
-          bitField0_ |= 0x00000001;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -996,13 +975,14 @@ public Builder mergeStartIcon(com.google.apps.card.v1.Icon value) {
        * .google.apps.card.v1.Icon start_icon = 1;
        */
       public Builder clearStartIcon() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        startIcon_ = null;
-        if (startIconBuilder_ != null) {
-          startIconBuilder_.dispose();
+        if (startIconBuilder_ == null) {
+          startIcon_ = null;
+          onChanged();
+        } else {
+          startIcon_ = null;
           startIconBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1016,7 +996,7 @@ public Builder clearStartIcon() {
        * .google.apps.card.v1.Icon start_icon = 1;
        */
       public com.google.apps.card.v1.Icon.Builder getStartIconBuilder() {
-        bitField0_ |= 0x00000001;
+
         onChanged();
         return getStartIconFieldBuilder().getBuilder();
       }
@@ -1130,8 +1110,8 @@ public Builder setText(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         text_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1148,8 +1128,8 @@ public Builder setText(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearText() {
+
         text_ = getDefaultInstance().getText();
-        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1171,8 +1151,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         text_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1198,7 +1178,7 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
        * @return Whether the onClick field is set.
        */
       public boolean hasOnClick() {
-        return ((bitField0_ & 0x00000004) != 0);
+        return onClickBuilder_ != null || onClick_ != null;
       }
 
       /**
@@ -1239,11 +1219,11 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick value) {
             throw new NullPointerException();
           }
           onClick_ = value;
+          onChanged();
         } else {
           onClickBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
+
         return this;
       }
 
@@ -1261,11 +1241,11 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick value) {
       public Builder setOnClick(com.google.apps.card.v1.OnClick.Builder builderForValue) {
         if (onClickBuilder_ == null) {
           onClick_ = builderForValue.build();
+          onChanged();
         } else {
           onClickBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
+
         return this;
       }
 
@@ -1282,20 +1262,19 @@ public Builder setOnClick(com.google.apps.card.v1.OnClick.Builder builderForValu
        */
       public Builder mergeOnClick(com.google.apps.card.v1.OnClick value) {
         if (onClickBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) != 0)
-              && onClick_ != null
-              && onClick_ != com.google.apps.card.v1.OnClick.getDefaultInstance()) {
-            getOnClickBuilder().mergeFrom(value);
+          if (onClick_ != null) {
+            onClick_ =
+                com.google.apps.card.v1.OnClick.newBuilder(onClick_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             onClick_ = value;
           }
+          onChanged();
         } else {
           onClickBuilder_.mergeFrom(value);
         }
-        if (onClick_ != null) {
-          bitField0_ |= 0x00000004;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -1311,13 +1290,14 @@ public Builder mergeOnClick(com.google.apps.card.v1.OnClick value) {
        * .google.apps.card.v1.OnClick on_click = 3;
        */
       public Builder clearOnClick() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onClick_ = null;
-        if (onClickBuilder_ != null) {
-          onClickBuilder_.dispose();
+        if (onClickBuilder_ == null) {
+          onClick_ = null;
+          onChanged();
+        } else {
+          onClick_ = null;
           onClickBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1333,7 +1313,7 @@ public Builder clearOnClick() {
        * .google.apps.card.v1.OnClick on_click = 3;
        */
       public com.google.apps.card.v1.OnClick.Builder getOnClickBuilder() {
-        bitField0_ |= 0x00000004;
+
         onChanged();
         return getOnClickFieldBuilder().getBuilder();
       }
@@ -1420,7 +1400,6 @@ public boolean getDisabled() {
       public Builder setDisabled(boolean value) {
 
         disabled_ = value;
-        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1438,7 +1417,7 @@ public Builder setDisabled(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearDisabled() {
-        bitField0_ = (bitField0_ & ~0x00000008);
+
         disabled_ = false;
         onChanged();
         return this;
@@ -1509,8 +1488,6 @@ public com.google.apps.card.v1.OverflowMenu.OverflowMenuItem getDefaultInstanceF
   }
 
   public static final int ITEMS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List items_;
 
   /**
@@ -1754,7 +1731,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * widget when actions don't fit in the available space. To use, specify this
    * widget in the `OnClick` action of widgets that support it. For example, in a
    * `Button`.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -1790,7 +1766,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (itemsBuilder_ == null) {
         items_ = java.util.Collections.emptyList();
       } else {
@@ -1824,15 +1799,7 @@ public com.google.apps.card.v1.OverflowMenu build() {
     @java.lang.Override
     public com.google.apps.card.v1.OverflowMenu buildPartial() {
       com.google.apps.card.v1.OverflowMenu result = new com.google.apps.card.v1.OverflowMenu(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.apps.card.v1.OverflowMenu result) {
+      int from_bitField0_ = bitField0_;
       if (itemsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           items_ = java.util.Collections.unmodifiableList(items_);
@@ -1842,10 +1809,8 @@ private void buildPartialRepeatedFields(com.google.apps.card.v1.OverflowMenu res
       } else {
         result.items_ = itemsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.apps.card.v1.OverflowMenu result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OverflowMenuOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OverflowMenuOrBuilder.java
index 1ea666d385..929b2f18b3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OverflowMenuOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OverflowMenuOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface OverflowMenuOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/SelectionInput.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/SelectionInput.java
index 20fc4c3078..01d6649dd7 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/SelectionInput.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/SelectionInput.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -31,14 +30,11 @@
  * can use this widget to collect data that can be predicted or enumerated. For
  * an example in Google Chat apps, see [Add selectable UI
  * elements](/workspace/chat/design-interactive-card-dialog#add_selectable_ui_elements).
- *
  * Chat apps can process the value of items that users select or input. For
  * details about working with form inputs, see [Receive form
  * data](https://developers.google.com/workspace/chat/read-form-data).
- *
  * To collect undefined or abstract data from users, use
  * the [TextInput][google.apps.card.v1.TextInput] widget.
- *
  * [Google Workspace add-ons
  * and Chat apps](https://developers.google.com/workspace/extend):
  * 

@@ -69,6 +65,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SelectionInput();
   }
 
+  @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.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_SelectionInput_descriptor;
@@ -91,10 +92,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * The format for the items that users can select. Different options support
    * different types of interactions. For example, users can select multiple
    * checkboxes, but can only select one item from a dropdown menu.
-   *
    * Each selection input supports one type of selection. Mixing checkboxes
    * and switches, for example, isn't supported.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -149,22 +148,18 @@ public enum SelectionType implements com.google.protobuf.ProtocolMessageEnum {
      * A menu with a text box. Users can type and select one or more items.
      * For Google Workspace add-ons, you must populate items using a static
      * array of `SelectionItem` objects.
-     *
      * For Google Chat apps, you can also populate items using a dynamic data
      * source and autosuggest items as users type in the menu. For example,
      * users can start typing the name of a Google Chat space and the widget
      * autosuggests the space. To dynamically populate items for a multiselect
      * menu, use one of the following types of data sources:
-     *
      *  * Google Workspace data: Items are populated using data from Google
      *    Workspace, such as Google Workspace users or Google Chat spaces.
      *  * External data: Items are populated from an external data
      *    source outside of Google Workspace.
-     *
      * For examples of how to implement multiselect menus for Chat apps, see
      * [Add a multiselect
      * menu](https://developers.google.com/workspace/chat/design-interactive-card-dialog#multiselect-menu).
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -226,22 +221,18 @@ public enum SelectionType implements com.google.protobuf.ProtocolMessageEnum {
      * A menu with a text box. Users can type and select one or more items.
      * For Google Workspace add-ons, you must populate items using a static
      * array of `SelectionItem` objects.
-     *
      * For Google Chat apps, you can also populate items using a dynamic data
      * source and autosuggest items as users type in the menu. For example,
      * users can start typing the name of a Google Chat space and the widget
      * autosuggests the space. To dynamically populate items for a multiselect
      * menu, use one of the following types of data sources:
-     *
      *  * Google Workspace data: Items are populated using data from Google
      *    Workspace, such as Google Workspace users or Google Chat spaces.
      *  * External data: Items are populated from an external data
      *    source outside of Google Workspace.
-     *
      * For examples of how to implement multiselect menus for Chat apps, see
      * [Add a multiselect
      * menu](https://developers.google.com/workspace/chat/design-interactive-card-dialog#multiselect-menu).
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -374,7 +365,6 @@ public interface SelectionItemOrBuilder
      * 
      * The value associated with this item. The client should use this as a form
      * input value.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -391,7 +381,6 @@ public interface SelectionItemOrBuilder
      * 
      * The value associated with this item. The client should use this as a form
      * input value.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -466,7 +455,7 @@ public interface SelectionItemOrBuilder
      */
     com.google.protobuf.ByteString getBottomTextBytes();
 
-    com.google.apps.card.v1.SelectionInput.SelectionItem.StartIconCase getStartIconCase();
+    public com.google.apps.card.v1.SelectionInput.SelectionItem.StartIconCase getStartIconCase();
   }
 
   /**
@@ -475,7 +464,6 @@ public interface SelectionItemOrBuilder
    * 
    * An item that users can select in a selection input, such as a checkbox
    * or switch. Supports up to 100 items.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -505,6 +493,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new SelectionItem();
     }
 
+    @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.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_SelectionInput_SelectionItem_descriptor;
@@ -521,8 +514,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     private int startIconCase_ = 0;
-
-    @SuppressWarnings("serial")
     private java.lang.Object startIcon_;
 
     public enum StartIconCase
@@ -568,9 +559,7 @@ public StartIconCase getStartIconCase() {
     }
 
     public static final int TEXT_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object text_ = "";
+    private volatile java.lang.Object text_;
 
     /**
      *
@@ -621,9 +610,7 @@ public com.google.protobuf.ByteString getTextBytes() {
     }
 
     public static final int VALUE_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object value_ = "";
+    private volatile java.lang.Object value_;
 
     /**
      *
@@ -631,7 +618,6 @@ public com.google.protobuf.ByteString getTextBytes() {
      * 
      * The value associated with this item. The client should use this as a form
      * input value.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -659,7 +645,6 @@ public java.lang.String getValue() {
      * 
      * The value associated with this item. The client should use this as a form
      * input value.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -682,7 +667,7 @@ public com.google.protobuf.ByteString getValueBytes() {
     }
 
     public static final int SELECTED_FIELD_NUMBER = 3;
-    private boolean selected_ = false;
+    private boolean selected_;
 
     /**
      *
@@ -758,9 +743,7 @@ public com.google.protobuf.ByteString getStartIconUriBytes() {
     }
 
     public static final int BOTTOM_TEXT_FIELD_NUMBER = 5;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object bottomText_ = "";
+    private volatile java.lang.Object bottomText_;
 
     /**
      *
@@ -1029,7 +1012,6 @@ protected Builder newBuilderForType(
      * 
      * An item that users can select in a selection input, such as a checkbox
      * or switch. Supports up to 100 items.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -1066,11 +1048,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         text_ = "";
+
         value_ = "";
+
         selected_ = false;
+
         bottomText_ = "";
+
         startIconCase_ = 0;
         startIcon_ = null;
         return this;
@@ -1100,35 +1085,18 @@ public com.google.apps.card.v1.SelectionInput.SelectionItem build() {
       public com.google.apps.card.v1.SelectionInput.SelectionItem buildPartial() {
         com.google.apps.card.v1.SelectionInput.SelectionItem result =
             new com.google.apps.card.v1.SelectionInput.SelectionItem(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        result.text_ = text_;
+        result.value_ = value_;
+        result.selected_ = selected_;
+        if (startIconCase_ == 4) {
+          result.startIcon_ = startIcon_;
         }
-        buildPartialOneofs(result);
+        result.bottomText_ = bottomText_;
+        result.startIconCase_ = startIconCase_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.apps.card.v1.SelectionInput.SelectionItem result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.text_ = text_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.value_ = value_;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.selected_ = selected_;
-        }
-        if (((from_bitField0_ & 0x00000010) != 0)) {
-          result.bottomText_ = bottomText_;
-        }
-      }
-
-      private void buildPartialOneofs(com.google.apps.card.v1.SelectionInput.SelectionItem result) {
-        result.startIconCase_ = startIconCase_;
-        result.startIcon_ = this.startIcon_;
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1179,12 +1147,10 @@ public Builder mergeFrom(com.google.apps.card.v1.SelectionInput.SelectionItem ot
           return this;
         if (!other.getText().isEmpty()) {
           text_ = other.text_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getValue().isEmpty()) {
           value_ = other.value_;
-          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.getSelected() != false) {
@@ -1192,7 +1158,6 @@ public Builder mergeFrom(com.google.apps.card.v1.SelectionInput.SelectionItem ot
         }
         if (!other.getBottomText().isEmpty()) {
           bottomText_ = other.bottomText_;
-          bitField0_ |= 0x00000010;
           onChanged();
         }
         switch (other.getStartIconCase()) {
@@ -1237,19 +1202,19 @@ public Builder mergeFrom(
               case 10:
                 {
                   text_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   value_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               case 24:
                 {
                   selected_ = input.readBool();
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 24
               case 34:
@@ -1262,7 +1227,7 @@ public Builder mergeFrom(
               case 42:
                 {
                   bottomText_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000010;
+
                   break;
                 } // case 42
               default:
@@ -1296,8 +1261,6 @@ public Builder clearStartIcon() {
         return this;
       }
 
-      private int bitField0_;
-
       private java.lang.Object text_ = "";
 
       /**
@@ -1362,8 +1325,8 @@ public Builder setText(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         text_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1380,8 +1343,8 @@ public Builder setText(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearText() {
+
         text_ = getDefaultInstance().getText();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1403,8 +1366,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         text_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1417,7 +1380,6 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
        * 
        * The value associated with this item. The client should use this as a form
        * input value.
-       *
        * For details about working with form inputs, see [Receive form
        * data](https://developers.google.com/workspace/chat/read-form-data).
        * 

@@ -1444,7 +1406,6 @@ public java.lang.String getValue() {
        * 
        * The value associated with this item. The client should use this as a form
        * input value.
-       *
        * For details about working with form inputs, see [Receive form
        * data](https://developers.google.com/workspace/chat/read-form-data).
        * 

@@ -1471,7 +1432,6 @@ public com.google.protobuf.ByteString getValueBytes() {
        * 
        * The value associated with this item. The client should use this as a form
        * input value.
-       *
        * For details about working with form inputs, see [Receive form
        * data](https://developers.google.com/workspace/chat/read-form-data).
        * 

@@ -1485,8 +1445,8 @@ public Builder setValue(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         value_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1497,7 +1457,6 @@ public Builder setValue(java.lang.String value) {
        * 
        * The value associated with this item. The client should use this as a form
        * input value.
-       *
        * For details about working with form inputs, see [Receive form
        * data](https://developers.google.com/workspace/chat/read-form-data).
        * 

@@ -1507,8 +1466,8 @@ public Builder setValue(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearValue() {
+
         value_ = getDefaultInstance().getValue();
-        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1519,7 +1478,6 @@ public Builder clearValue() {
        * 
        * The value associated with this item. The client should use this as a form
        * input value.
-       *
        * For details about working with form inputs, see [Receive form
        * data](https://developers.google.com/workspace/chat/read-form-data).
        * 

@@ -1534,8 +1492,8 @@ public Builder setValueBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         value_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1577,7 +1535,6 @@ public boolean getSelected() {
       public Builder setSelected(boolean value) {
 
         selected_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1596,7 +1553,7 @@ public Builder setSelected(boolean value) {
        * @return This builder for chaining.
        */
       public Builder clearSelected() {
-        bitField0_ = (bitField0_ & ~0x00000004);
+
         selected_ = false;
         onChanged();
         return this;
@@ -1772,8 +1729,8 @@ public Builder setBottomText(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         bottomText_ = value;
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1791,8 +1748,8 @@ public Builder setBottomText(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearBottomText() {
+
         bottomText_ = getDefaultInstance().getBottomText();
-        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
       }
@@ -1815,8 +1772,8 @@ public Builder setBottomTextBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         bottomText_ = value;
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1939,7 +1896,8 @@ public interface PlatformDataSourceOrBuilder
     com.google.apps.card.v1.SelectionInput.PlatformDataSource.CommonDataSource
         getCommonDataSource();
 
-    com.google.apps.card.v1.SelectionInput.PlatformDataSource.DataSourceCase getDataSourceCase();
+    public com.google.apps.card.v1.SelectionInput.PlatformDataSource.DataSourceCase
+        getDataSourceCase();
   }
 
   /**
@@ -1950,7 +1908,6 @@ public interface PlatformDataSourceOrBuilder
    * [`SelectionInput`][google.apps.card.v1.SelectionInput] widget that uses a
    * multiselect menu, a data source from Google Workspace. Used to populate
    * items in a multiselect menu.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -1975,6 +1932,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new PlatformDataSource();
     }
 
+    @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.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_SelectionInput_PlatformDataSource_descriptor;
@@ -1997,7 +1959,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      * A data source shared by all [Google Workspace
      * applications]
      * (https://developers.google.com/workspace/chat/api/reference/rest/v1/HostApp).
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -2138,8 +2099,6 @@ private CommonDataSource(int value) {
     }
 
     private int dataSourceCase_ = 0;
-
-    @SuppressWarnings("serial")
     private java.lang.Object dataSource_;
 
     public enum DataSourceCase
@@ -2242,8 +2201,9 @@ public int getCommonDataSourceValue() {
     public com.google.apps.card.v1.SelectionInput.PlatformDataSource.CommonDataSource
         getCommonDataSource() {
       if (dataSourceCase_ == 1) {
+        @SuppressWarnings("deprecation")
         com.google.apps.card.v1.SelectionInput.PlatformDataSource.CommonDataSource result =
-            com.google.apps.card.v1.SelectionInput.PlatformDataSource.CommonDataSource.forNumber(
+            com.google.apps.card.v1.SelectionInput.PlatformDataSource.CommonDataSource.valueOf(
                 (java.lang.Integer) dataSource_);
         return result == null
             ? com.google.apps.card.v1.SelectionInput.PlatformDataSource.CommonDataSource
@@ -2438,7 +2398,6 @@ protected Builder newBuilderForType(
      * [`SelectionInput`][google.apps.card.v1.SelectionInput] widget that uses a
      * multiselect menu, a data source from Google Workspace. Used to populate
      * items in a multiselect menu.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -2474,7 +2433,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         dataSourceCase_ = 0;
         dataSource_ = null;
         return this;
@@ -2504,24 +2462,14 @@ public com.google.apps.card.v1.SelectionInput.PlatformDataSource build() {
       public com.google.apps.card.v1.SelectionInput.PlatformDataSource buildPartial() {
         com.google.apps.card.v1.SelectionInput.PlatformDataSource result =
             new com.google.apps.card.v1.SelectionInput.PlatformDataSource(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        if (dataSourceCase_ == 1) {
+          result.dataSource_ = dataSource_;
         }
-        buildPartialOneofs(result);
+        result.dataSourceCase_ = dataSourceCase_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.apps.card.v1.SelectionInput.PlatformDataSource result) {
-        int from_bitField0_ = bitField0_;
-      }
-
-      private void buildPartialOneofs(
-          com.google.apps.card.v1.SelectionInput.PlatformDataSource result) {
-        result.dataSourceCase_ = dataSourceCase_;
-        result.dataSource_ = this.dataSource_;
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -2645,8 +2593,6 @@ public Builder clearDataSource() {
         return this;
       }
 
-      private int bitField0_;
-
       /**
        *
        *
@@ -2728,8 +2674,9 @@ public Builder setCommonDataSourceValue(int value) {
       public com.google.apps.card.v1.SelectionInput.PlatformDataSource.CommonDataSource
           getCommonDataSource() {
         if (dataSourceCase_ == 1) {
+          @SuppressWarnings("deprecation")
           com.google.apps.card.v1.SelectionInput.PlatformDataSource.CommonDataSource result =
-              com.google.apps.card.v1.SelectionInput.PlatformDataSource.CommonDataSource.forNumber(
+              com.google.apps.card.v1.SelectionInput.PlatformDataSource.CommonDataSource.valueOf(
                   (java.lang.Integer) dataSource_);
           return result == null
               ? com.google.apps.card.v1.SelectionInput.PlatformDataSource.CommonDataSource
@@ -2854,8 +2801,6 @@ public com.google.apps.card.v1.SelectionInput.PlatformDataSource getDefaultInsta
 
   private int bitField0_;
   private int multiSelectDataSourceCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object multiSelectDataSource_;
 
   public enum MultiSelectDataSourceCase
@@ -2904,9 +2849,7 @@ public MultiSelectDataSourceCase getMultiSelectDataSourceCase() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -2914,7 +2857,6 @@ public MultiSelectDataSourceCase getMultiSelectDataSourceCase() {
    * 
    * Required. The name that identifies the selection input in a form input
    * event.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -2942,7 +2884,6 @@ public java.lang.String getName() {
    * 
    * Required. The name that identifies the selection input in a form input
    * event.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -2965,9 +2906,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int LABEL_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object label_ = "";
+  private volatile java.lang.Object label_;
 
   /**
    *
@@ -2975,7 +2914,6 @@ public com.google.protobuf.ByteString getNameBytes() {
    * 
    * The text that appears above the selection input field in the user
    * interface.
-   *
    * Specify text that helps the user enter the information your app needs.
    * For example, if users are selecting the urgency of a work ticket from a
    * drop-down menu, the label might be "Urgency" or "Select urgency".
@@ -3004,7 +2942,6 @@ public java.lang.String getLabel() {
    * 
    * The text that appears above the selection input field in the user
    * interface.
-   *
    * Specify text that helps the user enter the information your app needs.
    * For example, if users are selecting the urgency of a work ticket from a
    * drop-down menu, the label might be "Urgency" or "Select urgency".
@@ -3028,7 +2965,7 @@ public com.google.protobuf.ByteString getLabelBytes() {
   }
 
   public static final int TYPE_FIELD_NUMBER = 3;
-  private int type_ = 0;
+  private int type_;
 
   /**
    *
@@ -3065,16 +3002,15 @@ public int getTypeValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.SelectionInput.SelectionType getType() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.SelectionInput.SelectionType result =
-        com.google.apps.card.v1.SelectionInput.SelectionType.forNumber(type_);
+        com.google.apps.card.v1.SelectionInput.SelectionType.valueOf(type_);
     return result == null
         ? com.google.apps.card.v1.SelectionInput.SelectionType.UNRECOGNIZED
         : result;
   }
 
   public static final int ITEMS_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
   private java.util.List items_;
 
   /**
@@ -3163,7 +3099,6 @@ public com.google.apps.card.v1.SelectionInput.SelectionItemOrBuilder getItemsOrB
    * 
    * If specified, the form is submitted when the selection changes. If not
    * specified, you must specify a separate button that submits the form.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -3174,7 +3109,7 @@ public com.google.apps.card.v1.SelectionInput.SelectionItemOrBuilder getItemsOrB
    */
   @java.lang.Override
   public boolean hasOnChangeAction() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return onChangeAction_ != null;
   }
 
   /**
@@ -3183,7 +3118,6 @@ public boolean hasOnChangeAction() {
    * 
    * If specified, the form is submitted when the selection changes. If not
    * specified, you must specify a separate button that submits the form.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -3205,7 +3139,6 @@ public com.google.apps.card.v1.Action getOnChangeAction() {
    * 
    * If specified, the form is submitted when the selection changes. If not
    * specified, you must specify a separate button that submits the form.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -3214,13 +3147,11 @@ public com.google.apps.card.v1.Action getOnChangeAction() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.ActionOrBuilder getOnChangeActionOrBuilder() {
-    return onChangeAction_ == null
-        ? com.google.apps.card.v1.Action.getDefaultInstance()
-        : onChangeAction_;
+    return getOnChangeAction();
   }
 
   public static final int MULTI_SELECT_MAX_SELECTED_ITEMS_FIELD_NUMBER = 6;
-  private int multiSelectMaxSelectedItems_ = 0;
+  private int multiSelectMaxSelectedItems_;
 
   /**
    *
@@ -3236,7 +3167,7 @@ public com.google.apps.card.v1.ActionOrBuilder getOnChangeActionOrBuilder() {
    */
   @java.lang.Override
   public boolean hasMultiSelectMaxSelectedItems() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return ((bitField0_ & 0x00000001) != 0);
   }
 
   /**
@@ -3257,7 +3188,7 @@ public int getMultiSelectMaxSelectedItems() {
   }
 
   public static final int MULTI_SELECT_MIN_QUERY_LENGTH_FIELD_NUMBER = 7;
-  private int multiSelectMinQueryLength_ = 0;
+  private int multiSelectMinQueryLength_;
 
   /**
    *
@@ -3265,9 +3196,7 @@ public int getMultiSelectMaxSelectedItems() {
    * 
    * For multiselect menus, the number of text characters that a user inputs
    * before the menu returns suggested selection items.
-   *
    * If unset, the multiselect menu uses the following default values:
-   *
    * * If the menu uses a static array of `SelectionInput` items, defaults to
    *   0 characters and immediately populates items from the array.
    * * If the menu uses a dynamic data source (`multi_select_data_source`),
@@ -3419,10 +3348,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < items_.size(); i++) {
       output.writeMessage(4, items_.get(i));
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (onChangeAction_ != null) {
       output.writeMessage(5, getOnChangeAction());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeInt32(6, multiSelectMaxSelectedItems_);
     }
     if (multiSelectMinQueryLength_ != 0) {
@@ -3456,10 +3385,10 @@ public int getSerializedSize() {
     for (int i = 0; i < items_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, items_.get(i));
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (onChangeAction_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getOnChangeAction());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size +=
           com.google.protobuf.CodedOutputStream.computeInt32Size(6, multiSelectMaxSelectedItems_);
     }
@@ -3672,14 +3601,11 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * can use this widget to collect data that can be predicted or enumerated. For
    * an example in Google Chat apps, see [Add selectable UI
    * elements](/workspace/chat/design-interactive-card-dialog#add_selectable_ui_elements).
-   *
    * Chat apps can process the value of items that users select or input. For
    * details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
-   *
    * To collect undefined or abstract data from users, use
    * the [TextInput][google.apps.card.v1.TextInput] widget.
-   *
    * [Google Workspace add-ons
    * and Chat apps](https://developers.google.com/workspace/extend):
    * 

@@ -3706,43 +3632,38 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.SelectionInput.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getItemsFieldBuilder();
-        getOnChangeActionFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       label_ = "";
+
       type_ = 0;
+
       if (itemsBuilder_ == null) {
         items_ = java.util.Collections.emptyList();
       } else {
         items_ = null;
         itemsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000008);
-      onChangeAction_ = null;
-      if (onChangeActionBuilder_ != null) {
-        onChangeActionBuilder_.dispose();
+      bitField0_ = (bitField0_ & ~0x00000001);
+      if (onChangeActionBuilder_ == null) {
+        onChangeAction_ = null;
+      } else {
+        onChangeAction_ = null;
         onChangeActionBuilder_ = null;
       }
       multiSelectMaxSelectedItems_ = 0;
+      bitField0_ = (bitField0_ & ~0x00000002);
       multiSelectMinQueryLength_ = 0;
+
       if (externalDataSourceBuilder_ != null) {
         externalDataSourceBuilder_.clear();
       }
@@ -3778,63 +3699,48 @@ public com.google.apps.card.v1.SelectionInput build() {
     public com.google.apps.card.v1.SelectionInput buildPartial() {
       com.google.apps.card.v1.SelectionInput result =
           new com.google.apps.card.v1.SelectionInput(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      buildPartialOneofs(result);
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.apps.card.v1.SelectionInput result) {
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      result.name_ = name_;
+      result.label_ = label_;
+      result.type_ = type_;
       if (itemsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           items_ = java.util.Collections.unmodifiableList(items_);
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.items_ = items_;
       } else {
         result.items_ = itemsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.apps.card.v1.SelectionInput result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
+      if (onChangeActionBuilder_ == null) {
+        result.onChangeAction_ = onChangeAction_;
+      } else {
+        result.onChangeAction_ = onChangeActionBuilder_.build();
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.label_ = label_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.type_ = type_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.onChangeAction_ =
-            onChangeActionBuilder_ == null ? onChangeAction_ : onChangeActionBuilder_.build();
+        result.multiSelectMaxSelectedItems_ = multiSelectMaxSelectedItems_;
         to_bitField0_ |= 0x00000001;
       }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.multiSelectMaxSelectedItems_ = multiSelectMaxSelectedItems_;
-        to_bitField0_ |= 0x00000002;
+      result.multiSelectMinQueryLength_ = multiSelectMinQueryLength_;
+      if (multiSelectDataSourceCase_ == 8) {
+        if (externalDataSourceBuilder_ == null) {
+          result.multiSelectDataSource_ = multiSelectDataSource_;
+        } else {
+          result.multiSelectDataSource_ = externalDataSourceBuilder_.build();
+        }
       }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.multiSelectMinQueryLength_ = multiSelectMinQueryLength_;
+      if (multiSelectDataSourceCase_ == 9) {
+        if (platformDataSourceBuilder_ == null) {
+          result.multiSelectDataSource_ = multiSelectDataSource_;
+        } else {
+          result.multiSelectDataSource_ = platformDataSourceBuilder_.build();
+        }
       }
-      result.bitField0_ |= to_bitField0_;
-    }
-
-    private void buildPartialOneofs(com.google.apps.card.v1.SelectionInput result) {
+      result.bitField0_ = to_bitField0_;
       result.multiSelectDataSourceCase_ = multiSelectDataSourceCase_;
-      result.multiSelectDataSource_ = this.multiSelectDataSource_;
-      if (multiSelectDataSourceCase_ == 8 && externalDataSourceBuilder_ != null) {
-        result.multiSelectDataSource_ = externalDataSourceBuilder_.build();
-      }
-      if (multiSelectDataSourceCase_ == 9 && platformDataSourceBuilder_ != null) {
-        result.multiSelectDataSource_ = platformDataSourceBuilder_.build();
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -3884,12 +3790,10 @@ public Builder mergeFrom(com.google.apps.card.v1.SelectionInput other) {
       if (other == com.google.apps.card.v1.SelectionInput.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLabel().isEmpty()) {
         label_ = other.label_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.type_ != 0) {
@@ -3899,7 +3803,7 @@ public Builder mergeFrom(com.google.apps.card.v1.SelectionInput other) {
         if (!other.items_.isEmpty()) {
           if (items_.isEmpty()) {
             items_ = other.items_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureItemsIsMutable();
             items_.addAll(other.items_);
@@ -3912,7 +3816,7 @@ public Builder mergeFrom(com.google.apps.card.v1.SelectionInput other) {
             itemsBuilder_.dispose();
             itemsBuilder_ = null;
             items_ = other.items_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000001);
             itemsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getItemsFieldBuilder()
@@ -3976,19 +3880,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 label_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 24:
               {
                 type_ = input.readEnum();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 34:
@@ -4008,19 +3912,19 @@ public Builder mergeFrom(
             case 42:
               {
                 input.readMessage(getOnChangeActionFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 42
             case 48:
               {
                 multiSelectMaxSelectedItems_ = input.readInt32();
-                bitField0_ |= 0x00000020;
+                bitField0_ |= 0x00000002;
                 break;
               } // case 48
             case 56:
               {
                 multiSelectMinQueryLength_ = input.readInt32();
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 56
             case 66:
@@ -4078,7 +3982,6 @@ public Builder clearMultiSelectDataSource() {
      * 
      * Required. The name that identifies the selection input in a form input
      * event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -4105,7 +4008,6 @@ public java.lang.String getName() {
      * 
      * Required. The name that identifies the selection input in a form input
      * event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -4132,7 +4034,6 @@ public com.google.protobuf.ByteString getNameBytes() {
      * 
      * Required. The name that identifies the selection input in a form input
      * event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -4146,8 +4047,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -4158,7 +4059,6 @@ public Builder setName(java.lang.String value) {
      * 
      * Required. The name that identifies the selection input in a form input
      * event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -4168,8 +4068,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -4180,7 +4080,6 @@ public Builder clearName() {
      * 
      * Required. The name that identifies the selection input in a form input
      * event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -4195,8 +4094,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -4209,7 +4108,6 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * 
      * The text that appears above the selection input field in the user
      * interface.
-     *
      * Specify text that helps the user enter the information your app needs.
      * For example, if users are selecting the urgency of a work ticket from a
      * drop-down menu, the label might be "Urgency" or "Select urgency".
@@ -4237,7 +4135,6 @@ public java.lang.String getLabel() {
      * 
      * The text that appears above the selection input field in the user
      * interface.
-     *
      * Specify text that helps the user enter the information your app needs.
      * For example, if users are selecting the urgency of a work ticket from a
      * drop-down menu, the label might be "Urgency" or "Select urgency".
@@ -4265,7 +4162,6 @@ public com.google.protobuf.ByteString getLabelBytes() {
      * 
      * The text that appears above the selection input field in the user
      * interface.
-     *
      * Specify text that helps the user enter the information your app needs.
      * For example, if users are selecting the urgency of a work ticket from a
      * drop-down menu, the label might be "Urgency" or "Select urgency".
@@ -4280,8 +4176,8 @@ public Builder setLabel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       label_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -4292,7 +4188,6 @@ public Builder setLabel(java.lang.String value) {
      * 
      * The text that appears above the selection input field in the user
      * interface.
-     *
      * Specify text that helps the user enter the information your app needs.
      * For example, if users are selecting the urgency of a work ticket from a
      * drop-down menu, the label might be "Urgency" or "Select urgency".
@@ -4303,8 +4198,8 @@ public Builder setLabel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLabel() {
+
       label_ = getDefaultInstance().getLabel();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -4315,7 +4210,6 @@ public Builder clearLabel() {
      * 
      * The text that appears above the selection input field in the user
      * interface.
-     *
      * Specify text that helps the user enter the information your app needs.
      * For example, if users are selecting the urgency of a work ticket from a
      * drop-down menu, the label might be "Urgency" or "Select urgency".
@@ -4331,8 +4225,8 @@ public Builder setLabelBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       label_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -4374,8 +4268,8 @@ public int getTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setTypeValue(int value) {
+
       type_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -4396,8 +4290,9 @@ public Builder setTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.SelectionInput.SelectionType getType() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.SelectionInput.SelectionType result =
-          com.google.apps.card.v1.SelectionInput.SelectionType.forNumber(type_);
+          com.google.apps.card.v1.SelectionInput.SelectionType.valueOf(type_);
       return result == null
           ? com.google.apps.card.v1.SelectionInput.SelectionType.UNRECOGNIZED
           : result;
@@ -4422,7 +4317,7 @@ public Builder setType(com.google.apps.card.v1.SelectionInput.SelectionType valu
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000004;
+
       type_ = value.getNumber();
       onChanged();
       return this;
@@ -4443,7 +4338,7 @@ public Builder setType(com.google.apps.card.v1.SelectionInput.SelectionType valu
      * @return This builder for chaining.
      */
     public Builder clearType() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       type_ = 0;
       onChanged();
       return this;
@@ -4453,10 +4348,10 @@ public Builder clearType() {
         java.util.Collections.emptyList();
 
     private void ensureItemsIsMutable() {
-      if (!((bitField0_ & 0x00000008) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         items_ =
             new java.util.ArrayList(items_);
-        bitField0_ |= 0x00000008;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -4693,7 +4588,7 @@ public Builder addAllItems(
     public Builder clearItems() {
       if (itemsBuilder_ == null) {
         items_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         itemsBuilder_.clear();
@@ -4831,7 +4726,7 @@ public com.google.apps.card.v1.SelectionInput.SelectionItem.Builder addItemsBuil
                 com.google.apps.card.v1.SelectionInput.SelectionItem,
                 com.google.apps.card.v1.SelectionInput.SelectionItem.Builder,
                 com.google.apps.card.v1.SelectionInput.SelectionItemOrBuilder>(
-                items_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
+                items_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         items_ = null;
       }
       return itemsBuilder_;
@@ -4850,7 +4745,6 @@ public com.google.apps.card.v1.SelectionInput.SelectionItem.Builder addItemsBuil
      * 
      * If specified, the form is submitted when the selection changes. If not
      * specified, you must specify a separate button that submits the form.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -4860,7 +4754,7 @@ public com.google.apps.card.v1.SelectionInput.SelectionItem.Builder addItemsBuil
      * @return Whether the onChangeAction field is set.
      */
     public boolean hasOnChangeAction() {
-      return ((bitField0_ & 0x00000010) != 0);
+      return onChangeActionBuilder_ != null || onChangeAction_ != null;
     }
 
     /**
@@ -4869,7 +4763,6 @@ public boolean hasOnChangeAction() {
      * 
      * If specified, the form is submitted when the selection changes. If not
      * specified, you must specify a separate button that submits the form.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -4894,7 +4787,6 @@ public com.google.apps.card.v1.Action getOnChangeAction() {
      * 
      * If specified, the form is submitted when the selection changes. If not
      * specified, you must specify a separate button that submits the form.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -4907,11 +4799,11 @@ public Builder setOnChangeAction(com.google.apps.card.v1.Action value) {
           throw new NullPointerException();
         }
         onChangeAction_ = value;
+        onChanged();
       } else {
         onChangeActionBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -4921,7 +4813,6 @@ public Builder setOnChangeAction(com.google.apps.card.v1.Action value) {
      * 
      * If specified, the form is submitted when the selection changes. If not
      * specified, you must specify a separate button that submits the form.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -4931,11 +4822,11 @@ public Builder setOnChangeAction(com.google.apps.card.v1.Action value) {
     public Builder setOnChangeAction(com.google.apps.card.v1.Action.Builder builderForValue) {
       if (onChangeActionBuilder_ == null) {
         onChangeAction_ = builderForValue.build();
+        onChanged();
       } else {
         onChangeActionBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -4945,7 +4836,6 @@ public Builder setOnChangeAction(com.google.apps.card.v1.Action.Builder builderF
      * 
      * If specified, the form is submitted when the selection changes. If not
      * specified, you must specify a separate button that submits the form.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -4954,20 +4844,19 @@ public Builder setOnChangeAction(com.google.apps.card.v1.Action.Builder builderF
      */
     public Builder mergeOnChangeAction(com.google.apps.card.v1.Action value) {
       if (onChangeActionBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)
-            && onChangeAction_ != null
-            && onChangeAction_ != com.google.apps.card.v1.Action.getDefaultInstance()) {
-          getOnChangeActionBuilder().mergeFrom(value);
+        if (onChangeAction_ != null) {
+          onChangeAction_ =
+              com.google.apps.card.v1.Action.newBuilder(onChangeAction_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           onChangeAction_ = value;
         }
+        onChanged();
       } else {
         onChangeActionBuilder_.mergeFrom(value);
       }
-      if (onChangeAction_ != null) {
-        bitField0_ |= 0x00000010;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -4977,7 +4866,6 @@ public Builder mergeOnChangeAction(com.google.apps.card.v1.Action value) {
      * 
      * If specified, the form is submitted when the selection changes. If not
      * specified, you must specify a separate button that submits the form.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -4985,13 +4873,14 @@ public Builder mergeOnChangeAction(com.google.apps.card.v1.Action value) {
      * .google.apps.card.v1.Action on_change_action = 5;
      */
     public Builder clearOnChangeAction() {
-      bitField0_ = (bitField0_ & ~0x00000010);
-      onChangeAction_ = null;
-      if (onChangeActionBuilder_ != null) {
-        onChangeActionBuilder_.dispose();
+      if (onChangeActionBuilder_ == null) {
+        onChangeAction_ = null;
+        onChanged();
+      } else {
+        onChangeAction_ = null;
         onChangeActionBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -5001,7 +4890,6 @@ public Builder clearOnChangeAction() {
      * 
      * If specified, the form is submitted when the selection changes. If not
      * specified, you must specify a separate button that submits the form.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -5009,7 +4897,7 @@ public Builder clearOnChangeAction() {
      * .google.apps.card.v1.Action on_change_action = 5;
      */
     public com.google.apps.card.v1.Action.Builder getOnChangeActionBuilder() {
-      bitField0_ |= 0x00000010;
+
       onChanged();
       return getOnChangeActionFieldBuilder().getBuilder();
     }
@@ -5020,7 +4908,6 @@ public com.google.apps.card.v1.Action.Builder getOnChangeActionBuilder() {
      * 
      * If specified, the form is submitted when the selection changes. If not
      * specified, you must specify a separate button that submits the form.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -5043,7 +4930,6 @@ public com.google.apps.card.v1.ActionOrBuilder getOnChangeActionOrBuilder() {
      * 
      * If specified, the form is submitted when the selection changes. If not
      * specified, you must specify a separate button that submits the form.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -5083,7 +4969,7 @@ public com.google.apps.card.v1.ActionOrBuilder getOnChangeActionOrBuilder() {
      */
     @java.lang.Override
     public boolean hasMultiSelectMaxSelectedItems() {
-      return ((bitField0_ & 0x00000020) != 0);
+      return ((bitField0_ & 0x00000002) != 0);
     }
 
     /**
@@ -5117,9 +5003,8 @@ public int getMultiSelectMaxSelectedItems() {
      * @return This builder for chaining.
      */
     public Builder setMultiSelectMaxSelectedItems(int value) {
-
+      bitField0_ |= 0x00000002;
       multiSelectMaxSelectedItems_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -5137,7 +5022,7 @@ public Builder setMultiSelectMaxSelectedItems(int value) {
      * @return This builder for chaining.
      */
     public Builder clearMultiSelectMaxSelectedItems() {
-      bitField0_ = (bitField0_ & ~0x00000020);
+      bitField0_ = (bitField0_ & ~0x00000002);
       multiSelectMaxSelectedItems_ = 0;
       onChanged();
       return this;
@@ -5151,9 +5036,7 @@ public Builder clearMultiSelectMaxSelectedItems() {
      * 
      * For multiselect menus, the number of text characters that a user inputs
      * before the menu returns suggested selection items.
-     *
      * If unset, the multiselect menu uses the following default values:
-     *
      * * If the menu uses a static array of `SelectionInput` items, defaults to
      *   0 characters and immediately populates items from the array.
      * * If the menu uses a dynamic data source (`multi_select_data_source`),
@@ -5176,9 +5059,7 @@ public int getMultiSelectMinQueryLength() {
      * 
      * For multiselect menus, the number of text characters that a user inputs
      * before the menu returns suggested selection items.
-     *
      * If unset, the multiselect menu uses the following default values:
-     *
      * * If the menu uses a static array of `SelectionInput` items, defaults to
      *   0 characters and immediately populates items from the array.
      * * If the menu uses a dynamic data source (`multi_select_data_source`),
@@ -5194,7 +5075,6 @@ public int getMultiSelectMinQueryLength() {
     public Builder setMultiSelectMinQueryLength(int value) {
 
       multiSelectMinQueryLength_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -5205,9 +5085,7 @@ public Builder setMultiSelectMinQueryLength(int value) {
      * 
      * For multiselect menus, the number of text characters that a user inputs
      * before the menu returns suggested selection items.
-     *
      * If unset, the multiselect menu uses the following default values:
-     *
      * * If the menu uses a static array of `SelectionInput` items, defaults to
      *   0 characters and immediately populates items from the array.
      * * If the menu uses a dynamic data source (`multi_select_data_source`),
@@ -5220,7 +5098,7 @@ public Builder setMultiSelectMinQueryLength(int value) {
      * @return This builder for chaining.
      */
     public Builder clearMultiSelectMinQueryLength() {
-      bitField0_ = (bitField0_ & ~0x00000040);
+
       multiSelectMinQueryLength_ = 0;
       onChanged();
       return this;
@@ -5440,6 +5318,7 @@ public com.google.apps.card.v1.ActionOrBuilder getExternalDataSourceOrBuilder()
       }
       multiSelectDataSourceCase_ = 8;
       onChanged();
+      ;
       return externalDataSourceBuilder_;
     }
 
@@ -5665,6 +5544,7 @@ public Builder clearPlatformDataSource() {
       }
       multiSelectDataSourceCase_ = 9;
       onChanged();
+      ;
       return platformDataSourceBuilder_;
     }
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/SelectionInputOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/SelectionInputOrBuilder.java
index 4f15140eb2..3bee869e6b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/SelectionInputOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/SelectionInputOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface SelectionInputOrBuilder
@@ -30,7 +29,6 @@ public interface SelectionInputOrBuilder
    * 
    * Required. The name that identifies the selection input in a form input
    * event.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -47,7 +45,6 @@ public interface SelectionInputOrBuilder
    * 
    * Required. The name that identifies the selection input in a form input
    * event.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -64,7 +61,6 @@ public interface SelectionInputOrBuilder
    * 
    * The text that appears above the selection input field in the user
    * interface.
-   *
    * Specify text that helps the user enter the information your app needs.
    * For example, if users are selecting the urgency of a work ticket from a
    * drop-down menu, the label might be "Urgency" or "Select urgency".
@@ -82,7 +78,6 @@ public interface SelectionInputOrBuilder
    * 
    * The text that appears above the selection input field in the user
    * interface.
-   *
    * Specify text that helps the user enter the information your app needs.
    * For example, if users are selecting the urgency of a work ticket from a
    * drop-down menu, the label might be "Urgency" or "Select urgency".
@@ -193,7 +188,6 @@ public interface SelectionInputOrBuilder
    * 
    * If specified, the form is submitted when the selection changes. If not
    * specified, you must specify a separate button that submits the form.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -210,7 +204,6 @@ public interface SelectionInputOrBuilder
    * 
    * If specified, the form is submitted when the selection changes. If not
    * specified, you must specify a separate button that submits the form.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -227,7 +220,6 @@ public interface SelectionInputOrBuilder
    * 
    * If specified, the form is submitted when the selection changes. If not
    * specified, you must specify a separate button that submits the form.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -270,9 +262,7 @@ public interface SelectionInputOrBuilder
    * 
    * For multiselect menus, the number of text characters that a user inputs
    * before the menu returns suggested selection items.
-   *
    * If unset, the multiselect menu uses the following default values:
-   *
    * * If the menu uses a static array of `SelectionInput` items, defaults to
    *   0 characters and immediately populates items from the array.
    * * If the menu uses a dynamic data source (`multi_select_data_source`),
@@ -361,5 +351,6 @@ public interface SelectionInputOrBuilder
   com.google.apps.card.v1.SelectionInput.PlatformDataSourceOrBuilder
       getPlatformDataSourceOrBuilder();
 
-  com.google.apps.card.v1.SelectionInput.MultiSelectDataSourceCase getMultiSelectDataSourceCase();
+  public com.google.apps.card.v1.SelectionInput.MultiSelectDataSourceCase
+      getMultiSelectDataSourceCase();
 }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Suggestions.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Suggestions.java
index 06990890ef..80fbdc46ae 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Suggestions.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Suggestions.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -26,19 +25,15 @@
  * Suggested values that users can enter. These values appear when users click
  * inside the text input field. As users type, the suggested values
  * dynamically filter to match what the users have typed.
- *
  * For example, a text input field for programming language might suggest
  * Java, JavaScript, Python, and C++. When users start typing `Jav`, the list
  * of suggestions filters to show `Java` and `JavaScript`.
- *
  * Suggested values help guide users to enter values that your app can make
  * sense of. When referring to JavaScript, some users might enter `javascript`
  * and others `java script`. Suggesting `JavaScript` can standardize how users
  * interact with your app.
- *
  * When specified, `TextInput.type` is always `SINGLE_LINE`, even if it's set
  * to `MULTIPLE_LINE`.
- *
  * [Google Workspace
  * add-ons and Chat apps](https://developers.google.com/workspace/extend):
  * 

@@ -66,6 +61,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Suggestions();
   }
 
+  @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.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_Suggestions_descriptor;
@@ -128,7 +128,7 @@ public interface SuggestionItemOrBuilder
      */
     com.google.protobuf.ByteString getTextBytes();
 
-    com.google.apps.card.v1.Suggestions.SuggestionItem.ContentCase getContentCase();
+    public com.google.apps.card.v1.Suggestions.SuggestionItem.ContentCase getContentCase();
   }
 
   /**
@@ -136,7 +136,6 @@ public interface SuggestionItemOrBuilder
    *
    * 
    * One suggested value that users can enter in a text input field.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -162,6 +161,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new SuggestionItem();
     }
 
+    @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.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Suggestions_SuggestionItem_descriptor;
@@ -178,8 +182,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     private int contentCase_ = 0;
-
-    @SuppressWarnings("serial")
     private java.lang.Object content_;
 
     public enum ContentCase
@@ -479,7 +481,6 @@ protected Builder newBuilderForType(
      *
      * 
      * One suggested value that users can enter in a text input field.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -516,7 +517,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         contentCase_ = 0;
         content_ = null;
         return this;
@@ -546,23 +546,14 @@ public com.google.apps.card.v1.Suggestions.SuggestionItem build() {
       public com.google.apps.card.v1.Suggestions.SuggestionItem buildPartial() {
         com.google.apps.card.v1.Suggestions.SuggestionItem result =
             new com.google.apps.card.v1.Suggestions.SuggestionItem(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        if (contentCase_ == 1) {
+          result.content_ = content_;
         }
-        buildPartialOneofs(result);
+        result.contentCase_ = contentCase_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.apps.card.v1.Suggestions.SuggestionItem result) {
-        int from_bitField0_ = bitField0_;
-      }
-
-      private void buildPartialOneofs(com.google.apps.card.v1.Suggestions.SuggestionItem result) {
-        result.contentCase_ = contentCase_;
-        result.content_ = this.content_;
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -688,8 +679,6 @@ public Builder clearContent() {
         return this;
       }
 
-      private int bitField0_;
-
       /**
        *
        *
@@ -900,8 +889,6 @@ public com.google.apps.card.v1.Suggestions.SuggestionItem getDefaultInstanceForT
   }
 
   public static final int ITEMS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List items_;
 
   /**
@@ -1147,19 +1134,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * Suggested values that users can enter. These values appear when users click
    * inside the text input field. As users type, the suggested values
    * dynamically filter to match what the users have typed.
-   *
    * For example, a text input field for programming language might suggest
    * Java, JavaScript, Python, and C++. When users start typing `Jav`, the list
    * of suggestions filters to show `Java` and `JavaScript`.
-   *
    * Suggested values help guide users to enter values that your app can make
    * sense of. When referring to JavaScript, some users might enter `javascript`
    * and others `java script`. Suggesting `JavaScript` can standardize how users
    * interact with your app.
-   *
    * When specified, `TextInput.type` is always `SINGLE_LINE`, even if it's set
    * to `MULTIPLE_LINE`.
-   *
    * [Google Workspace
    * add-ons and Chat apps](https://developers.google.com/workspace/extend):
    * 

@@ -1195,7 +1178,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (itemsBuilder_ == null) {
         items_ = java.util.Collections.emptyList();
       } else {
@@ -1229,15 +1211,7 @@ public com.google.apps.card.v1.Suggestions build() {
     @java.lang.Override
     public com.google.apps.card.v1.Suggestions buildPartial() {
       com.google.apps.card.v1.Suggestions result = new com.google.apps.card.v1.Suggestions(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.apps.card.v1.Suggestions result) {
+      int from_bitField0_ = bitField0_;
       if (itemsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           items_ = java.util.Collections.unmodifiableList(items_);
@@ -1247,10 +1221,8 @@ private void buildPartialRepeatedFields(com.google.apps.card.v1.Suggestions resu
       } else {
         result.items_ = itemsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.apps.card.v1.Suggestions result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/SuggestionsOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/SuggestionsOrBuilder.java
index 0dea78bc39..61611b0db3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/SuggestionsOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/SuggestionsOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface SuggestionsOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextInput.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextInput.java
index b3c2ddf406..1f21a4f979 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextInput.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextInput.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -30,15 +29,12 @@
  * the submission action is blocked unless a value is entered. For an example in
  * Google Chat apps, see [Add a field in which a user can enter
  * text](https://developers.google.com/workspace/chat/design-interactive-card-dialog#add_a_field_in_which_a_user_can_enter_text).
- *
  * Chat apps receive and can process the value of entered text during form input
  * events. For details about working with form inputs, see [Receive form
  * data](https://developers.google.com/workspace/chat/read-form-data).
- *
  * When you need to collect undefined or abstract data from users,
  * use a text input. To collect defined or enumerated data from users, use the
  * [SelectionInput][google.apps.card.v1.SelectionInput] widget.
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
  * 

@@ -71,6 +67,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new TextInput();
   }
 
+  @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.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_TextInput_descriptor;
@@ -94,7 +95,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * whether it's a single line input field, or a multi-line input. If
    * `initialSuggestions` is specified, `type` is always `SINGLE_LINE`,
    * even if it's set to `MULTIPLE_LINE`.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -228,18 +228,14 @@ private Type(int value) {
     // @@protoc_insertion_point(enum_scope:google.apps.card.v1.TextInput.Type)
   }
 
-  private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
    *
    * 
    * The name by which the text input is identified in a form input event.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -266,7 +262,6 @@ public java.lang.String getName() {
    *
    * 
    * The name by which the text input is identified in a form input event.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -289,20 +284,16 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int LABEL_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object label_ = "";
+  private volatile java.lang.Object label_;
 
   /**
    *
    *
    * 
    * The text that appears above the text input field in the user interface.
-   *
    * Specify text that helps the user enter the information your app needs.
    * For example, if you are asking someone's name, but specifically need their
    * surname, write `surname` instead of `name`.
-   *
    * Required if `hintText` is unspecified. Otherwise, optional.
    * 

    *
@@ -328,11 +319,9 @@ public java.lang.String getLabel() {
    *
    * 
    * The text that appears above the text input field in the user interface.
-   *
    * Specify text that helps the user enter the information your app needs.
    * For example, if you are asking someone's name, but specifically need their
    * surname, write `surname` instead of `name`.
-   *
    * Required if `hintText` is unspecified. Otherwise, optional.
    * 

    *
@@ -354,9 +343,7 @@ public com.google.protobuf.ByteString getLabelBytes() {
   }
 
   public static final int HINT_TEXT_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object hintText_ = "";
+  private volatile java.lang.Object hintText_;
 
   /**
    *
@@ -364,7 +351,6 @@ public com.google.protobuf.ByteString getLabelBytes() {
    * 
    * Text that appears below the text input field meant to assist users by
    * prompting them to enter a certain value. This text is always visible.
-   *
    * Required if `label` is unspecified. Otherwise, optional.
    * 

    *
@@ -391,7 +377,6 @@ public java.lang.String getHintText() {
    * 
    * Text that appears below the text input field meant to assist users by
    * prompting them to enter a certain value. This text is always visible.
-   *
    * Required if `label` is unspecified. Otherwise, optional.
    * 

    *
@@ -413,16 +398,13 @@ public com.google.protobuf.ByteString getHintTextBytes() {
   }
 
   public static final int VALUE_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object value_ = "";
+  private volatile java.lang.Object value_;
 
   /**
    *
    *
    * 
    * The value entered by a user, returned as part of a form input event.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -449,7 +431,6 @@ public java.lang.String getValue() {
    *
    * 
    * The value entered by a user, returned as part of a form input event.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -472,7 +453,7 @@ public com.google.protobuf.ByteString getValueBytes() {
   }
 
   public static final int TYPE_FIELD_NUMBER = 5;
-  private int type_ = 0;
+  private int type_;
 
   /**
    *
@@ -505,8 +486,9 @@ public int getTypeValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.TextInput.Type getType() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.TextInput.Type result =
-        com.google.apps.card.v1.TextInput.Type.forNumber(type_);
+        com.google.apps.card.v1.TextInput.Type.valueOf(type_);
     return result == null ? com.google.apps.card.v1.TextInput.Type.UNRECOGNIZED : result;
   }
 
@@ -519,7 +501,6 @@ public com.google.apps.card.v1.TextInput.Type getType() {
    * 
    * What to do when a change occurs in the text input field. For example, a
    * user adding to the field or deleting text.
-   *
    * Examples of actions to take include running a custom function or opening
    * a [dialog](https://developers.google.com/workspace/chat/dialogs)
    * in Google Chat.
@@ -531,7 +512,7 @@ public com.google.apps.card.v1.TextInput.Type getType() {
    */
   @java.lang.Override
   public boolean hasOnChangeAction() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return onChangeAction_ != null;
   }
 
   /**
@@ -540,7 +521,6 @@ public boolean hasOnChangeAction() {
    * 
    * What to do when a change occurs in the text input field. For example, a
    * user adding to the field or deleting text.
-   *
    * Examples of actions to take include running a custom function or opening
    * a [dialog](https://developers.google.com/workspace/chat/dialogs)
    * in Google Chat.
@@ -563,7 +543,6 @@ public com.google.apps.card.v1.Action getOnChangeAction() {
    * 
    * What to do when a change occurs in the text input field. For example, a
    * user adding to the field or deleting text.
-   *
    * Examples of actions to take include running a custom function or opening
    * a [dialog](https://developers.google.com/workspace/chat/dialogs)
    * in Google Chat.
@@ -573,9 +552,7 @@ public com.google.apps.card.v1.Action getOnChangeAction() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.ActionOrBuilder getOnChangeActionOrBuilder() {
-    return onChangeAction_ == null
-        ? com.google.apps.card.v1.Action.getDefaultInstance()
-        : onChangeAction_;
+    return getOnChangeAction();
   }
 
   public static final int INITIAL_SUGGESTIONS_FIELD_NUMBER = 7;
@@ -588,19 +565,15 @@ public com.google.apps.card.v1.ActionOrBuilder getOnChangeActionOrBuilder() {
    * Suggested values that users can enter. These values appear when users click
    * inside the text input field. As users type, the suggested values
    * dynamically filter to match what the users have typed.
-   *
    * For example, a text input field for programming language might suggest
    * Java, JavaScript, Python, and C++. When users start typing `Jav`, the list
    * of suggestions filters to show just `Java` and `JavaScript`.
-   *
    * Suggested values help guide users to enter values that your app can make
    * sense of. When referring to JavaScript, some users might enter `javascript`
    * and others `java script`. Suggesting `JavaScript` can standardize how users
    * interact with your app.
-   *
    * When specified, `TextInput.type` is always `SINGLE_LINE`, even if it's set
    * to `MULTIPLE_LINE`.
-   *
    * [Google Workspace
    * add-ons and Chat apps](https://developers.google.com/workspace/extend):
    * 

@@ -611,7 +584,7 @@ public com.google.apps.card.v1.ActionOrBuilder getOnChangeActionOrBuilder() {
    */
   @java.lang.Override
   public boolean hasInitialSuggestions() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return initialSuggestions_ != null;
   }
 
   /**
@@ -621,19 +594,15 @@ public boolean hasInitialSuggestions() {
    * Suggested values that users can enter. These values appear when users click
    * inside the text input field. As users type, the suggested values
    * dynamically filter to match what the users have typed.
-   *
    * For example, a text input field for programming language might suggest
    * Java, JavaScript, Python, and C++. When users start typing `Jav`, the list
    * of suggestions filters to show just `Java` and `JavaScript`.
-   *
    * Suggested values help guide users to enter values that your app can make
    * sense of. When referring to JavaScript, some users might enter `javascript`
    * and others `java script`. Suggesting `JavaScript` can standardize how users
    * interact with your app.
-   *
    * When specified, `TextInput.type` is always `SINGLE_LINE`, even if it's set
    * to `MULTIPLE_LINE`.
-   *
    * [Google Workspace
    * add-ons and Chat apps](https://developers.google.com/workspace/extend):
    * 

@@ -656,19 +625,15 @@ public com.google.apps.card.v1.Suggestions getInitialSuggestions() {
    * Suggested values that users can enter. These values appear when users click
    * inside the text input field. As users type, the suggested values
    * dynamically filter to match what the users have typed.
-   *
    * For example, a text input field for programming language might suggest
    * Java, JavaScript, Python, and C++. When users start typing `Jav`, the list
    * of suggestions filters to show just `Java` and `JavaScript`.
-   *
    * Suggested values help guide users to enter values that your app can make
    * sense of. When referring to JavaScript, some users might enter `javascript`
    * and others `java script`. Suggesting `JavaScript` can standardize how users
    * interact with your app.
-   *
    * When specified, `TextInput.type` is always `SINGLE_LINE`, even if it's set
    * to `MULTIPLE_LINE`.
-   *
    * [Google Workspace
    * add-ons and Chat apps](https://developers.google.com/workspace/extend):
    * 

@@ -677,9 +642,7 @@ public com.google.apps.card.v1.Suggestions getInitialSuggestions() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.SuggestionsOrBuilder getInitialSuggestionsOrBuilder() {
-    return initialSuggestions_ == null
-        ? com.google.apps.card.v1.Suggestions.getDefaultInstance()
-        : initialSuggestions_;
+    return getInitialSuggestions();
   }
 
   public static final int AUTO_COMPLETE_ACTION_FIELD_NUMBER = 8;
@@ -691,13 +654,10 @@ public com.google.apps.card.v1.SuggestionsOrBuilder getInitialSuggestionsOrBuild
    * 
    * Optional. Specify what action to take when the text input field provides
    * suggestions to users who interact with it.
-   *
    * If unspecified, the suggestions are set by `initialSuggestions` and
    * are processed by the client.
-   *
    * If specified, the app takes the action specified here, such as running
    * a custom function.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -708,7 +668,7 @@ public com.google.apps.card.v1.SuggestionsOrBuilder getInitialSuggestionsOrBuild
    */
   @java.lang.Override
   public boolean hasAutoCompleteAction() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return autoCompleteAction_ != null;
   }
 
   /**
@@ -717,13 +677,10 @@ public boolean hasAutoCompleteAction() {
    * 
    * Optional. Specify what action to take when the text input field provides
    * suggestions to users who interact with it.
-   *
    * If unspecified, the suggestions are set by `initialSuggestions` and
    * are processed by the client.
-   *
    * If specified, the app takes the action specified here, such as running
    * a custom function.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -745,13 +702,10 @@ public com.google.apps.card.v1.Action getAutoCompleteAction() {
    * 
    * Optional. Specify what action to take when the text input field provides
    * suggestions to users who interact with it.
-   *
    * If unspecified, the suggestions are set by `initialSuggestions` and
    * are processed by the client.
-   *
    * If specified, the app takes the action specified here, such as running
    * a custom function.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -760,9 +714,7 @@ public com.google.apps.card.v1.Action getAutoCompleteAction() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.ActionOrBuilder getAutoCompleteActionOrBuilder() {
-    return autoCompleteAction_ == null
-        ? com.google.apps.card.v1.Action.getDefaultInstance()
-        : autoCompleteAction_;
+    return getAutoCompleteAction();
   }
 
   public static final int VALIDATION_FIELD_NUMBER = 11;
@@ -773,7 +725,6 @@ public com.google.apps.card.v1.ActionOrBuilder getAutoCompleteActionOrBuilder()
    *
    * 
    * Specify the input format validation necessary for this text field.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -784,7 +735,7 @@ public com.google.apps.card.v1.ActionOrBuilder getAutoCompleteActionOrBuilder()
    */
   @java.lang.Override
   public boolean hasValidation() {
-    return ((bitField0_ & 0x00000008) != 0);
+    return validation_ != null;
   }
 
   /**
@@ -792,7 +743,6 @@ public boolean hasValidation() {
    *
    * 
    * Specify the input format validation necessary for this text field.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -813,7 +763,6 @@ public com.google.apps.card.v1.Validation getValidation() {
    *
    * 
    * Specify the input format validation necessary for this text field.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -822,15 +771,11 @@ public com.google.apps.card.v1.Validation getValidation() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.ValidationOrBuilder getValidationOrBuilder() {
-    return validation_ == null
-        ? com.google.apps.card.v1.Validation.getDefaultInstance()
-        : validation_;
+    return getValidation();
   }
 
   public static final int PLACEHOLDER_TEXT_FIELD_NUMBER = 12;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object placeholderText_ = "";
+  private volatile java.lang.Object placeholderText_;
 
   /**
    *
@@ -839,7 +784,6 @@ public com.google.apps.card.v1.ValidationOrBuilder getValidationOrBuilder() {
    * Text that appears in the text input field when the field is empty.
    * Use this text to prompt users to enter a value. For example, `Enter a
    * number from 0 to 100`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -867,7 +811,6 @@ public java.lang.String getPlaceholderText() {
    * Text that appears in the text input field when the field is empty.
    * Use this text to prompt users to enter a value. For example, `Enter a
    * number from 0 to 100`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -917,16 +860,16 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (type_ != com.google.apps.card.v1.TextInput.Type.SINGLE_LINE.getNumber()) {
       output.writeEnum(5, type_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (onChangeAction_ != null) {
       output.writeMessage(6, getOnChangeAction());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (initialSuggestions_ != null) {
       output.writeMessage(7, getInitialSuggestions());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (autoCompleteAction_ != null) {
       output.writeMessage(8, getAutoCompleteAction());
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (validation_ != null) {
       output.writeMessage(11, getValidation());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(placeholderText_)) {
@@ -956,16 +899,16 @@ public int getSerializedSize() {
     if (type_ != com.google.apps.card.v1.TextInput.Type.SINGLE_LINE.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(5, type_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (onChangeAction_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getOnChangeAction());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (initialSuggestions_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getInitialSuggestions());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (autoCompleteAction_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getAutoCompleteAction());
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (validation_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(11, getValidation());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(placeholderText_)) {
@@ -1158,15 +1101,12 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * the submission action is blocked unless a value is entered. For an example in
    * Google Chat apps, see [Add a field in which a user can enter
    * text](https://developers.google.com/workspace/chat/design-interactive-card-dialog#add_a_field_in_which_a_user_can_enter_text).
-   *
    * Chat apps receive and can process the value of entered text during form input
    * events. For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
-   *
    * When you need to collect undefined or abstract data from users,
    * use a text input. To collect defined or enumerated data from users, use the
    * [SelectionInput][google.apps.card.v1.SelectionInput] widget.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -1193,54 +1133,51 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.TextInput.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getOnChangeActionFieldBuilder();
-        getInitialSuggestionsFieldBuilder();
-        getAutoCompleteActionFieldBuilder();
-        getValidationFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       label_ = "";
+
       hintText_ = "";
+
       value_ = "";
+
       type_ = 0;
-      onChangeAction_ = null;
-      if (onChangeActionBuilder_ != null) {
-        onChangeActionBuilder_.dispose();
+
+      if (onChangeActionBuilder_ == null) {
+        onChangeAction_ = null;
+      } else {
+        onChangeAction_ = null;
         onChangeActionBuilder_ = null;
       }
-      initialSuggestions_ = null;
-      if (initialSuggestionsBuilder_ != null) {
-        initialSuggestionsBuilder_.dispose();
+      if (initialSuggestionsBuilder_ == null) {
+        initialSuggestions_ = null;
+      } else {
+        initialSuggestions_ = null;
         initialSuggestionsBuilder_ = null;
       }
-      autoCompleteAction_ = null;
-      if (autoCompleteActionBuilder_ != null) {
-        autoCompleteActionBuilder_.dispose();
+      if (autoCompleteActionBuilder_ == null) {
+        autoCompleteAction_ = null;
+      } else {
+        autoCompleteAction_ = null;
         autoCompleteActionBuilder_ = null;
       }
-      validation_ = null;
-      if (validationBuilder_ != null) {
-        validationBuilder_.dispose();
+      if (validationBuilder_ == null) {
+        validation_ = null;
+      } else {
+        validation_ = null;
         validationBuilder_ = null;
       }
       placeholderText_ = "";
+
       return this;
     }
 
@@ -1267,58 +1204,34 @@ public com.google.apps.card.v1.TextInput build() {
     @java.lang.Override
     public com.google.apps.card.v1.TextInput buildPartial() {
       com.google.apps.card.v1.TextInput result = new com.google.apps.card.v1.TextInput(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.apps.card.v1.TextInput result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.label_ = label_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.hintText_ = hintText_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.value_ = value_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.type_ = type_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.onChangeAction_ =
-            onChangeActionBuilder_ == null ? onChangeAction_ : onChangeActionBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.initialSuggestions_ =
-            initialSuggestionsBuilder_ == null
-                ? initialSuggestions_
-                : initialSuggestionsBuilder_.build();
-        to_bitField0_ |= 0x00000002;
+      result.name_ = name_;
+      result.label_ = label_;
+      result.hintText_ = hintText_;
+      result.value_ = value_;
+      result.type_ = type_;
+      if (onChangeActionBuilder_ == null) {
+        result.onChangeAction_ = onChangeAction_;
+      } else {
+        result.onChangeAction_ = onChangeActionBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.autoCompleteAction_ =
-            autoCompleteActionBuilder_ == null
-                ? autoCompleteAction_
-                : autoCompleteActionBuilder_.build();
-        to_bitField0_ |= 0x00000004;
+      if (initialSuggestionsBuilder_ == null) {
+        result.initialSuggestions_ = initialSuggestions_;
+      } else {
+        result.initialSuggestions_ = initialSuggestionsBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000100) != 0)) {
-        result.validation_ = validationBuilder_ == null ? validation_ : validationBuilder_.build();
-        to_bitField0_ |= 0x00000008;
+      if (autoCompleteActionBuilder_ == null) {
+        result.autoCompleteAction_ = autoCompleteAction_;
+      } else {
+        result.autoCompleteAction_ = autoCompleteActionBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000200) != 0)) {
-        result.placeholderText_ = placeholderText_;
+      if (validationBuilder_ == null) {
+        result.validation_ = validation_;
+      } else {
+        result.validation_ = validationBuilder_.build();
       }
-      result.bitField0_ |= to_bitField0_;
+      result.placeholderText_ = placeholderText_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1368,22 +1281,18 @@ public Builder mergeFrom(com.google.apps.card.v1.TextInput other) {
       if (other == com.google.apps.card.v1.TextInput.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLabel().isEmpty()) {
         label_ = other.label_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getHintText().isEmpty()) {
         hintText_ = other.hintText_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getValue().isEmpty()) {
         value_ = other.value_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (other.type_ != 0) {
@@ -1403,7 +1312,6 @@ public Builder mergeFrom(com.google.apps.card.v1.TextInput other) {
       }
       if (!other.getPlaceholderText().isEmpty()) {
         placeholderText_ = other.placeholderText_;
-        bitField0_ |= 0x00000200;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -1435,63 +1343,63 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 label_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 hintText_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 value_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             case 40:
               {
                 type_ = input.readEnum();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 40
             case 50:
               {
                 input.readMessage(getOnChangeActionFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 50
             case 58:
               {
                 input.readMessage(
                     getInitialSuggestionsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 58
             case 66:
               {
                 input.readMessage(
                     getAutoCompleteActionFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 66
             case 90:
               {
                 input.readMessage(getValidationFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000100;
+
                 break;
               } // case 90
             case 98:
               {
                 placeholderText_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000200;
+
                 break;
               } // case 98
             default:
@@ -1511,8 +1419,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -1520,7 +1426,6 @@ public Builder mergeFrom(
      *
      * 
      * The name by which the text input is identified in a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -1546,7 +1451,6 @@ public java.lang.String getName() {
      *
      * 
      * The name by which the text input is identified in a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -1572,7 +1476,6 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * 
      * The name by which the text input is identified in a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -1586,8 +1489,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1597,7 +1500,6 @@ public Builder setName(java.lang.String value) {
      *
      * 
      * The name by which the text input is identified in a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -1607,8 +1509,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1618,7 +1520,6 @@ public Builder clearName() {
      *
      * 
      * The name by which the text input is identified in a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -1633,8 +1534,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1646,11 +1547,9 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      *
      * 
      * The text that appears above the text input field in the user interface.
-     *
      * Specify text that helps the user enter the information your app needs.
      * For example, if you are asking someone's name, but specifically need their
      * surname, write `surname` instead of `name`.
-     *
      * Required if `hintText` is unspecified. Otherwise, optional.
      * 

      *
@@ -1675,11 +1574,9 @@ public java.lang.String getLabel() {
      *
      * 
      * The text that appears above the text input field in the user interface.
-     *
      * Specify text that helps the user enter the information your app needs.
      * For example, if you are asking someone's name, but specifically need their
      * surname, write `surname` instead of `name`.
-     *
      * Required if `hintText` is unspecified. Otherwise, optional.
      * 

      *
@@ -1704,11 +1601,9 @@ public com.google.protobuf.ByteString getLabelBytes() {
      *
      * 
      * The text that appears above the text input field in the user interface.
-     *
      * Specify text that helps the user enter the information your app needs.
      * For example, if you are asking someone's name, but specifically need their
      * surname, write `surname` instead of `name`.
-     *
      * Required if `hintText` is unspecified. Otherwise, optional.
      * 

      *
@@ -1721,8 +1616,8 @@ public Builder setLabel(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       label_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1732,11 +1627,9 @@ public Builder setLabel(java.lang.String value) {
      *
      * 
      * The text that appears above the text input field in the user interface.
-     *
      * Specify text that helps the user enter the information your app needs.
      * For example, if you are asking someone's name, but specifically need their
      * surname, write `surname` instead of `name`.
-     *
      * Required if `hintText` is unspecified. Otherwise, optional.
      * 

      *
@@ -1745,8 +1638,8 @@ public Builder setLabel(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLabel() {
+
       label_ = getDefaultInstance().getLabel();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1756,11 +1649,9 @@ public Builder clearLabel() {
      *
      * 
      * The text that appears above the text input field in the user interface.
-     *
      * Specify text that helps the user enter the information your app needs.
      * For example, if you are asking someone's name, but specifically need their
      * surname, write `surname` instead of `name`.
-     *
      * Required if `hintText` is unspecified. Otherwise, optional.
      * 

      *
@@ -1774,8 +1665,8 @@ public Builder setLabelBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       label_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1788,7 +1679,6 @@ public Builder setLabelBytes(com.google.protobuf.ByteString value) {
      * 
      * Text that appears below the text input field meant to assist users by
      * prompting them to enter a certain value. This text is always visible.
-     *
      * Required if `label` is unspecified. Otherwise, optional.
      * 

      *
@@ -1814,7 +1704,6 @@ public java.lang.String getHintText() {
      * 
      * Text that appears below the text input field meant to assist users by
      * prompting them to enter a certain value. This text is always visible.
-     *
      * Required if `label` is unspecified. Otherwise, optional.
      * 

      *
@@ -1840,7 +1729,6 @@ public com.google.protobuf.ByteString getHintTextBytes() {
      * 
      * Text that appears below the text input field meant to assist users by
      * prompting them to enter a certain value. This text is always visible.
-     *
      * Required if `label` is unspecified. Otherwise, optional.
      * 

      *
@@ -1853,8 +1741,8 @@ public Builder setHintText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       hintText_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1865,7 +1753,6 @@ public Builder setHintText(java.lang.String value) {
      * 
      * Text that appears below the text input field meant to assist users by
      * prompting them to enter a certain value. This text is always visible.
-     *
      * Required if `label` is unspecified. Otherwise, optional.
      * 

      *
@@ -1874,8 +1761,8 @@ public Builder setHintText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearHintText() {
+
       hintText_ = getDefaultInstance().getHintText();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1886,7 +1773,6 @@ public Builder clearHintText() {
      * 
      * Text that appears below the text input field meant to assist users by
      * prompting them to enter a certain value. This text is always visible.
-     *
      * Required if `label` is unspecified. Otherwise, optional.
      * 

      *
@@ -1900,8 +1786,8 @@ public Builder setHintTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       hintText_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1913,7 +1799,6 @@ public Builder setHintTextBytes(com.google.protobuf.ByteString value) {
      *
      * 
      * The value entered by a user, returned as part of a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -1939,7 +1824,6 @@ public java.lang.String getValue() {
      *
      * 
      * The value entered by a user, returned as part of a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -1965,7 +1849,6 @@ public com.google.protobuf.ByteString getValueBytes() {
      *
      * 
      * The value entered by a user, returned as part of a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -1979,8 +1862,8 @@ public Builder setValue(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       value_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1990,7 +1873,6 @@ public Builder setValue(java.lang.String value) {
      *
      * 
      * The value entered by a user, returned as part of a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -2000,8 +1882,8 @@ public Builder setValue(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearValue() {
+
       value_ = getDefaultInstance().getValue();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -2011,7 +1893,6 @@ public Builder clearValue() {
      *
      * 
      * The value entered by a user, returned as part of a form input event.
-     *
      * For details about working with form inputs, see [Receive form
      * data](https://developers.google.com/workspace/chat/read-form-data).
      * 

@@ -2026,8 +1907,8 @@ public Builder setValueBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       value_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2065,8 +1946,8 @@ public int getTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setTypeValue(int value) {
+
       type_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2085,8 +1966,9 @@ public Builder setTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.TextInput.Type getType() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.TextInput.Type result =
-          com.google.apps.card.v1.TextInput.Type.forNumber(type_);
+          com.google.apps.card.v1.TextInput.Type.valueOf(type_);
       return result == null ? com.google.apps.card.v1.TextInput.Type.UNRECOGNIZED : result;
     }
 
@@ -2107,7 +1989,7 @@ public Builder setType(com.google.apps.card.v1.TextInput.Type value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000010;
+
       type_ = value.getNumber();
       onChanged();
       return this;
@@ -2126,7 +2008,7 @@ public Builder setType(com.google.apps.card.v1.TextInput.Type value) {
      * @return This builder for chaining.
      */
     public Builder clearType() {
-      bitField0_ = (bitField0_ & ~0x00000010);
+
       type_ = 0;
       onChanged();
       return this;
@@ -2145,7 +2027,6 @@ public Builder clearType() {
      * 
      * What to do when a change occurs in the text input field. For example, a
      * user adding to the field or deleting text.
-     *
      * Examples of actions to take include running a custom function or opening
      * a [dialog](https://developers.google.com/workspace/chat/dialogs)
      * in Google Chat.
@@ -2156,7 +2037,7 @@ public Builder clearType() {
      * @return Whether the onChangeAction field is set.
      */
     public boolean hasOnChangeAction() {
-      return ((bitField0_ & 0x00000020) != 0);
+      return onChangeActionBuilder_ != null || onChangeAction_ != null;
     }
 
     /**
@@ -2165,7 +2046,6 @@ public boolean hasOnChangeAction() {
      * 
      * What to do when a change occurs in the text input field. For example, a
      * user adding to the field or deleting text.
-     *
      * Examples of actions to take include running a custom function or opening
      * a [dialog](https://developers.google.com/workspace/chat/dialogs)
      * in Google Chat.
@@ -2191,7 +2071,6 @@ public com.google.apps.card.v1.Action getOnChangeAction() {
      * 
      * What to do when a change occurs in the text input field. For example, a
      * user adding to the field or deleting text.
-     *
      * Examples of actions to take include running a custom function or opening
      * a [dialog](https://developers.google.com/workspace/chat/dialogs)
      * in Google Chat.
@@ -2205,11 +2084,11 @@ public Builder setOnChangeAction(com.google.apps.card.v1.Action value) {
           throw new NullPointerException();
         }
         onChangeAction_ = value;
+        onChanged();
       } else {
         onChangeActionBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000020;
-      onChanged();
+
       return this;
     }
 
@@ -2219,7 +2098,6 @@ public Builder setOnChangeAction(com.google.apps.card.v1.Action value) {
      * 
      * What to do when a change occurs in the text input field. For example, a
      * user adding to the field or deleting text.
-     *
      * Examples of actions to take include running a custom function or opening
      * a [dialog](https://developers.google.com/workspace/chat/dialogs)
      * in Google Chat.
@@ -2230,11 +2108,11 @@ public Builder setOnChangeAction(com.google.apps.card.v1.Action value) {
     public Builder setOnChangeAction(com.google.apps.card.v1.Action.Builder builderForValue) {
       if (onChangeActionBuilder_ == null) {
         onChangeAction_ = builderForValue.build();
+        onChanged();
       } else {
         onChangeActionBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000020;
-      onChanged();
+
       return this;
     }
 
@@ -2244,7 +2122,6 @@ public Builder setOnChangeAction(com.google.apps.card.v1.Action.Builder builderF
      * 
      * What to do when a change occurs in the text input field. For example, a
      * user adding to the field or deleting text.
-     *
      * Examples of actions to take include running a custom function or opening
      * a [dialog](https://developers.google.com/workspace/chat/dialogs)
      * in Google Chat.
@@ -2254,20 +2131,19 @@ public Builder setOnChangeAction(com.google.apps.card.v1.Action.Builder builderF
      */
     public Builder mergeOnChangeAction(com.google.apps.card.v1.Action value) {
       if (onChangeActionBuilder_ == null) {
-        if (((bitField0_ & 0x00000020) != 0)
-            && onChangeAction_ != null
-            && onChangeAction_ != com.google.apps.card.v1.Action.getDefaultInstance()) {
-          getOnChangeActionBuilder().mergeFrom(value);
+        if (onChangeAction_ != null) {
+          onChangeAction_ =
+              com.google.apps.card.v1.Action.newBuilder(onChangeAction_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           onChangeAction_ = value;
         }
+        onChanged();
       } else {
         onChangeActionBuilder_.mergeFrom(value);
       }
-      if (onChangeAction_ != null) {
-        bitField0_ |= 0x00000020;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2277,7 +2153,6 @@ public Builder mergeOnChangeAction(com.google.apps.card.v1.Action value) {
      * 
      * What to do when a change occurs in the text input field. For example, a
      * user adding to the field or deleting text.
-     *
      * Examples of actions to take include running a custom function or opening
      * a [dialog](https://developers.google.com/workspace/chat/dialogs)
      * in Google Chat.
@@ -2286,13 +2161,14 @@ public Builder mergeOnChangeAction(com.google.apps.card.v1.Action value) {
      * .google.apps.card.v1.Action on_change_action = 6;
      */
     public Builder clearOnChangeAction() {
-      bitField0_ = (bitField0_ & ~0x00000020);
-      onChangeAction_ = null;
-      if (onChangeActionBuilder_ != null) {
-        onChangeActionBuilder_.dispose();
+      if (onChangeActionBuilder_ == null) {
+        onChangeAction_ = null;
+        onChanged();
+      } else {
+        onChangeAction_ = null;
         onChangeActionBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2302,7 +2178,6 @@ public Builder clearOnChangeAction() {
      * 
      * What to do when a change occurs in the text input field. For example, a
      * user adding to the field or deleting text.
-     *
      * Examples of actions to take include running a custom function or opening
      * a [dialog](https://developers.google.com/workspace/chat/dialogs)
      * in Google Chat.
@@ -2311,7 +2186,7 @@ public Builder clearOnChangeAction() {
      * .google.apps.card.v1.Action on_change_action = 6;
      */
     public com.google.apps.card.v1.Action.Builder getOnChangeActionBuilder() {
-      bitField0_ |= 0x00000020;
+
       onChanged();
       return getOnChangeActionFieldBuilder().getBuilder();
     }
@@ -2322,7 +2197,6 @@ public com.google.apps.card.v1.Action.Builder getOnChangeActionBuilder() {
      * 
      * What to do when a change occurs in the text input field. For example, a
      * user adding to the field or deleting text.
-     *
      * Examples of actions to take include running a custom function or opening
      * a [dialog](https://developers.google.com/workspace/chat/dialogs)
      * in Google Chat.
@@ -2346,7 +2220,6 @@ public com.google.apps.card.v1.ActionOrBuilder getOnChangeActionOrBuilder() {
      * 
      * What to do when a change occurs in the text input field. For example, a
      * user adding to the field or deleting text.
-     *
      * Examples of actions to take include running a custom function or opening
      * a [dialog](https://developers.google.com/workspace/chat/dialogs)
      * in Google Chat.
@@ -2385,19 +2258,15 @@ public com.google.apps.card.v1.ActionOrBuilder getOnChangeActionOrBuilder() {
      * Suggested values that users can enter. These values appear when users click
      * inside the text input field. As users type, the suggested values
      * dynamically filter to match what the users have typed.
-     *
      * For example, a text input field for programming language might suggest
      * Java, JavaScript, Python, and C++. When users start typing `Jav`, the list
      * of suggestions filters to show just `Java` and `JavaScript`.
-     *
      * Suggested values help guide users to enter values that your app can make
      * sense of. When referring to JavaScript, some users might enter `javascript`
      * and others `java script`. Suggesting `JavaScript` can standardize how users
      * interact with your app.
-     *
      * When specified, `TextInput.type` is always `SINGLE_LINE`, even if it's set
      * to `MULTIPLE_LINE`.
-     *
      * [Google Workspace
      * add-ons and Chat apps](https://developers.google.com/workspace/extend):
      * 

@@ -2407,7 +2276,7 @@ public com.google.apps.card.v1.ActionOrBuilder getOnChangeActionOrBuilder() {
      * @return Whether the initialSuggestions field is set.
      */
     public boolean hasInitialSuggestions() {
-      return ((bitField0_ & 0x00000040) != 0);
+      return initialSuggestionsBuilder_ != null || initialSuggestions_ != null;
     }
 
     /**
@@ -2417,19 +2286,15 @@ public boolean hasInitialSuggestions() {
      * Suggested values that users can enter. These values appear when users click
      * inside the text input field. As users type, the suggested values
      * dynamically filter to match what the users have typed.
-     *
      * For example, a text input field for programming language might suggest
      * Java, JavaScript, Python, and C++. When users start typing `Jav`, the list
      * of suggestions filters to show just `Java` and `JavaScript`.
-     *
      * Suggested values help guide users to enter values that your app can make
      * sense of. When referring to JavaScript, some users might enter `javascript`
      * and others `java script`. Suggesting `JavaScript` can standardize how users
      * interact with your app.
-     *
      * When specified, `TextInput.type` is always `SINGLE_LINE`, even if it's set
      * to `MULTIPLE_LINE`.
-     *
      * [Google Workspace
      * add-ons and Chat apps](https://developers.google.com/workspace/extend):
      * 

@@ -2455,19 +2320,15 @@ public com.google.apps.card.v1.Suggestions getInitialSuggestions() {
      * Suggested values that users can enter. These values appear when users click
      * inside the text input field. As users type, the suggested values
      * dynamically filter to match what the users have typed.
-     *
      * For example, a text input field for programming language might suggest
      * Java, JavaScript, Python, and C++. When users start typing `Jav`, the list
      * of suggestions filters to show just `Java` and `JavaScript`.
-     *
      * Suggested values help guide users to enter values that your app can make
      * sense of. When referring to JavaScript, some users might enter `javascript`
      * and others `java script`. Suggesting `JavaScript` can standardize how users
      * interact with your app.
-     *
      * When specified, `TextInput.type` is always `SINGLE_LINE`, even if it's set
      * to `MULTIPLE_LINE`.
-     *
      * [Google Workspace
      * add-ons and Chat apps](https://developers.google.com/workspace/extend):
      * 

@@ -2480,11 +2341,11 @@ public Builder setInitialSuggestions(com.google.apps.card.v1.Suggestions value)
           throw new NullPointerException();
         }
         initialSuggestions_ = value;
+        onChanged();
       } else {
         initialSuggestionsBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -2495,19 +2356,15 @@ public Builder setInitialSuggestions(com.google.apps.card.v1.Suggestions value)
      * Suggested values that users can enter. These values appear when users click
      * inside the text input field. As users type, the suggested values
      * dynamically filter to match what the users have typed.
-     *
      * For example, a text input field for programming language might suggest
      * Java, JavaScript, Python, and C++. When users start typing `Jav`, the list
      * of suggestions filters to show just `Java` and `JavaScript`.
-     *
      * Suggested values help guide users to enter values that your app can make
      * sense of. When referring to JavaScript, some users might enter `javascript`
      * and others `java script`. Suggesting `JavaScript` can standardize how users
      * interact with your app.
-     *
      * When specified, `TextInput.type` is always `SINGLE_LINE`, even if it's set
      * to `MULTIPLE_LINE`.
-     *
      * [Google Workspace
      * add-ons and Chat apps](https://developers.google.com/workspace/extend):
      * 

@@ -2518,11 +2375,11 @@ public Builder setInitialSuggestions(
         com.google.apps.card.v1.Suggestions.Builder builderForValue) {
       if (initialSuggestionsBuilder_ == null) {
         initialSuggestions_ = builderForValue.build();
+        onChanged();
       } else {
         initialSuggestionsBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -2533,19 +2390,15 @@ public Builder setInitialSuggestions(
      * Suggested values that users can enter. These values appear when users click
      * inside the text input field. As users type, the suggested values
      * dynamically filter to match what the users have typed.
-     *
      * For example, a text input field for programming language might suggest
      * Java, JavaScript, Python, and C++. When users start typing `Jav`, the list
      * of suggestions filters to show just `Java` and `JavaScript`.
-     *
      * Suggested values help guide users to enter values that your app can make
      * sense of. When referring to JavaScript, some users might enter `javascript`
      * and others `java script`. Suggesting `JavaScript` can standardize how users
      * interact with your app.
-     *
      * When specified, `TextInput.type` is always `SINGLE_LINE`, even if it's set
      * to `MULTIPLE_LINE`.
-     *
      * [Google Workspace
      * add-ons and Chat apps](https://developers.google.com/workspace/extend):
      * 

@@ -2554,20 +2407,19 @@ public Builder setInitialSuggestions(
      */
     public Builder mergeInitialSuggestions(com.google.apps.card.v1.Suggestions value) {
       if (initialSuggestionsBuilder_ == null) {
-        if (((bitField0_ & 0x00000040) != 0)
-            && initialSuggestions_ != null
-            && initialSuggestions_ != com.google.apps.card.v1.Suggestions.getDefaultInstance()) {
-          getInitialSuggestionsBuilder().mergeFrom(value);
+        if (initialSuggestions_ != null) {
+          initialSuggestions_ =
+              com.google.apps.card.v1.Suggestions.newBuilder(initialSuggestions_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           initialSuggestions_ = value;
         }
+        onChanged();
       } else {
         initialSuggestionsBuilder_.mergeFrom(value);
       }
-      if (initialSuggestions_ != null) {
-        bitField0_ |= 0x00000040;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2578,19 +2430,15 @@ public Builder mergeInitialSuggestions(com.google.apps.card.v1.Suggestions value
      * Suggested values that users can enter. These values appear when users click
      * inside the text input field. As users type, the suggested values
      * dynamically filter to match what the users have typed.
-     *
      * For example, a text input field for programming language might suggest
      * Java, JavaScript, Python, and C++. When users start typing `Jav`, the list
      * of suggestions filters to show just `Java` and `JavaScript`.
-     *
      * Suggested values help guide users to enter values that your app can make
      * sense of. When referring to JavaScript, some users might enter `javascript`
      * and others `java script`. Suggesting `JavaScript` can standardize how users
      * interact with your app.
-     *
      * When specified, `TextInput.type` is always `SINGLE_LINE`, even if it's set
      * to `MULTIPLE_LINE`.
-     *
      * [Google Workspace
      * add-ons and Chat apps](https://developers.google.com/workspace/extend):
      * 

@@ -2598,13 +2446,14 @@ public Builder mergeInitialSuggestions(com.google.apps.card.v1.Suggestions value
      * .google.apps.card.v1.Suggestions initial_suggestions = 7;
      */
     public Builder clearInitialSuggestions() {
-      bitField0_ = (bitField0_ & ~0x00000040);
-      initialSuggestions_ = null;
-      if (initialSuggestionsBuilder_ != null) {
-        initialSuggestionsBuilder_.dispose();
+      if (initialSuggestionsBuilder_ == null) {
+        initialSuggestions_ = null;
+        onChanged();
+      } else {
+        initialSuggestions_ = null;
         initialSuggestionsBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2615,19 +2464,15 @@ public Builder clearInitialSuggestions() {
      * Suggested values that users can enter. These values appear when users click
      * inside the text input field. As users type, the suggested values
      * dynamically filter to match what the users have typed.
-     *
      * For example, a text input field for programming language might suggest
      * Java, JavaScript, Python, and C++. When users start typing `Jav`, the list
      * of suggestions filters to show just `Java` and `JavaScript`.
-     *
      * Suggested values help guide users to enter values that your app can make
      * sense of. When referring to JavaScript, some users might enter `javascript`
      * and others `java script`. Suggesting `JavaScript` can standardize how users
      * interact with your app.
-     *
      * When specified, `TextInput.type` is always `SINGLE_LINE`, even if it's set
      * to `MULTIPLE_LINE`.
-     *
      * [Google Workspace
      * add-ons and Chat apps](https://developers.google.com/workspace/extend):
      * 

@@ -2635,7 +2480,7 @@ public Builder clearInitialSuggestions() {
      * .google.apps.card.v1.Suggestions initial_suggestions = 7;
      */
     public com.google.apps.card.v1.Suggestions.Builder getInitialSuggestionsBuilder() {
-      bitField0_ |= 0x00000040;
+
       onChanged();
       return getInitialSuggestionsFieldBuilder().getBuilder();
     }
@@ -2647,19 +2492,15 @@ public com.google.apps.card.v1.Suggestions.Builder getInitialSuggestionsBuilder(
      * Suggested values that users can enter. These values appear when users click
      * inside the text input field. As users type, the suggested values
      * dynamically filter to match what the users have typed.
-     *
      * For example, a text input field for programming language might suggest
      * Java, JavaScript, Python, and C++. When users start typing `Jav`, the list
      * of suggestions filters to show just `Java` and `JavaScript`.
-     *
      * Suggested values help guide users to enter values that your app can make
      * sense of. When referring to JavaScript, some users might enter `javascript`
      * and others `java script`. Suggesting `JavaScript` can standardize how users
      * interact with your app.
-     *
      * When specified, `TextInput.type` is always `SINGLE_LINE`, even if it's set
      * to `MULTIPLE_LINE`.
-     *
      * [Google Workspace
      * add-ons and Chat apps](https://developers.google.com/workspace/extend):
      * 

@@ -2683,19 +2524,15 @@ public com.google.apps.card.v1.SuggestionsOrBuilder getInitialSuggestionsOrBuild
      * Suggested values that users can enter. These values appear when users click
      * inside the text input field. As users type, the suggested values
      * dynamically filter to match what the users have typed.
-     *
      * For example, a text input field for programming language might suggest
      * Java, JavaScript, Python, and C++. When users start typing `Jav`, the list
      * of suggestions filters to show just `Java` and `JavaScript`.
-     *
      * Suggested values help guide users to enter values that your app can make
      * sense of. When referring to JavaScript, some users might enter `javascript`
      * and others `java script`. Suggesting `JavaScript` can standardize how users
      * interact with your app.
-     *
      * When specified, `TextInput.type` is always `SINGLE_LINE`, even if it's set
      * to `MULTIPLE_LINE`.
-     *
      * [Google Workspace
      * add-ons and Chat apps](https://developers.google.com/workspace/extend):
      * 

@@ -2732,13 +2569,10 @@ public com.google.apps.card.v1.SuggestionsOrBuilder getInitialSuggestionsOrBuild
      * 
      * Optional. Specify what action to take when the text input field provides
      * suggestions to users who interact with it.
-     *
      * If unspecified, the suggestions are set by `initialSuggestions` and
      * are processed by the client.
-     *
      * If specified, the app takes the action specified here, such as running
      * a custom function.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -2748,7 +2582,7 @@ public com.google.apps.card.v1.SuggestionsOrBuilder getInitialSuggestionsOrBuild
      * @return Whether the autoCompleteAction field is set.
      */
     public boolean hasAutoCompleteAction() {
-      return ((bitField0_ & 0x00000080) != 0);
+      return autoCompleteActionBuilder_ != null || autoCompleteAction_ != null;
     }
 
     /**
@@ -2757,13 +2591,10 @@ public boolean hasAutoCompleteAction() {
      * 
      * Optional. Specify what action to take when the text input field provides
      * suggestions to users who interact with it.
-     *
      * If unspecified, the suggestions are set by `initialSuggestions` and
      * are processed by the client.
-     *
      * If specified, the app takes the action specified here, such as running
      * a custom function.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -2788,13 +2619,10 @@ public com.google.apps.card.v1.Action getAutoCompleteAction() {
      * 
      * Optional. Specify what action to take when the text input field provides
      * suggestions to users who interact with it.
-     *
      * If unspecified, the suggestions are set by `initialSuggestions` and
      * are processed by the client.
-     *
      * If specified, the app takes the action specified here, such as running
      * a custom function.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -2807,11 +2635,11 @@ public Builder setAutoCompleteAction(com.google.apps.card.v1.Action value) {
           throw new NullPointerException();
         }
         autoCompleteAction_ = value;
+        onChanged();
       } else {
         autoCompleteActionBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -2821,13 +2649,10 @@ public Builder setAutoCompleteAction(com.google.apps.card.v1.Action value) {
      * 
      * Optional. Specify what action to take when the text input field provides
      * suggestions to users who interact with it.
-     *
      * If unspecified, the suggestions are set by `initialSuggestions` and
      * are processed by the client.
-     *
      * If specified, the app takes the action specified here, such as running
      * a custom function.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -2837,11 +2662,11 @@ public Builder setAutoCompleteAction(com.google.apps.card.v1.Action value) {
     public Builder setAutoCompleteAction(com.google.apps.card.v1.Action.Builder builderForValue) {
       if (autoCompleteActionBuilder_ == null) {
         autoCompleteAction_ = builderForValue.build();
+        onChanged();
       } else {
         autoCompleteActionBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -2851,13 +2676,10 @@ public Builder setAutoCompleteAction(com.google.apps.card.v1.Action.Builder buil
      * 
      * Optional. Specify what action to take when the text input field provides
      * suggestions to users who interact with it.
-     *
      * If unspecified, the suggestions are set by `initialSuggestions` and
      * are processed by the client.
-     *
      * If specified, the app takes the action specified here, such as running
      * a custom function.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -2866,20 +2688,19 @@ public Builder setAutoCompleteAction(com.google.apps.card.v1.Action.Builder buil
      */
     public Builder mergeAutoCompleteAction(com.google.apps.card.v1.Action value) {
       if (autoCompleteActionBuilder_ == null) {
-        if (((bitField0_ & 0x00000080) != 0)
-            && autoCompleteAction_ != null
-            && autoCompleteAction_ != com.google.apps.card.v1.Action.getDefaultInstance()) {
-          getAutoCompleteActionBuilder().mergeFrom(value);
+        if (autoCompleteAction_ != null) {
+          autoCompleteAction_ =
+              com.google.apps.card.v1.Action.newBuilder(autoCompleteAction_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           autoCompleteAction_ = value;
         }
+        onChanged();
       } else {
         autoCompleteActionBuilder_.mergeFrom(value);
       }
-      if (autoCompleteAction_ != null) {
-        bitField0_ |= 0x00000080;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2889,13 +2710,10 @@ public Builder mergeAutoCompleteAction(com.google.apps.card.v1.Action value) {
      * 
      * Optional. Specify what action to take when the text input field provides
      * suggestions to users who interact with it.
-     *
      * If unspecified, the suggestions are set by `initialSuggestions` and
      * are processed by the client.
-     *
      * If specified, the app takes the action specified here, such as running
      * a custom function.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -2903,13 +2721,14 @@ public Builder mergeAutoCompleteAction(com.google.apps.card.v1.Action value) {
      * .google.apps.card.v1.Action auto_complete_action = 8;
      */
     public Builder clearAutoCompleteAction() {
-      bitField0_ = (bitField0_ & ~0x00000080);
-      autoCompleteAction_ = null;
-      if (autoCompleteActionBuilder_ != null) {
-        autoCompleteActionBuilder_.dispose();
+      if (autoCompleteActionBuilder_ == null) {
+        autoCompleteAction_ = null;
+        onChanged();
+      } else {
+        autoCompleteAction_ = null;
         autoCompleteActionBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2919,13 +2738,10 @@ public Builder clearAutoCompleteAction() {
      * 
      * Optional. Specify what action to take when the text input field provides
      * suggestions to users who interact with it.
-     *
      * If unspecified, the suggestions are set by `initialSuggestions` and
      * are processed by the client.
-     *
      * If specified, the app takes the action specified here, such as running
      * a custom function.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -2933,7 +2749,7 @@ public Builder clearAutoCompleteAction() {
      * .google.apps.card.v1.Action auto_complete_action = 8;
      */
     public com.google.apps.card.v1.Action.Builder getAutoCompleteActionBuilder() {
-      bitField0_ |= 0x00000080;
+
       onChanged();
       return getAutoCompleteActionFieldBuilder().getBuilder();
     }
@@ -2944,13 +2760,10 @@ public com.google.apps.card.v1.Action.Builder getAutoCompleteActionBuilder() {
      * 
      * Optional. Specify what action to take when the text input field provides
      * suggestions to users who interact with it.
-     *
      * If unspecified, the suggestions are set by `initialSuggestions` and
      * are processed by the client.
-     *
      * If specified, the app takes the action specified here, such as running
      * a custom function.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -2973,13 +2786,10 @@ public com.google.apps.card.v1.ActionOrBuilder getAutoCompleteActionOrBuilder()
      * 
      * Optional. Specify what action to take when the text input field provides
      * suggestions to users who interact with it.
-     *
      * If unspecified, the suggestions are set by `initialSuggestions` and
      * are processed by the client.
-     *
      * If specified, the app takes the action specified here, such as running
      * a custom function.
-     *
      * [Google Workspace
      * add-ons](https://developers.google.com/workspace/add-ons):
      * 

@@ -3015,7 +2825,6 @@ public com.google.apps.card.v1.ActionOrBuilder getAutoCompleteActionOrBuilder()
      *
      * 
      * Specify the input format validation necessary for this text field.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3025,7 +2834,7 @@ public com.google.apps.card.v1.ActionOrBuilder getAutoCompleteActionOrBuilder()
      * @return Whether the validation field is set.
      */
     public boolean hasValidation() {
-      return ((bitField0_ & 0x00000100) != 0);
+      return validationBuilder_ != null || validation_ != null;
     }
 
     /**
@@ -3033,7 +2842,6 @@ public boolean hasValidation() {
      *
      * 
      * Specify the input format validation necessary for this text field.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3057,7 +2865,6 @@ public com.google.apps.card.v1.Validation getValidation() {
      *
      * 
      * Specify the input format validation necessary for this text field.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3070,11 +2877,11 @@ public Builder setValidation(com.google.apps.card.v1.Validation value) {
           throw new NullPointerException();
         }
         validation_ = value;
+        onChanged();
       } else {
         validationBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000100;
-      onChanged();
+
       return this;
     }
 
@@ -3083,7 +2890,6 @@ public Builder setValidation(com.google.apps.card.v1.Validation value) {
      *
      * 
      * Specify the input format validation necessary for this text field.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3093,11 +2899,11 @@ public Builder setValidation(com.google.apps.card.v1.Validation value) {
     public Builder setValidation(com.google.apps.card.v1.Validation.Builder builderForValue) {
       if (validationBuilder_ == null) {
         validation_ = builderForValue.build();
+        onChanged();
       } else {
         validationBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000100;
-      onChanged();
+
       return this;
     }
 
@@ -3106,7 +2912,6 @@ public Builder setValidation(com.google.apps.card.v1.Validation.Builder builderF
      *
      * 
      * Specify the input format validation necessary for this text field.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3115,20 +2920,19 @@ public Builder setValidation(com.google.apps.card.v1.Validation.Builder builderF
      */
     public Builder mergeValidation(com.google.apps.card.v1.Validation value) {
       if (validationBuilder_ == null) {
-        if (((bitField0_ & 0x00000100) != 0)
-            && validation_ != null
-            && validation_ != com.google.apps.card.v1.Validation.getDefaultInstance()) {
-          getValidationBuilder().mergeFrom(value);
+        if (validation_ != null) {
+          validation_ =
+              com.google.apps.card.v1.Validation.newBuilder(validation_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           validation_ = value;
         }
+        onChanged();
       } else {
         validationBuilder_.mergeFrom(value);
       }
-      if (validation_ != null) {
-        bitField0_ |= 0x00000100;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -3137,7 +2941,6 @@ public Builder mergeValidation(com.google.apps.card.v1.Validation value) {
      *
      * 
      * Specify the input format validation necessary for this text field.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3145,13 +2948,14 @@ public Builder mergeValidation(com.google.apps.card.v1.Validation value) {
      * .google.apps.card.v1.Validation validation = 11;
      */
     public Builder clearValidation() {
-      bitField0_ = (bitField0_ & ~0x00000100);
-      validation_ = null;
-      if (validationBuilder_ != null) {
-        validationBuilder_.dispose();
+      if (validationBuilder_ == null) {
+        validation_ = null;
+        onChanged();
+      } else {
+        validation_ = null;
         validationBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -3160,7 +2964,6 @@ public Builder clearValidation() {
      *
      * 
      * Specify the input format validation necessary for this text field.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3168,7 +2971,7 @@ public Builder clearValidation() {
      * .google.apps.card.v1.Validation validation = 11;
      */
     public com.google.apps.card.v1.Validation.Builder getValidationBuilder() {
-      bitField0_ |= 0x00000100;
+
       onChanged();
       return getValidationFieldBuilder().getBuilder();
     }
@@ -3178,7 +2981,6 @@ public com.google.apps.card.v1.Validation.Builder getValidationBuilder() {
      *
      * 
      * Specify the input format validation necessary for this text field.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3200,7 +3002,6 @@ public com.google.apps.card.v1.ValidationOrBuilder getValidationOrBuilder() {
      *
      * 
      * Specify the input format validation necessary for this text field.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -3233,7 +3034,6 @@ public com.google.apps.card.v1.ValidationOrBuilder getValidationOrBuilder() {
      * Text that appears in the text input field when the field is empty.
      * Use this text to prompt users to enter a value. For example, `Enter a
      * number from 0 to 100`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -3260,7 +3060,6 @@ public java.lang.String getPlaceholderText() {
      * Text that appears in the text input field when the field is empty.
      * Use this text to prompt users to enter a value. For example, `Enter a
      * number from 0 to 100`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -3287,7 +3086,6 @@ public com.google.protobuf.ByteString getPlaceholderTextBytes() {
      * Text that appears in the text input field when the field is empty.
      * Use this text to prompt users to enter a value. For example, `Enter a
      * number from 0 to 100`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -3300,8 +3098,8 @@ public Builder setPlaceholderText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       placeholderText_ = value;
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -3313,7 +3111,6 @@ public Builder setPlaceholderText(java.lang.String value) {
      * Text that appears in the text input field when the field is empty.
      * Use this text to prompt users to enter a value. For example, `Enter a
      * number from 0 to 100`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -3322,8 +3119,8 @@ public Builder setPlaceholderText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPlaceholderText() {
+
       placeholderText_ = getDefaultInstance().getPlaceholderText();
-      bitField0_ = (bitField0_ & ~0x00000200);
       onChanged();
       return this;
     }
@@ -3335,7 +3132,6 @@ public Builder clearPlaceholderText() {
      * Text that appears in the text input field when the field is empty.
      * Use this text to prompt users to enter a value. For example, `Enter a
      * number from 0 to 100`.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -3349,8 +3145,8 @@ public Builder setPlaceholderTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       placeholderText_ = value;
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextInputOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextInputOrBuilder.java
index 3388bd5fce..d53d034f35 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextInputOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextInputOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface TextInputOrBuilder
@@ -29,7 +28,6 @@ public interface TextInputOrBuilder
    *
    * 
    * The name by which the text input is identified in a form input event.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -45,7 +43,6 @@ public interface TextInputOrBuilder
    *
    * 
    * The name by which the text input is identified in a form input event.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -61,11 +58,9 @@ public interface TextInputOrBuilder
    *
    * 
    * The text that appears above the text input field in the user interface.
-   *
    * Specify text that helps the user enter the information your app needs.
    * For example, if you are asking someone's name, but specifically need their
    * surname, write `surname` instead of `name`.
-   *
    * Required if `hintText` is unspecified. Otherwise, optional.
    * 

    *
@@ -80,11 +75,9 @@ public interface TextInputOrBuilder
    *
    * 
    * The text that appears above the text input field in the user interface.
-   *
    * Specify text that helps the user enter the information your app needs.
    * For example, if you are asking someone's name, but specifically need their
    * surname, write `surname` instead of `name`.
-   *
    * Required if `hintText` is unspecified. Otherwise, optional.
    * 

    *
@@ -100,7 +93,6 @@ public interface TextInputOrBuilder
    * 
    * Text that appears below the text input field meant to assist users by
    * prompting them to enter a certain value. This text is always visible.
-   *
    * Required if `label` is unspecified. Otherwise, optional.
    * 

    *
@@ -116,7 +108,6 @@ public interface TextInputOrBuilder
    * 
    * Text that appears below the text input field meant to assist users by
    * prompting them to enter a certain value. This text is always visible.
-   *
    * Required if `label` is unspecified. Otherwise, optional.
    * 

    *
@@ -131,7 +122,6 @@ public interface TextInputOrBuilder
    *
    * 
    * The value entered by a user, returned as part of a form input event.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -147,7 +137,6 @@ public interface TextInputOrBuilder
    *
    * 
    * The value entered by a user, returned as part of a form input event.
-   *
    * For details about working with form inputs, see [Receive form
    * data](https://developers.google.com/workspace/chat/read-form-data).
    * 

@@ -192,7 +181,6 @@ public interface TextInputOrBuilder
    * 
    * What to do when a change occurs in the text input field. For example, a
    * user adding to the field or deleting text.
-   *
    * Examples of actions to take include running a custom function or opening
    * a [dialog](https://developers.google.com/workspace/chat/dialogs)
    * in Google Chat.
@@ -210,7 +198,6 @@ public interface TextInputOrBuilder
    * 
    * What to do when a change occurs in the text input field. For example, a
    * user adding to the field or deleting text.
-   *
    * Examples of actions to take include running a custom function or opening
    * a [dialog](https://developers.google.com/workspace/chat/dialogs)
    * in Google Chat.
@@ -228,7 +215,6 @@ public interface TextInputOrBuilder
    * 
    * What to do when a change occurs in the text input field. For example, a
    * user adding to the field or deleting text.
-   *
    * Examples of actions to take include running a custom function or opening
    * a [dialog](https://developers.google.com/workspace/chat/dialogs)
    * in Google Chat.
@@ -245,19 +231,15 @@ public interface TextInputOrBuilder
    * Suggested values that users can enter. These values appear when users click
    * inside the text input field. As users type, the suggested values
    * dynamically filter to match what the users have typed.
-   *
    * For example, a text input field for programming language might suggest
    * Java, JavaScript, Python, and C++. When users start typing `Jav`, the list
    * of suggestions filters to show just `Java` and `JavaScript`.
-   *
    * Suggested values help guide users to enter values that your app can make
    * sense of. When referring to JavaScript, some users might enter `javascript`
    * and others `java script`. Suggesting `JavaScript` can standardize how users
    * interact with your app.
-   *
    * When specified, `TextInput.type` is always `SINGLE_LINE`, even if it's set
    * to `MULTIPLE_LINE`.
-   *
    * [Google Workspace
    * add-ons and Chat apps](https://developers.google.com/workspace/extend):
    * 

@@ -275,19 +257,15 @@ public interface TextInputOrBuilder
    * Suggested values that users can enter. These values appear when users click
    * inside the text input field. As users type, the suggested values
    * dynamically filter to match what the users have typed.
-   *
    * For example, a text input field for programming language might suggest
    * Java, JavaScript, Python, and C++. When users start typing `Jav`, the list
    * of suggestions filters to show just `Java` and `JavaScript`.
-   *
    * Suggested values help guide users to enter values that your app can make
    * sense of. When referring to JavaScript, some users might enter `javascript`
    * and others `java script`. Suggesting `JavaScript` can standardize how users
    * interact with your app.
-   *
    * When specified, `TextInput.type` is always `SINGLE_LINE`, even if it's set
    * to `MULTIPLE_LINE`.
-   *
    * [Google Workspace
    * add-ons and Chat apps](https://developers.google.com/workspace/extend):
    * 

@@ -305,19 +283,15 @@ public interface TextInputOrBuilder
    * Suggested values that users can enter. These values appear when users click
    * inside the text input field. As users type, the suggested values
    * dynamically filter to match what the users have typed.
-   *
    * For example, a text input field for programming language might suggest
    * Java, JavaScript, Python, and C++. When users start typing `Jav`, the list
    * of suggestions filters to show just `Java` and `JavaScript`.
-   *
    * Suggested values help guide users to enter values that your app can make
    * sense of. When referring to JavaScript, some users might enter `javascript`
    * and others `java script`. Suggesting `JavaScript` can standardize how users
    * interact with your app.
-   *
    * When specified, `TextInput.type` is always `SINGLE_LINE`, even if it's set
    * to `MULTIPLE_LINE`.
-   *
    * [Google Workspace
    * add-ons and Chat apps](https://developers.google.com/workspace/extend):
    * 

@@ -332,13 +306,10 @@ public interface TextInputOrBuilder
    * 
    * Optional. Specify what action to take when the text input field provides
    * suggestions to users who interact with it.
-   *
    * If unspecified, the suggestions are set by `initialSuggestions` and
    * are processed by the client.
-   *
    * If specified, the app takes the action specified here, such as running
    * a custom function.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -355,13 +326,10 @@ public interface TextInputOrBuilder
    * 
    * Optional. Specify what action to take when the text input field provides
    * suggestions to users who interact with it.
-   *
    * If unspecified, the suggestions are set by `initialSuggestions` and
    * are processed by the client.
-   *
    * If specified, the app takes the action specified here, such as running
    * a custom function.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -378,13 +346,10 @@ public interface TextInputOrBuilder
    * 
    * Optional. Specify what action to take when the text input field provides
    * suggestions to users who interact with it.
-   *
    * If unspecified, the suggestions are set by `initialSuggestions` and
    * are processed by the client.
-   *
    * If specified, the app takes the action specified here, such as running
    * a custom function.
-   *
    * [Google Workspace
    * add-ons](https://developers.google.com/workspace/add-ons):
    * 

@@ -398,7 +363,6 @@ public interface TextInputOrBuilder
    *
    * 
    * Specify the input format validation necessary for this text field.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -414,7 +378,6 @@ public interface TextInputOrBuilder
    *
    * 
    * Specify the input format validation necessary for this text field.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -430,7 +393,6 @@ public interface TextInputOrBuilder
    *
    * 
    * Specify the input format validation necessary for this text field.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -446,7 +408,6 @@ public interface TextInputOrBuilder
    * Text that appears in the text input field when the field is empty.
    * Use this text to prompt users to enter a value. For example, `Enter a
    * number from 0 to 100`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -463,7 +424,6 @@ public interface TextInputOrBuilder
    * Text that appears in the text input field when the field is empty.
    * Use this text to prompt users to enter a value. For example, `Enter a
    * number from 0 to 100`.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextParagraph.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextParagraph.java
index 311bb99794..0782791c12 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextParagraph.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextParagraph.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -34,7 +33,6 @@
  * [Formatting
  * text in Google Workspace
  * add-ons](https://developers.google.com/apps-script/add-ons/concepts/widgets#text_formatting).
- *
  * [Google Workspace add-ons and
  * Chat apps](https://developers.google.com/workspace/extend):
  * 

@@ -63,6 +61,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new TextParagraph();
   }
 
+  @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.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_TextParagraph_descriptor;
@@ -83,7 +86,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * Syntax to use for formatting text.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -240,9 +242,7 @@ private TextSyntax(int value) {
   }
 
   public static final int TEXT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object text_ = "";
+  private volatile java.lang.Object text_;
 
   /**
    *
@@ -293,7 +293,7 @@ public com.google.protobuf.ByteString getTextBytes() {
   }
 
   public static final int MAX_LINES_FIELD_NUMBER = 2;
-  private int maxLines_ = 0;
+  private int maxLines_;
 
   /**
    *
@@ -304,7 +304,6 @@ public com.google.protobuf.ByteString getTextBytes() {
    * content is concealed behind a **show more** button. If the text is equal or
    * shorter than the specified maximum number of lines, a **show more** button
    * isn't displayed.
-   *
    * The default value is 0, in which case
    * all context is displayed. Negative values are ignored.
    * 

@@ -319,14 +318,13 @@ public int getMaxLines() {
   }
 
   public static final int TEXT_SYNTAX_FIELD_NUMBER = 4;
-  private int textSyntax_ = 0;
+  private int textSyntax_;
 
   /**
    *
    *
    * 
    * The syntax of the text. If not set, the text is rendered as HTML.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -344,7 +342,6 @@ public int getTextSyntaxValue() {
    *
    * 
    * The syntax of the text. If not set, the text is rendered as HTML.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -354,8 +351,9 @@ public int getTextSyntaxValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.TextParagraph.TextSyntax getTextSyntax() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.TextParagraph.TextSyntax result =
-        com.google.apps.card.v1.TextParagraph.TextSyntax.forNumber(textSyntax_);
+        com.google.apps.card.v1.TextParagraph.TextSyntax.valueOf(textSyntax_);
     return result == null ? com.google.apps.card.v1.TextParagraph.TextSyntax.UNRECOGNIZED : result;
   }
 
@@ -552,7 +550,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * [Formatting
    * text in Google Workspace
    * add-ons](https://developers.google.com/apps-script/add-ons/concepts/widgets#text_formatting).
-   *
    * [Google Workspace add-ons and
    * Chat apps](https://developers.google.com/workspace/extend):
    * 

@@ -588,10 +585,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       text_ = "";
+
       maxLines_ = 0;
+
       textSyntax_ = 0;
+
       return this;
     }
 
@@ -619,26 +618,13 @@ public com.google.apps.card.v1.TextParagraph build() {
     public com.google.apps.card.v1.TextParagraph buildPartial() {
       com.google.apps.card.v1.TextParagraph result =
           new com.google.apps.card.v1.TextParagraph(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.text_ = text_;
+      result.maxLines_ = maxLines_;
+      result.textSyntax_ = textSyntax_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.apps.card.v1.TextParagraph result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.text_ = text_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.maxLines_ = maxLines_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.textSyntax_ = textSyntax_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -686,7 +672,6 @@ public Builder mergeFrom(com.google.apps.card.v1.TextParagraph other) {
       if (other == com.google.apps.card.v1.TextParagraph.getDefaultInstance()) return this;
       if (!other.getText().isEmpty()) {
         text_ = other.text_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getMaxLines() != 0) {
@@ -724,19 +709,19 @@ public Builder mergeFrom(
             case 10:
               {
                 text_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 maxLines_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 32:
               {
                 textSyntax_ = input.readEnum();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 32
             default:
@@ -756,8 +741,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object text_ = "";
 
     /**
@@ -822,8 +805,8 @@ public Builder setText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       text_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -840,8 +823,8 @@ public Builder setText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearText() {
+
       text_ = getDefaultInstance().getText();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -863,8 +846,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       text_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -880,7 +863,6 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
      * content is concealed behind a **show more** button. If the text is equal or
      * shorter than the specified maximum number of lines, a **show more** button
      * isn't displayed.
-     *
      * The default value is 0, in which case
      * all context is displayed. Negative values are ignored.
      * 

@@ -903,7 +885,6 @@ public int getMaxLines() {
      * content is concealed behind a **show more** button. If the text is equal or
      * shorter than the specified maximum number of lines, a **show more** button
      * isn't displayed.
-     *
      * The default value is 0, in which case
      * all context is displayed. Negative values are ignored.
      * 

@@ -916,7 +897,6 @@ public int getMaxLines() {
     public Builder setMaxLines(int value) {
 
       maxLines_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -930,7 +910,6 @@ public Builder setMaxLines(int value) {
      * content is concealed behind a **show more** button. If the text is equal or
      * shorter than the specified maximum number of lines, a **show more** button
      * isn't displayed.
-     *
      * The default value is 0, in which case
      * all context is displayed. Negative values are ignored.
      * 

@@ -940,7 +919,7 @@ public Builder setMaxLines(int value) {
      * @return This builder for chaining.
      */
     public Builder clearMaxLines() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       maxLines_ = 0;
       onChanged();
       return this;
@@ -953,7 +932,6 @@ public Builder clearMaxLines() {
      *
      * 
      * The syntax of the text. If not set, the text is rendered as HTML.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -971,7 +949,6 @@ public int getTextSyntaxValue() {
      *
      * 
      * The syntax of the text. If not set, the text is rendered as HTML.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -981,8 +958,8 @@ public int getTextSyntaxValue() {
      * @return This builder for chaining.
      */
     public Builder setTextSyntaxValue(int value) {
+
       textSyntax_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -992,7 +969,6 @@ public Builder setTextSyntaxValue(int value) {
      *
      * 
      * The syntax of the text. If not set, the text is rendered as HTML.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -1002,8 +978,9 @@ public Builder setTextSyntaxValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.TextParagraph.TextSyntax getTextSyntax() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.TextParagraph.TextSyntax result =
-          com.google.apps.card.v1.TextParagraph.TextSyntax.forNumber(textSyntax_);
+          com.google.apps.card.v1.TextParagraph.TextSyntax.valueOf(textSyntax_);
       return result == null
           ? com.google.apps.card.v1.TextParagraph.TextSyntax.UNRECOGNIZED
           : result;
@@ -1014,7 +991,6 @@ public com.google.apps.card.v1.TextParagraph.TextSyntax getTextSyntax() {
      *
      * 
      * The syntax of the text. If not set, the text is rendered as HTML.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -1027,7 +1003,7 @@ public Builder setTextSyntax(com.google.apps.card.v1.TextParagraph.TextSyntax va
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000004;
+
       textSyntax_ = value.getNumber();
       onChanged();
       return this;
@@ -1038,7 +1014,6 @@ public Builder setTextSyntax(com.google.apps.card.v1.TextParagraph.TextSyntax va
      *
      * 
      * The syntax of the text. If not set, the text is rendered as HTML.
-     *
      * [Google Chat apps](https://developers.google.com/workspace/chat):
      * 

      *
@@ -1047,7 +1022,7 @@ public Builder setTextSyntax(com.google.apps.card.v1.TextParagraph.TextSyntax va
      * @return This builder for chaining.
      */
     public Builder clearTextSyntax() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       textSyntax_ = 0;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextParagraphOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextParagraphOrBuilder.java
index 2fcc657d74..edbd2f7e1f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextParagraphOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextParagraphOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface TextParagraphOrBuilder
@@ -59,7 +58,6 @@ public interface TextParagraphOrBuilder
    * content is concealed behind a **show more** button. If the text is equal or
    * shorter than the specified maximum number of lines, a **show more** button
    * isn't displayed.
-   *
    * The default value is 0, in which case
    * all context is displayed. Negative values are ignored.
    * 

@@ -75,7 +73,6 @@ public interface TextParagraphOrBuilder
    *
    * 
    * The syntax of the text. If not set, the text is rendered as HTML.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -90,7 +87,6 @@ public interface TextParagraphOrBuilder
    *
    * 
    * The syntax of the text. If not set, the text is rendered as HTML.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Validation.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Validation.java
index 8461105d05..e88b4b5d53 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Validation.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Validation.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -24,7 +23,6 @@
  *
  * 
  * Represents the necessary data for validating the widget it's attached to.
- *
  * [Google Workspace add-ons and Chat
  * apps](https://developers.google.com/workspace/extend):
  * 

@@ -52,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Validation();
   }
 
+  @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.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_Validation_descriptor;
@@ -296,7 +299,7 @@ private InputType(int value) {
   }
 
   public static final int CHARACTER_LIMIT_FIELD_NUMBER = 1;
-  private int characterLimit_ = 0;
+  private int characterLimit_;
 
   /**
    *
@@ -304,7 +307,6 @@ private InputType(int value) {
    * 
    * Specify the character limit for text input widgets.  Note that this is
    * only used for text input and is ignored for other widgets.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -319,14 +321,13 @@ public int getCharacterLimit() {
   }
 
   public static final int INPUT_TYPE_FIELD_NUMBER = 2;
-  private int inputType_ = 0;
+  private int inputType_;
 
   /**
    *
    *
    * 
    * Specify the type of the input widgets.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -345,7 +346,6 @@ public int getInputTypeValue() {
    *
    * 
    * Specify the type of the input widgets.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -356,8 +356,9 @@ public int getInputTypeValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.Validation.InputType getInputType() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.Validation.InputType result =
-        com.google.apps.card.v1.Validation.InputType.forNumber(inputType_);
+        com.google.apps.card.v1.Validation.InputType.valueOf(inputType_);
     return result == null ? com.google.apps.card.v1.Validation.InputType.UNRECOGNIZED : result;
   }
 
@@ -535,7 +536,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * Represents the necessary data for validating the widget it's attached to.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -571,9 +571,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       characterLimit_ = 0;
+
       inputType_ = 0;
+
       return this;
     }
 
@@ -600,23 +601,12 @@ public com.google.apps.card.v1.Validation build() {
     @java.lang.Override
     public com.google.apps.card.v1.Validation buildPartial() {
       com.google.apps.card.v1.Validation result = new com.google.apps.card.v1.Validation(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.characterLimit_ = characterLimit_;
+      result.inputType_ = inputType_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.apps.card.v1.Validation result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.characterLimit_ = characterLimit_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.inputType_ = inputType_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -697,13 +687,13 @@ public Builder mergeFrom(
             case 8:
               {
                 characterLimit_ = input.readInt32();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 16:
               {
                 inputType_ = input.readEnum();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             default:
@@ -723,8 +713,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private int characterLimit_;
 
     /**
@@ -733,7 +721,6 @@ public Builder mergeFrom(
      * 
      * Specify the character limit for text input widgets.  Note that this is
      * only used for text input and is ignored for other widgets.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -753,7 +740,6 @@ public int getCharacterLimit() {
      * 
      * Specify the character limit for text input widgets.  Note that this is
      * only used for text input and is ignored for other widgets.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -766,7 +752,6 @@ public int getCharacterLimit() {
     public Builder setCharacterLimit(int value) {
 
       characterLimit_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -777,7 +762,6 @@ public Builder setCharacterLimit(int value) {
      * 
      * Specify the character limit for text input widgets.  Note that this is
      * only used for text input and is ignored for other widgets.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -787,7 +771,7 @@ public Builder setCharacterLimit(int value) {
      * @return This builder for chaining.
      */
     public Builder clearCharacterLimit() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       characterLimit_ = 0;
       onChanged();
       return this;
@@ -800,7 +784,6 @@ public Builder clearCharacterLimit() {
      *
      * 
      * Specify the type of the input widgets.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -819,7 +802,6 @@ public int getInputTypeValue() {
      *
      * 
      * Specify the type of the input widgets.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -830,8 +812,8 @@ public int getInputTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setInputTypeValue(int value) {
+
       inputType_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -841,7 +823,6 @@ public Builder setInputTypeValue(int value) {
      *
      * 
      * Specify the type of the input widgets.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -852,8 +833,9 @@ public Builder setInputTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.Validation.InputType getInputType() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.Validation.InputType result =
-          com.google.apps.card.v1.Validation.InputType.forNumber(inputType_);
+          com.google.apps.card.v1.Validation.InputType.valueOf(inputType_);
       return result == null ? com.google.apps.card.v1.Validation.InputType.UNRECOGNIZED : result;
     }
 
@@ -862,7 +844,6 @@ public com.google.apps.card.v1.Validation.InputType getInputType() {
      *
      * 
      * Specify the type of the input widgets.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -876,7 +857,7 @@ public Builder setInputType(com.google.apps.card.v1.Validation.InputType value)
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000002;
+
       inputType_ = value.getNumber();
       onChanged();
       return this;
@@ -887,7 +868,6 @@ public Builder setInputType(com.google.apps.card.v1.Validation.InputType value)
      *
      * 
      * Specify the type of the input widgets.
-     *
      * [Google Workspace add-ons and Chat
      * apps](https://developers.google.com/workspace/extend):
      * 

@@ -897,7 +877,7 @@ public Builder setInputType(com.google.apps.card.v1.Validation.InputType value)
      * @return This builder for chaining.
      */
     public Builder clearInputType() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       inputType_ = 0;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ValidationOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ValidationOrBuilder.java
index 12c1f60f08..242405a731 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ValidationOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ValidationOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface ValidationOrBuilder
@@ -30,7 +29,6 @@ public interface ValidationOrBuilder
    * 
    * Specify the character limit for text input widgets.  Note that this is
    * only used for text input and is ignored for other widgets.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -46,7 +44,6 @@ public interface ValidationOrBuilder
    *
    * 
    * Specify the type of the input widgets.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -62,7 +59,6 @@ public interface ValidationOrBuilder
    *
    * 
    * Specify the type of the input widgets.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Widget.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Widget.java
index df9bd98e03..b2de553629 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Widget.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Widget.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 /**
@@ -24,7 +23,6 @@
  *
  * 
  * Each card is made up of widgets.
- *
  * A widget is a composite object that can represent one of text, images,
  * buttons, and other object types.
  * 

@@ -52,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Widget();
   }
 
+  @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.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Widget_descriptor;
   }
@@ -70,7 +73,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * The shape used to crop the image.
-   *
    * [Google Workspace add-ons and Chat
    * apps](https://developers.google.com/workspace/extend):
    * 

@@ -213,7 +215,6 @@ private ImageType(int value) {
    *
    * 
    * Specifies whether widgets align to the left, right, or center of a column.
-   *
    * [Google Chat apps](https://developers.google.com/workspace/chat):
    * 

    *
@@ -589,8 +590,6 @@ private VerticalAlignment(int value) {
   }
 
   private int dataCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object data_;
 
   public enum DataCase
@@ -682,7 +681,6 @@ public DataCase getDataCase() {
    * [Formatting
    * text in Google Workspace
    * add-ons](https://developers.google.com/apps-script/add-ons/concepts/widgets#text_formatting).
-   *
    * For example, the following JSON creates a bolded text:
    * ```
    * "textParagraph": {
@@ -712,7 +710,6 @@ public boolean hasTextParagraph() {
    * [Formatting
    * text in Google Workspace
    * add-ons](https://developers.google.com/apps-script/add-ons/concepts/widgets#text_formatting).
-   *
    * For example, the following JSON creates a bolded text:
    * ```
    * "textParagraph": {
@@ -745,7 +742,6 @@ public com.google.apps.card.v1.TextParagraph getTextParagraph() {
    * [Formatting
    * text in Google Workspace
    * add-ons](https://developers.google.com/apps-script/add-ons/concepts/widgets#text_formatting).
-   *
    * For example, the following JSON creates a bolded text:
    * ```
    * "textParagraph": {
@@ -771,7 +767,6 @@ public com.google.apps.card.v1.TextParagraphOrBuilder getTextParagraphOrBuilder(
    *
    * 
    * Displays an image.
-   *
    * For example, the following JSON creates an image with alternative text:
    * ```
    * "image": {
@@ -796,7 +791,6 @@ public boolean hasImage() {
    *
    * 
    * Displays an image.
-   *
    * For example, the following JSON creates an image with alternative text:
    * ```
    * "image": {
@@ -824,7 +818,6 @@ public com.google.apps.card.v1.Image getImage() {
    *
    * 
    * Displays an image.
-   *
    * For example, the following JSON creates an image with alternative text:
    * ```
    * "image": {
@@ -852,10 +845,8 @@ public com.google.apps.card.v1.ImageOrBuilder getImageOrBuilder() {
    *
    * 
    * Displays a decorated text item.
-   *
    * For example, the following JSON creates a decorated text widget showing
    * email address:
-   *
    * ```
    * "decoratedText": {
    *   "icon": {
@@ -887,10 +878,8 @@ public boolean hasDecoratedText() {
    *
    * 
    * Displays a decorated text item.
-   *
    * For example, the following JSON creates a decorated text widget showing
    * email address:
-   *
    * ```
    * "decoratedText": {
    *   "icon": {
@@ -925,10 +914,8 @@ public com.google.apps.card.v1.DecoratedText getDecoratedText() {
    *
    * 
    * Displays a decorated text item.
-   *
    * For example, the following JSON creates a decorated text widget showing
    * email address:
-   *
    * ```
    * "decoratedText": {
    *   "icon": {
@@ -963,7 +950,6 @@ public com.google.apps.card.v1.DecoratedTextOrBuilder getDecoratedTextOrBuilder(
    *
    * 
    * A list of buttons.
-   *
    * For example, the following JSON creates two buttons. The first
    * is a blue text button and the second is an image button that opens a
    * link:
@@ -1009,7 +995,6 @@ public boolean hasButtonList() {
    *
    * 
    * A list of buttons.
-   *
    * For example, the following JSON creates two buttons. The first
    * is a blue text button and the second is an image button that opens a
    * link:
@@ -1058,7 +1043,6 @@ public com.google.apps.card.v1.ButtonList getButtonList() {
    *
    * 
    * A list of buttons.
-   *
    * For example, the following JSON creates two buttons. The first
    * is a blue text button and the second is an image button that opens a
    * link:
@@ -1107,17 +1091,14 @@ public com.google.apps.card.v1.ButtonListOrBuilder getButtonListOrBuilder() {
    *
    * 
    * Displays a text box that users can type into.
-   *
    * For example, the following JSON creates a text input for an email
    * address:
-   *
    * ```
    * "textInput": {
    *   "name": "mailing_address",
    *   "label": "Mailing Address"
    * }
    * ```
-   *
    * As another example, the following JSON creates a text input for a
    * programming language with static suggestions:
    * ```
@@ -1158,17 +1139,14 @@ public boolean hasTextInput() {
    *
    * 
    * Displays a text box that users can type into.
-   *
    * For example, the following JSON creates a text input for an email
    * address:
-   *
    * ```
    * "textInput": {
    *   "name": "mailing_address",
    *   "label": "Mailing Address"
    * }
    * ```
-   *
    * As another example, the following JSON creates a text input for a
    * programming language with static suggestions:
    * ```
@@ -1212,17 +1190,14 @@ public com.google.apps.card.v1.TextInput getTextInput() {
    *
    * 
    * Displays a text box that users can type into.
-   *
    * For example, the following JSON creates a text input for an email
    * address:
-   *
    * ```
    * "textInput": {
    *   "name": "mailing_address",
    *   "label": "Mailing Address"
    * }
    * ```
-   *
    * As another example, the following JSON creates a text input for a
    * programming language with static suggestions:
    * ```
@@ -1267,10 +1242,8 @@ public com.google.apps.card.v1.TextInputOrBuilder getTextInputOrBuilder() {
    * 
    * Displays a selection control that lets users select items. Selection
    * controls can be checkboxes, radio buttons, switches, or dropdown menus.
-   *
    * For example, the following JSON creates a dropdown menu that lets users
    * choose a size:
-   *
    * ```
    * "selectionInput": {
    *   "name": "size",
@@ -1317,10 +1290,8 @@ public boolean hasSelectionInput() {
    * 
    * Displays a selection control that lets users select items. Selection
    * controls can be checkboxes, radio buttons, switches, or dropdown menus.
-   *
    * For example, the following JSON creates a dropdown menu that lets users
    * choose a size:
-   *
    * ```
    * "selectionInput": {
    *   "name": "size",
@@ -1370,10 +1341,8 @@ public com.google.apps.card.v1.SelectionInput getSelectionInput() {
    * 
    * Displays a selection control that lets users select items. Selection
    * controls can be checkboxes, radio buttons, switches, or dropdown menus.
-   *
    * For example, the following JSON creates a dropdown menu that lets users
    * choose a size:
-   *
    * ```
    * "selectionInput": {
    *   "name": "size",
@@ -1422,11 +1391,8 @@ public com.google.apps.card.v1.SelectionInputOrBuilder getSelectionInputOrBuilde
    *
    * 
    * Displays a widget that lets users input a date, time, or date and time.
-   *
    * For example, the following JSON creates a date time picker to schedule an
    * appointment:
-   *
-   *
    * ```
    * "dateTimePicker": {
    *   "name": "appointment_time",
@@ -1451,11 +1417,8 @@ public boolean hasDateTimePicker() {
    *
    * 
    * Displays a widget that lets users input a date, time, or date and time.
-   *
    * For example, the following JSON creates a date time picker to schedule an
    * appointment:
-   *
-   *
    * ```
    * "dateTimePicker": {
    *   "name": "appointment_time",
@@ -1483,11 +1446,8 @@ public com.google.apps.card.v1.DateTimePicker getDateTimePicker() {
    *
    * 
    * Displays a widget that lets users input a date, time, or date and time.
-   *
    * For example, the following JSON creates a date time picker to schedule an
    * appointment:
-   *
-   *
    * ```
    * "dateTimePicker": {
    *   "name": "appointment_time",
@@ -1515,7 +1475,6 @@ public com.google.apps.card.v1.DateTimePickerOrBuilder getDateTimePickerOrBuilde
    *
    * 
    * Displays a horizontal line divider between widgets.
-   *
    * For example, the following JSON creates a divider:
    * ```
    * "divider": {
@@ -1537,7 +1496,6 @@ public boolean hasDivider() {
    *
    * 
    * Displays a horizontal line divider between widgets.
-   *
    * For example, the following JSON creates a divider:
    * ```
    * "divider": {
@@ -1562,7 +1520,6 @@ public com.google.apps.card.v1.Divider getDivider() {
    *
    * 
    * Displays a horizontal line divider between widgets.
-   *
    * For example, the following JSON creates a divider:
    * ```
    * "divider": {
@@ -1587,18 +1544,14 @@ public com.google.apps.card.v1.DividerOrBuilder getDividerOrBuilder() {
    *
    * 
    * Displays a grid with a collection of items.
-   *
    * A grid supports any number of columns and items. The number of rows is
    * determined by the upper bounds of the number items divided by the number
    * of columns. A grid with 10 items and 2 columns has 5 rows. A grid with 11
    * items and 2 columns has 6 rows.
-   *
    * [Google Workspace add-ons and
    * Chat apps](https://developers.google.com/workspace/extend):
-   *
    * For example, the following JSON creates a 2 column grid with a single
    * item:
-   *
    * ```
    * "grid": {
    *   "title": "A fine collection of items",
@@ -1645,18 +1598,14 @@ public boolean hasGrid() {
    *
    * 
    * Displays a grid with a collection of items.
-   *
    * A grid supports any number of columns and items. The number of rows is
    * determined by the upper bounds of the number items divided by the number
    * of columns. A grid with 10 items and 2 columns has 5 rows. A grid with 11
    * items and 2 columns has 6 rows.
-   *
    * [Google Workspace add-ons and
    * Chat apps](https://developers.google.com/workspace/extend):
-   *
    * For example, the following JSON creates a 2 column grid with a single
    * item:
-   *
    * ```
    * "grid": {
    *   "title": "A fine collection of items",
@@ -1706,18 +1655,14 @@ public com.google.apps.card.v1.Grid getGrid() {
    *
    * 
    * Displays a grid with a collection of items.
-   *
    * A grid supports any number of columns and items. The number of rows is
    * determined by the upper bounds of the number items divided by the number
    * of columns. A grid with 10 items and 2 columns has 5 rows. A grid with 11
    * items and 2 columns has 6 rows.
-   *
    * [Google Workspace add-ons and
    * Chat apps](https://developers.google.com/workspace/extend):
-   *
    * For example, the following JSON creates a 2 column grid with a single
    * item:
-   *
    * ```
    * "grid": {
    *   "title": "A fine collection of items",
@@ -1767,12 +1712,9 @@ public com.google.apps.card.v1.GridOrBuilder getGridOrBuilder() {
    *
    * 
    * Displays up to 2 columns.
-   *
    * To include more than 2 columns, or to use rows, use the `Grid` widget.
-   *
    * For example, the following JSON creates 2 columns that each contain
    * text paragraphs:
-   *
    * ```
    * "columns": {
    *   "columnItems": [
@@ -1819,12 +1761,9 @@ public boolean hasColumns() {
    *
    * 
    * Displays up to 2 columns.
-   *
    * To include more than 2 columns, or to use rows, use the `Grid` widget.
-   *
    * For example, the following JSON creates 2 columns that each contain
    * text paragraphs:
-   *
    * ```
    * "columns": {
    *   "columnItems": [
@@ -1874,12 +1813,9 @@ public com.google.apps.card.v1.Columns getColumns() {
    *
    * 
    * Displays up to 2 columns.
-   *
    * To include more than 2 columns, or to use rows, use the `Grid` widget.
-   *
    * For example, the following JSON creates 2 columns that each contain
    * text paragraphs:
-   *
    * ```
    * "columns": {
    *   "columnItems": [
@@ -1931,7 +1867,6 @@ public com.google.apps.card.v1.ColumnsOrBuilder getColumnsOrBuilder() {
    * A carousel contains a collection of nested widgets.
    * For example, this is a JSON representation of a carousel that contains
    * two text paragraphs.
-   *
    * ```
    * {
    *   "widgets": [
@@ -1966,7 +1901,6 @@ public boolean hasCarousel() {
    * A carousel contains a collection of nested widgets.
    * For example, this is a JSON representation of a carousel that contains
    * two text paragraphs.
-   *
    * ```
    * {
    *   "widgets": [
@@ -2004,7 +1938,6 @@ public com.google.apps.card.v1.Carousel getCarousel() {
    * A carousel contains a collection of nested widgets.
    * For example, this is a JSON representation of a carousel that contains
    * two text paragraphs.
-   *
    * ```
    * {
    *   "widgets": [
@@ -2040,7 +1973,6 @@ public com.google.apps.card.v1.CarouselOrBuilder getCarouselOrBuilder() {
    *
    * 
    * A list of chips.
-   *
    * For example, the following JSON creates two chips. The first
    * is a text chip and the second is an icon chip that opens a
    * link:
@@ -2081,7 +2013,6 @@ public boolean hasChipList() {
    *
    * 
    * A list of chips.
-   *
    * For example, the following JSON creates two chips. The first
    * is a text chip and the second is an icon chip that opens a
    * link:
@@ -2125,7 +2056,6 @@ public com.google.apps.card.v1.ChipList getChipList() {
    *
    * 
    * A list of chips.
-   *
    * For example, the following JSON creates two chips. The first
    * is a text chip and the second is an icon chip that opens a
    * link:
@@ -2163,7 +2093,7 @@ public com.google.apps.card.v1.ChipListOrBuilder getChipListOrBuilder() {
   }
 
   public static final int HORIZONTAL_ALIGNMENT_FIELD_NUMBER = 8;
-  private int horizontalAlignment_ = 0;
+  private int horizontalAlignment_;
 
   /**
    *
@@ -2194,8 +2124,9 @@ public int getHorizontalAlignmentValue() {
    */
   @java.lang.Override
   public com.google.apps.card.v1.Widget.HorizontalAlignment getHorizontalAlignment() {
+    @SuppressWarnings("deprecation")
     com.google.apps.card.v1.Widget.HorizontalAlignment result =
-        com.google.apps.card.v1.Widget.HorizontalAlignment.forNumber(horizontalAlignment_);
+        com.google.apps.card.v1.Widget.HorizontalAlignment.valueOf(horizontalAlignment_);
     return result == null
         ? com.google.apps.card.v1.Widget.HorizontalAlignment.UNRECOGNIZED
         : result;
@@ -2557,7 +2488,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * Each card is made up of widgets.
-   *
    * A widget is a composite object that can represent one of text, images,
    * buttons, and other object types.
    * 

@@ -2592,7 +2522,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (textParagraphBuilder_ != null) {
         textParagraphBuilder_.clear();
       }
@@ -2630,6 +2559,7 @@ public Builder clear() {
         chipListBuilder_.clear();
       }
       horizontalAlignment_ = 0;
+
       dataCase_ = 0;
       data_ = null;
       return this;
@@ -2658,60 +2588,94 @@ public com.google.apps.card.v1.Widget build() {
     @java.lang.Override
     public com.google.apps.card.v1.Widget buildPartial() {
       com.google.apps.card.v1.Widget result = new com.google.apps.card.v1.Widget(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      buildPartialOneofs(result);
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.apps.card.v1.Widget result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00001000) != 0)) {
-        result.horizontalAlignment_ = horizontalAlignment_;
-      }
-    }
-
-    private void buildPartialOneofs(com.google.apps.card.v1.Widget result) {
-      result.dataCase_ = dataCase_;
-      result.data_ = this.data_;
-      if (dataCase_ == 1 && textParagraphBuilder_ != null) {
-        result.data_ = textParagraphBuilder_.build();
+      if (dataCase_ == 1) {
+        if (textParagraphBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = textParagraphBuilder_.build();
+        }
       }
-      if (dataCase_ == 2 && imageBuilder_ != null) {
-        result.data_ = imageBuilder_.build();
+      if (dataCase_ == 2) {
+        if (imageBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = imageBuilder_.build();
+        }
       }
-      if (dataCase_ == 3 && decoratedTextBuilder_ != null) {
-        result.data_ = decoratedTextBuilder_.build();
+      if (dataCase_ == 3) {
+        if (decoratedTextBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = decoratedTextBuilder_.build();
+        }
       }
-      if (dataCase_ == 4 && buttonListBuilder_ != null) {
-        result.data_ = buttonListBuilder_.build();
+      if (dataCase_ == 4) {
+        if (buttonListBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = buttonListBuilder_.build();
+        }
       }
-      if (dataCase_ == 5 && textInputBuilder_ != null) {
-        result.data_ = textInputBuilder_.build();
+      if (dataCase_ == 5) {
+        if (textInputBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = textInputBuilder_.build();
+        }
       }
-      if (dataCase_ == 6 && selectionInputBuilder_ != null) {
-        result.data_ = selectionInputBuilder_.build();
+      if (dataCase_ == 6) {
+        if (selectionInputBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = selectionInputBuilder_.build();
+        }
       }
-      if (dataCase_ == 7 && dateTimePickerBuilder_ != null) {
-        result.data_ = dateTimePickerBuilder_.build();
+      if (dataCase_ == 7) {
+        if (dateTimePickerBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = dateTimePickerBuilder_.build();
+        }
       }
-      if (dataCase_ == 9 && dividerBuilder_ != null) {
-        result.data_ = dividerBuilder_.build();
+      if (dataCase_ == 9) {
+        if (dividerBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = dividerBuilder_.build();
+        }
       }
-      if (dataCase_ == 10 && gridBuilder_ != null) {
-        result.data_ = gridBuilder_.build();
+      if (dataCase_ == 10) {
+        if (gridBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = gridBuilder_.build();
+        }
       }
-      if (dataCase_ == 11 && columnsBuilder_ != null) {
-        result.data_ = columnsBuilder_.build();
+      if (dataCase_ == 11) {
+        if (columnsBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = columnsBuilder_.build();
+        }
       }
-      if (dataCase_ == 13 && carouselBuilder_ != null) {
-        result.data_ = carouselBuilder_.build();
+      if (dataCase_ == 13) {
+        if (carouselBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = carouselBuilder_.build();
+        }
       }
-      if (dataCase_ == 14 && chipListBuilder_ != null) {
-        result.data_ = chipListBuilder_.build();
+      if (dataCase_ == 14) {
+        if (chipListBuilder_ == null) {
+          result.data_ = data_;
+        } else {
+          result.data_ = chipListBuilder_.build();
+        }
       }
+      result.horizontalAlignment_ = horizontalAlignment_;
+      result.dataCase_ = dataCase_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -2899,7 +2863,7 @@ public Builder mergeFrom(
             case 64:
               {
                 horizontalAlignment_ = input.readEnum();
-                bitField0_ |= 0x00001000;
+
                 break;
               } // case 64
             case 74:
@@ -2963,8 +2927,6 @@ public Builder clearData() {
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.apps.card.v1.TextParagraph,
             com.google.apps.card.v1.TextParagraph.Builder,
@@ -2983,7 +2945,6 @@ public Builder clearData() {
      * [Formatting
      * text in Google Workspace
      * add-ons](https://developers.google.com/apps-script/add-ons/concepts/widgets#text_formatting).
-     *
      * For example, the following JSON creates a bolded text:
      * ```
      * "textParagraph": {
@@ -3013,7 +2974,6 @@ public boolean hasTextParagraph() {
      * [Formatting
      * text in Google Workspace
      * add-ons](https://developers.google.com/apps-script/add-ons/concepts/widgets#text_formatting).
-     *
      * For example, the following JSON creates a bolded text:
      * ```
      * "textParagraph": {
@@ -3053,7 +3013,6 @@ public com.google.apps.card.v1.TextParagraph getTextParagraph() {
      * [Formatting
      * text in Google Workspace
      * add-ons](https://developers.google.com/apps-script/add-ons/concepts/widgets#text_formatting).
-     *
      * For example, the following JSON creates a bolded text:
      * ```
      * "textParagraph": {
@@ -3090,7 +3049,6 @@ public Builder setTextParagraph(com.google.apps.card.v1.TextParagraph value) {
      * [Formatting
      * text in Google Workspace
      * add-ons](https://developers.google.com/apps-script/add-ons/concepts/widgets#text_formatting).
-     *
      * For example, the following JSON creates a bolded text:
      * ```
      * "textParagraph": {
@@ -3124,7 +3082,6 @@ public Builder setTextParagraph(com.google.apps.card.v1.TextParagraph.Builder bu
      * [Formatting
      * text in Google Workspace
      * add-ons](https://developers.google.com/apps-script/add-ons/concepts/widgets#text_formatting).
-     *
      * For example, the following JSON creates a bolded text:
      * ```
      * "textParagraph": {
@@ -3170,7 +3127,6 @@ public Builder mergeTextParagraph(com.google.apps.card.v1.TextParagraph value) {
      * [Formatting
      * text in Google Workspace
      * add-ons](https://developers.google.com/apps-script/add-ons/concepts/widgets#text_formatting).
-     *
      * For example, the following JSON creates a bolded text:
      * ```
      * "textParagraph": {
@@ -3210,7 +3166,6 @@ public Builder clearTextParagraph() {
      * [Formatting
      * text in Google Workspace
      * add-ons](https://developers.google.com/apps-script/add-ons/concepts/widgets#text_formatting).
-     *
      * For example, the following JSON creates a bolded text:
      * ```
      * "textParagraph": {
@@ -3237,7 +3192,6 @@ public com.google.apps.card.v1.TextParagraph.Builder getTextParagraphBuilder() {
      * [Formatting
      * text in Google Workspace
      * add-ons](https://developers.google.com/apps-script/add-ons/concepts/widgets#text_formatting).
-     *
      * For example, the following JSON creates a bolded text:
      * ```
      * "textParagraph": {
@@ -3272,7 +3226,6 @@ public com.google.apps.card.v1.TextParagraphOrBuilder getTextParagraphOrBuilder(
      * [Formatting
      * text in Google Workspace
      * add-ons](https://developers.google.com/apps-script/add-ons/concepts/widgets#text_formatting).
-     *
      * For example, the following JSON creates a bolded text:
      * ```
      * "textParagraph": {
@@ -3302,6 +3255,7 @@ public com.google.apps.card.v1.TextParagraphOrBuilder getTextParagraphOrBuilder(
       }
       dataCase_ = 1;
       onChanged();
+      ;
       return textParagraphBuilder_;
     }
 
@@ -3316,7 +3270,6 @@ public com.google.apps.card.v1.TextParagraphOrBuilder getTextParagraphOrBuilder(
      *
      * 
      * Displays an image.
-     *
      * For example, the following JSON creates an image with alternative text:
      * ```
      * "image": {
@@ -3341,7 +3294,6 @@ public boolean hasImage() {
      *
      * 
      * Displays an image.
-     *
      * For example, the following JSON creates an image with alternative text:
      * ```
      * "image": {
@@ -3376,7 +3328,6 @@ public com.google.apps.card.v1.Image getImage() {
      *
      * 
      * Displays an image.
-     *
      * For example, the following JSON creates an image with alternative text:
      * ```
      * "image": {
@@ -3408,7 +3359,6 @@ public Builder setImage(com.google.apps.card.v1.Image value) {
      *
      * 
      * Displays an image.
-     *
      * For example, the following JSON creates an image with alternative text:
      * ```
      * "image": {
@@ -3437,7 +3387,6 @@ public Builder setImage(com.google.apps.card.v1.Image.Builder builderForValue) {
      *
      * 
      * Displays an image.
-     *
      * For example, the following JSON creates an image with alternative text:
      * ```
      * "image": {
@@ -3477,7 +3426,6 @@ public Builder mergeImage(com.google.apps.card.v1.Image value) {
      *
      * 
      * Displays an image.
-     *
      * For example, the following JSON creates an image with alternative text:
      * ```
      * "image": {
@@ -3512,7 +3460,6 @@ public Builder clearImage() {
      *
      * 
      * Displays an image.
-     *
      * For example, the following JSON creates an image with alternative text:
      * ```
      * "image": {
@@ -3534,7 +3481,6 @@ public com.google.apps.card.v1.Image.Builder getImageBuilder() {
      *
      * 
      * Displays an image.
-     *
      * For example, the following JSON creates an image with alternative text:
      * ```
      * "image": {
@@ -3564,7 +3510,6 @@ public com.google.apps.card.v1.ImageOrBuilder getImageOrBuilder() {
      *
      * 
      * Displays an image.
-     *
      * For example, the following JSON creates an image with alternative text:
      * ```
      * "image": {
@@ -3596,6 +3541,7 @@ public com.google.apps.card.v1.ImageOrBuilder getImageOrBuilder() {
       }
       dataCase_ = 2;
       onChanged();
+      ;
       return imageBuilder_;
     }
 
@@ -3610,10 +3556,8 @@ public com.google.apps.card.v1.ImageOrBuilder getImageOrBuilder() {
      *
      * 
      * Displays a decorated text item.
-     *
      * For example, the following JSON creates a decorated text widget showing
      * email address:
-     *
      * ```
      * "decoratedText": {
      *   "icon": {
@@ -3645,10 +3589,8 @@ public boolean hasDecoratedText() {
      *
      * 
      * Displays a decorated text item.
-     *
      * For example, the following JSON creates a decorated text widget showing
      * email address:
-     *
      * ```
      * "decoratedText": {
      *   "icon": {
@@ -3690,10 +3632,8 @@ public com.google.apps.card.v1.DecoratedText getDecoratedText() {
      *
      * 
      * Displays a decorated text item.
-     *
      * For example, the following JSON creates a decorated text widget showing
      * email address:
-     *
      * ```
      * "decoratedText": {
      *   "icon": {
@@ -3732,10 +3672,8 @@ public Builder setDecoratedText(com.google.apps.card.v1.DecoratedText value) {
      *
      * 
      * Displays a decorated text item.
-     *
      * For example, the following JSON creates a decorated text widget showing
      * email address:
-     *
      * ```
      * "decoratedText": {
      *   "icon": {
@@ -3771,10 +3709,8 @@ public Builder setDecoratedText(com.google.apps.card.v1.DecoratedText.Builder bu
      *
      * 
      * Displays a decorated text item.
-     *
      * For example, the following JSON creates a decorated text widget showing
      * email address:
-     *
      * ```
      * "decoratedText": {
      *   "icon": {
@@ -3822,10 +3758,8 @@ public Builder mergeDecoratedText(com.google.apps.card.v1.DecoratedText value) {
      *
      * 
      * Displays a decorated text item.
-     *
      * For example, the following JSON creates a decorated text widget showing
      * email address:
-     *
      * ```
      * "decoratedText": {
      *   "icon": {
@@ -3867,10 +3801,8 @@ public Builder clearDecoratedText() {
      *
      * 
      * Displays a decorated text item.
-     *
      * For example, the following JSON creates a decorated text widget showing
      * email address:
-     *
      * ```
      * "decoratedText": {
      *   "icon": {
@@ -3899,10 +3831,8 @@ public com.google.apps.card.v1.DecoratedText.Builder getDecoratedTextBuilder() {
      *
      * 
      * Displays a decorated text item.
-     *
      * For example, the following JSON creates a decorated text widget showing
      * email address:
-     *
      * ```
      * "decoratedText": {
      *   "icon": {
@@ -3939,10 +3869,8 @@ public com.google.apps.card.v1.DecoratedTextOrBuilder getDecoratedTextOrBuilder(
      *
      * 
      * Displays a decorated text item.
-     *
      * For example, the following JSON creates a decorated text widget showing
      * email address:
-     *
      * ```
      * "decoratedText": {
      *   "icon": {
@@ -3981,6 +3909,7 @@ public com.google.apps.card.v1.DecoratedTextOrBuilder getDecoratedTextOrBuilder(
       }
       dataCase_ = 3;
       onChanged();
+      ;
       return decoratedTextBuilder_;
     }
 
@@ -3995,7 +3924,6 @@ public com.google.apps.card.v1.DecoratedTextOrBuilder getDecoratedTextOrBuilder(
      *
      * 
      * A list of buttons.
-     *
      * For example, the following JSON creates two buttons. The first
      * is a blue text button and the second is an image button that opens a
      * link:
@@ -4041,7 +3969,6 @@ public boolean hasButtonList() {
      *
      * 
      * A list of buttons.
-     *
      * For example, the following JSON creates two buttons. The first
      * is a blue text button and the second is an image button that opens a
      * link:
@@ -4097,7 +4024,6 @@ public com.google.apps.card.v1.ButtonList getButtonList() {
      *
      * 
      * A list of buttons.
-     *
      * For example, the following JSON creates two buttons. The first
      * is a blue text button and the second is an image button that opens a
      * link:
@@ -4150,7 +4076,6 @@ public Builder setButtonList(com.google.apps.card.v1.ButtonList value) {
      *
      * 
      * A list of buttons.
-     *
      * For example, the following JSON creates two buttons. The first
      * is a blue text button and the second is an image button that opens a
      * link:
@@ -4200,7 +4125,6 @@ public Builder setButtonList(com.google.apps.card.v1.ButtonList.Builder builderF
      *
      * 
      * A list of buttons.
-     *
      * For example, the following JSON creates two buttons. The first
      * is a blue text button and the second is an image button that opens a
      * link:
@@ -4262,7 +4186,6 @@ public Builder mergeButtonList(com.google.apps.card.v1.ButtonList value) {
      *
      * 
      * A list of buttons.
-     *
      * For example, the following JSON creates two buttons. The first
      * is a blue text button and the second is an image button that opens a
      * link:
@@ -4318,7 +4241,6 @@ public Builder clearButtonList() {
      *
      * 
      * A list of buttons.
-     *
      * For example, the following JSON creates two buttons. The first
      * is a blue text button and the second is an image button that opens a
      * link:
@@ -4361,7 +4283,6 @@ public com.google.apps.card.v1.ButtonList.Builder getButtonListBuilder() {
      *
      * 
      * A list of buttons.
-     *
      * For example, the following JSON creates two buttons. The first
      * is a blue text button and the second is an image button that opens a
      * link:
@@ -4412,7 +4333,6 @@ public com.google.apps.card.v1.ButtonListOrBuilder getButtonListOrBuilder() {
      *
      * 
      * A list of buttons.
-     *
      * For example, the following JSON creates two buttons. The first
      * is a blue text button and the second is an image button that opens a
      * link:
@@ -4465,6 +4385,7 @@ public com.google.apps.card.v1.ButtonListOrBuilder getButtonListOrBuilder() {
       }
       dataCase_ = 4;
       onChanged();
+      ;
       return buttonListBuilder_;
     }
 
@@ -4479,17 +4400,14 @@ public com.google.apps.card.v1.ButtonListOrBuilder getButtonListOrBuilder() {
      *
      * 
      * Displays a text box that users can type into.
-     *
      * For example, the following JSON creates a text input for an email
      * address:
-     *
      * ```
      * "textInput": {
      *   "name": "mailing_address",
      *   "label": "Mailing Address"
      * }
      * ```
-     *
      * As another example, the following JSON creates a text input for a
      * programming language with static suggestions:
      * ```
@@ -4530,17 +4448,14 @@ public boolean hasTextInput() {
      *
      * 
      * Displays a text box that users can type into.
-     *
      * For example, the following JSON creates a text input for an email
      * address:
-     *
      * ```
      * "textInput": {
      *   "name": "mailing_address",
      *   "label": "Mailing Address"
      * }
      * ```
-     *
      * As another example, the following JSON creates a text input for a
      * programming language with static suggestions:
      * ```
@@ -4591,17 +4506,14 @@ public com.google.apps.card.v1.TextInput getTextInput() {
      *
      * 
      * Displays a text box that users can type into.
-     *
      * For example, the following JSON creates a text input for an email
      * address:
-     *
      * ```
      * "textInput": {
      *   "name": "mailing_address",
      *   "label": "Mailing Address"
      * }
      * ```
-     *
      * As another example, the following JSON creates a text input for a
      * programming language with static suggestions:
      * ```
@@ -4649,17 +4561,14 @@ public Builder setTextInput(com.google.apps.card.v1.TextInput value) {
      *
      * 
      * Displays a text box that users can type into.
-     *
      * For example, the following JSON creates a text input for an email
      * address:
-     *
      * ```
      * "textInput": {
      *   "name": "mailing_address",
      *   "label": "Mailing Address"
      * }
      * ```
-     *
      * As another example, the following JSON creates a text input for a
      * programming language with static suggestions:
      * ```
@@ -4704,17 +4613,14 @@ public Builder setTextInput(com.google.apps.card.v1.TextInput.Builder builderFor
      *
      * 
      * Displays a text box that users can type into.
-     *
      * For example, the following JSON creates a text input for an email
      * address:
-     *
      * ```
      * "textInput": {
      *   "name": "mailing_address",
      *   "label": "Mailing Address"
      * }
      * ```
-     *
      * As another example, the following JSON creates a text input for a
      * programming language with static suggestions:
      * ```
@@ -4771,17 +4677,14 @@ public Builder mergeTextInput(com.google.apps.card.v1.TextInput value) {
      *
      * 
      * Displays a text box that users can type into.
-     *
      * For example, the following JSON creates a text input for an email
      * address:
-     *
      * ```
      * "textInput": {
      *   "name": "mailing_address",
      *   "label": "Mailing Address"
      * }
      * ```
-     *
      * As another example, the following JSON creates a text input for a
      * programming language with static suggestions:
      * ```
@@ -4832,17 +4735,14 @@ public Builder clearTextInput() {
      *
      * 
      * Displays a text box that users can type into.
-     *
      * For example, the following JSON creates a text input for an email
      * address:
-     *
      * ```
      * "textInput": {
      *   "name": "mailing_address",
      *   "label": "Mailing Address"
      * }
      * ```
-     *
      * As another example, the following JSON creates a text input for a
      * programming language with static suggestions:
      * ```
@@ -4880,17 +4780,14 @@ public com.google.apps.card.v1.TextInput.Builder getTextInputBuilder() {
      *
      * 
      * Displays a text box that users can type into.
-     *
      * For example, the following JSON creates a text input for an email
      * address:
-     *
      * ```
      * "textInput": {
      *   "name": "mailing_address",
      *   "label": "Mailing Address"
      * }
      * ```
-     *
      * As another example, the following JSON creates a text input for a
      * programming language with static suggestions:
      * ```
@@ -4936,17 +4833,14 @@ public com.google.apps.card.v1.TextInputOrBuilder getTextInputOrBuilder() {
      *
      * 
      * Displays a text box that users can type into.
-     *
      * For example, the following JSON creates a text input for an email
      * address:
-     *
      * ```
      * "textInput": {
      *   "name": "mailing_address",
      *   "label": "Mailing Address"
      * }
      * ```
-     *
      * As another example, the following JSON creates a text input for a
      * programming language with static suggestions:
      * ```
@@ -4994,6 +4888,7 @@ public com.google.apps.card.v1.TextInputOrBuilder getTextInputOrBuilder() {
       }
       dataCase_ = 5;
       onChanged();
+      ;
       return textInputBuilder_;
     }
 
@@ -5009,10 +4904,8 @@ public com.google.apps.card.v1.TextInputOrBuilder getTextInputOrBuilder() {
      * 
      * Displays a selection control that lets users select items. Selection
      * controls can be checkboxes, radio buttons, switches, or dropdown menus.
-     *
      * For example, the following JSON creates a dropdown menu that lets users
      * choose a size:
-     *
      * ```
      * "selectionInput": {
      *   "name": "size",
@@ -5059,10 +4952,8 @@ public boolean hasSelectionInput() {
      * 
      * Displays a selection control that lets users select items. Selection
      * controls can be checkboxes, radio buttons, switches, or dropdown menus.
-     *
      * For example, the following JSON creates a dropdown menu that lets users
      * choose a size:
-     *
      * ```
      * "selectionInput": {
      *   "name": "size",
@@ -5119,10 +5010,8 @@ public com.google.apps.card.v1.SelectionInput getSelectionInput() {
      * 
      * Displays a selection control that lets users select items. Selection
      * controls can be checkboxes, radio buttons, switches, or dropdown menus.
-     *
      * For example, the following JSON creates a dropdown menu that lets users
      * choose a size:
-     *
      * ```
      * "selectionInput": {
      *   "name": "size",
@@ -5176,10 +5065,8 @@ public Builder setSelectionInput(com.google.apps.card.v1.SelectionInput value) {
      * 
      * Displays a selection control that lets users select items. Selection
      * controls can be checkboxes, radio buttons, switches, or dropdown menus.
-     *
      * For example, the following JSON creates a dropdown menu that lets users
      * choose a size:
-     *
      * ```
      * "selectionInput": {
      *   "name": "size",
@@ -5231,10 +5118,8 @@ public Builder setSelectionInput(
      * 
      * Displays a selection control that lets users select items. Selection
      * controls can be checkboxes, radio buttons, switches, or dropdown menus.
-     *
      * For example, the following JSON creates a dropdown menu that lets users
      * choose a size:
-     *
      * ```
      * "selectionInput": {
      *   "name": "size",
@@ -5298,10 +5183,8 @@ public Builder mergeSelectionInput(com.google.apps.card.v1.SelectionInput value)
      * 
      * Displays a selection control that lets users select items. Selection
      * controls can be checkboxes, radio buttons, switches, or dropdown menus.
-     *
      * For example, the following JSON creates a dropdown menu that lets users
      * choose a size:
-     *
      * ```
      * "selectionInput": {
      *   "name": "size",
@@ -5358,10 +5241,8 @@ public Builder clearSelectionInput() {
      * 
      * Displays a selection control that lets users select items. Selection
      * controls can be checkboxes, radio buttons, switches, or dropdown menus.
-     *
      * For example, the following JSON creates a dropdown menu that lets users
      * choose a size:
-     *
      * ```
      * "selectionInput": {
      *   "name": "size",
@@ -5405,10 +5286,8 @@ public com.google.apps.card.v1.SelectionInput.Builder getSelectionInputBuilder()
      * 
      * Displays a selection control that lets users select items. Selection
      * controls can be checkboxes, radio buttons, switches, or dropdown menus.
-     *
      * For example, the following JSON creates a dropdown menu that lets users
      * choose a size:
-     *
      * ```
      * "selectionInput": {
      *   "name": "size",
@@ -5460,10 +5339,8 @@ public com.google.apps.card.v1.SelectionInputOrBuilder getSelectionInputOrBuilde
      * 
      * Displays a selection control that lets users select items. Selection
      * controls can be checkboxes, radio buttons, switches, or dropdown menus.
-     *
      * For example, the following JSON creates a dropdown menu that lets users
      * choose a size:
-     *
      * ```
      * "selectionInput": {
      *   "name": "size",
@@ -5516,6 +5393,7 @@ public com.google.apps.card.v1.SelectionInputOrBuilder getSelectionInputOrBuilde
       }
       dataCase_ = 6;
       onChanged();
+      ;
       return selectionInputBuilder_;
     }
 
@@ -5530,11 +5408,8 @@ public com.google.apps.card.v1.SelectionInputOrBuilder getSelectionInputOrBuilde
      *
      * 
      * Displays a widget that lets users input a date, time, or date and time.
-     *
      * For example, the following JSON creates a date time picker to schedule an
      * appointment:
-     *
-     *
      * ```
      * "dateTimePicker": {
      *   "name": "appointment_time",
@@ -5559,11 +5434,8 @@ public boolean hasDateTimePicker() {
      *
      * 
      * Displays a widget that lets users input a date, time, or date and time.
-     *
      * For example, the following JSON creates a date time picker to schedule an
      * appointment:
-     *
-     *
      * ```
      * "dateTimePicker": {
      *   "name": "appointment_time",
@@ -5598,11 +5470,8 @@ public com.google.apps.card.v1.DateTimePicker getDateTimePicker() {
      *
      * 
      * Displays a widget that lets users input a date, time, or date and time.
-     *
      * For example, the following JSON creates a date time picker to schedule an
      * appointment:
-     *
-     *
      * ```
      * "dateTimePicker": {
      *   "name": "appointment_time",
@@ -5634,11 +5503,8 @@ public Builder setDateTimePicker(com.google.apps.card.v1.DateTimePicker value) {
      *
      * 
      * Displays a widget that lets users input a date, time, or date and time.
-     *
      * For example, the following JSON creates a date time picker to schedule an
      * appointment:
-     *
-     *
      * ```
      * "dateTimePicker": {
      *   "name": "appointment_time",
@@ -5668,11 +5534,8 @@ public Builder setDateTimePicker(
      *
      * 
      * Displays a widget that lets users input a date, time, or date and time.
-     *
      * For example, the following JSON creates a date time picker to schedule an
      * appointment:
-     *
-     *
      * ```
      * "dateTimePicker": {
      *   "name": "appointment_time",
@@ -5714,11 +5577,8 @@ public Builder mergeDateTimePicker(com.google.apps.card.v1.DateTimePicker value)
      *
      * 
      * Displays a widget that lets users input a date, time, or date and time.
-     *
      * For example, the following JSON creates a date time picker to schedule an
      * appointment:
-     *
-     *
      * ```
      * "dateTimePicker": {
      *   "name": "appointment_time",
@@ -5753,11 +5613,8 @@ public Builder clearDateTimePicker() {
      *
      * 
      * Displays a widget that lets users input a date, time, or date and time.
-     *
      * For example, the following JSON creates a date time picker to schedule an
      * appointment:
-     *
-     *
      * ```
      * "dateTimePicker": {
      *   "name": "appointment_time",
@@ -5779,11 +5636,8 @@ public com.google.apps.card.v1.DateTimePicker.Builder getDateTimePickerBuilder()
      *
      * 
      * Displays a widget that lets users input a date, time, or date and time.
-     *
      * For example, the following JSON creates a date time picker to schedule an
      * appointment:
-     *
-     *
      * ```
      * "dateTimePicker": {
      *   "name": "appointment_time",
@@ -5813,11 +5667,8 @@ public com.google.apps.card.v1.DateTimePickerOrBuilder getDateTimePickerOrBuilde
      *
      * 
      * Displays a widget that lets users input a date, time, or date and time.
-     *
      * For example, the following JSON creates a date time picker to schedule an
      * appointment:
-     *
-     *
      * ```
      * "dateTimePicker": {
      *   "name": "appointment_time",
@@ -5849,6 +5700,7 @@ public com.google.apps.card.v1.DateTimePickerOrBuilder getDateTimePickerOrBuilde
       }
       dataCase_ = 7;
       onChanged();
+      ;
       return dateTimePickerBuilder_;
     }
 
@@ -5863,7 +5715,6 @@ public com.google.apps.card.v1.DateTimePickerOrBuilder getDateTimePickerOrBuilde
      *
      * 
      * Displays a horizontal line divider between widgets.
-     *
      * For example, the following JSON creates a divider:
      * ```
      * "divider": {
@@ -5885,7 +5736,6 @@ public boolean hasDivider() {
      *
      * 
      * Displays a horizontal line divider between widgets.
-     *
      * For example, the following JSON creates a divider:
      * ```
      * "divider": {
@@ -5917,7 +5767,6 @@ public com.google.apps.card.v1.Divider getDivider() {
      *
      * 
      * Displays a horizontal line divider between widgets.
-     *
      * For example, the following JSON creates a divider:
      * ```
      * "divider": {
@@ -5946,7 +5795,6 @@ public Builder setDivider(com.google.apps.card.v1.Divider value) {
      *
      * 
      * Displays a horizontal line divider between widgets.
-     *
      * For example, the following JSON creates a divider:
      * ```
      * "divider": {
@@ -5972,7 +5820,6 @@ public Builder setDivider(com.google.apps.card.v1.Divider.Builder builderForValu
      *
      * 
      * Displays a horizontal line divider between widgets.
-     *
      * For example, the following JSON creates a divider:
      * ```
      * "divider": {
@@ -6009,7 +5856,6 @@ public Builder mergeDivider(com.google.apps.card.v1.Divider value) {
      *
      * 
      * Displays a horizontal line divider between widgets.
-     *
      * For example, the following JSON creates a divider:
      * ```
      * "divider": {
@@ -6041,7 +5887,6 @@ public Builder clearDivider() {
      *
      * 
      * Displays a horizontal line divider between widgets.
-     *
      * For example, the following JSON creates a divider:
      * ```
      * "divider": {
@@ -6060,7 +5905,6 @@ public com.google.apps.card.v1.Divider.Builder getDividerBuilder() {
      *
      * 
      * Displays a horizontal line divider between widgets.
-     *
      * For example, the following JSON creates a divider:
      * ```
      * "divider": {
@@ -6087,7 +5931,6 @@ public com.google.apps.card.v1.DividerOrBuilder getDividerOrBuilder() {
      *
      * 
      * Displays a horizontal line divider between widgets.
-     *
      * For example, the following JSON creates a divider:
      * ```
      * "divider": {
@@ -6116,6 +5959,7 @@ public com.google.apps.card.v1.DividerOrBuilder getDividerOrBuilder() {
       }
       dataCase_ = 9;
       onChanged();
+      ;
       return dividerBuilder_;
     }
 
@@ -6130,18 +5974,14 @@ public com.google.apps.card.v1.DividerOrBuilder getDividerOrBuilder() {
      *
      * 
      * Displays a grid with a collection of items.
-     *
      * A grid supports any number of columns and items. The number of rows is
      * determined by the upper bounds of the number items divided by the number
      * of columns. A grid with 10 items and 2 columns has 5 rows. A grid with 11
      * items and 2 columns has 6 rows.
-     *
      * [Google Workspace add-ons and
      * Chat apps](https://developers.google.com/workspace/extend):
-     *
      * For example, the following JSON creates a 2 column grid with a single
      * item:
-     *
      * ```
      * "grid": {
      *   "title": "A fine collection of items",
@@ -6188,18 +6028,14 @@ public boolean hasGrid() {
      *
      * 
      * Displays a grid with a collection of items.
-     *
      * A grid supports any number of columns and items. The number of rows is
      * determined by the upper bounds of the number items divided by the number
      * of columns. A grid with 10 items and 2 columns has 5 rows. A grid with 11
      * items and 2 columns has 6 rows.
-     *
      * [Google Workspace add-ons and
      * Chat apps](https://developers.google.com/workspace/extend):
-     *
      * For example, the following JSON creates a 2 column grid with a single
      * item:
-     *
      * ```
      * "grid": {
      *   "title": "A fine collection of items",
@@ -6256,18 +6092,14 @@ public com.google.apps.card.v1.Grid getGrid() {
      *
      * 
      * Displays a grid with a collection of items.
-     *
      * A grid supports any number of columns and items. The number of rows is
      * determined by the upper bounds of the number items divided by the number
      * of columns. A grid with 10 items and 2 columns has 5 rows. A grid with 11
      * items and 2 columns has 6 rows.
-     *
      * [Google Workspace add-ons and
      * Chat apps](https://developers.google.com/workspace/extend):
-     *
      * For example, the following JSON creates a 2 column grid with a single
      * item:
-     *
      * ```
      * "grid": {
      *   "title": "A fine collection of items",
@@ -6321,18 +6153,14 @@ public Builder setGrid(com.google.apps.card.v1.Grid value) {
      *
      * 
      * Displays a grid with a collection of items.
-     *
      * A grid supports any number of columns and items. The number of rows is
      * determined by the upper bounds of the number items divided by the number
      * of columns. A grid with 10 items and 2 columns has 5 rows. A grid with 11
      * items and 2 columns has 6 rows.
-     *
      * [Google Workspace add-ons and
      * Chat apps](https://developers.google.com/workspace/extend):
-     *
      * For example, the following JSON creates a 2 column grid with a single
      * item:
-     *
      * ```
      * "grid": {
      *   "title": "A fine collection of items",
@@ -6383,18 +6211,14 @@ public Builder setGrid(com.google.apps.card.v1.Grid.Builder builderForValue) {
      *
      * 
      * Displays a grid with a collection of items.
-     *
      * A grid supports any number of columns and items. The number of rows is
      * determined by the upper bounds of the number items divided by the number
      * of columns. A grid with 10 items and 2 columns has 5 rows. A grid with 11
      * items and 2 columns has 6 rows.
-     *
      * [Google Workspace add-ons and
      * Chat apps](https://developers.google.com/workspace/extend):
-     *
      * For example, the following JSON creates a 2 column grid with a single
      * item:
-     *
      * ```
      * "grid": {
      *   "title": "A fine collection of items",
@@ -6456,18 +6280,14 @@ public Builder mergeGrid(com.google.apps.card.v1.Grid value) {
      *
      * 
      * Displays a grid with a collection of items.
-     *
      * A grid supports any number of columns and items. The number of rows is
      * determined by the upper bounds of the number items divided by the number
      * of columns. A grid with 10 items and 2 columns has 5 rows. A grid with 11
      * items and 2 columns has 6 rows.
-     *
      * [Google Workspace add-ons and
      * Chat apps](https://developers.google.com/workspace/extend):
-     *
      * For example, the following JSON creates a 2 column grid with a single
      * item:
-     *
      * ```
      * "grid": {
      *   "title": "A fine collection of items",
@@ -6524,18 +6344,14 @@ public Builder clearGrid() {
      *
      * 
      * Displays a grid with a collection of items.
-     *
      * A grid supports any number of columns and items. The number of rows is
      * determined by the upper bounds of the number items divided by the number
      * of columns. A grid with 10 items and 2 columns has 5 rows. A grid with 11
      * items and 2 columns has 6 rows.
-     *
      * [Google Workspace add-ons and
      * Chat apps](https://developers.google.com/workspace/extend):
-     *
      * For example, the following JSON creates a 2 column grid with a single
      * item:
-     *
      * ```
      * "grid": {
      *   "title": "A fine collection of items",
@@ -6579,18 +6395,14 @@ public com.google.apps.card.v1.Grid.Builder getGridBuilder() {
      *
      * 
      * Displays a grid with a collection of items.
-     *
      * A grid supports any number of columns and items. The number of rows is
      * determined by the upper bounds of the number items divided by the number
      * of columns. A grid with 10 items and 2 columns has 5 rows. A grid with 11
      * items and 2 columns has 6 rows.
-     *
      * [Google Workspace add-ons and
      * Chat apps](https://developers.google.com/workspace/extend):
-     *
      * For example, the following JSON creates a 2 column grid with a single
      * item:
-     *
      * ```
      * "grid": {
      *   "title": "A fine collection of items",
@@ -6642,18 +6454,14 @@ public com.google.apps.card.v1.GridOrBuilder getGridOrBuilder() {
      *
      * 
      * Displays a grid with a collection of items.
-     *
      * A grid supports any number of columns and items. The number of rows is
      * determined by the upper bounds of the number items divided by the number
      * of columns. A grid with 10 items and 2 columns has 5 rows. A grid with 11
      * items and 2 columns has 6 rows.
-     *
      * [Google Workspace add-ons and
      * Chat apps](https://developers.google.com/workspace/extend):
-     *
      * For example, the following JSON creates a 2 column grid with a single
      * item:
-     *
      * ```
      * "grid": {
      *   "title": "A fine collection of items",
@@ -6707,6 +6515,7 @@ public com.google.apps.card.v1.GridOrBuilder getGridOrBuilder() {
       }
       dataCase_ = 10;
       onChanged();
+      ;
       return gridBuilder_;
     }
 
@@ -6721,12 +6530,9 @@ public com.google.apps.card.v1.GridOrBuilder getGridOrBuilder() {
      *
      * 
      * Displays up to 2 columns.
-     *
      * To include more than 2 columns, or to use rows, use the `Grid` widget.
-     *
      * For example, the following JSON creates 2 columns that each contain
      * text paragraphs:
-     *
      * ```
      * "columns": {
      *   "columnItems": [
@@ -6773,12 +6579,9 @@ public boolean hasColumns() {
      *
      * 
      * Displays up to 2 columns.
-     *
      * To include more than 2 columns, or to use rows, use the `Grid` widget.
-     *
      * For example, the following JSON creates 2 columns that each contain
      * text paragraphs:
-     *
      * ```
      * "columns": {
      *   "columnItems": [
@@ -6835,12 +6638,9 @@ public com.google.apps.card.v1.Columns getColumns() {
      *
      * 
      * Displays up to 2 columns.
-     *
      * To include more than 2 columns, or to use rows, use the `Grid` widget.
-     *
      * For example, the following JSON creates 2 columns that each contain
      * text paragraphs:
-     *
      * ```
      * "columns": {
      *   "columnItems": [
@@ -6894,12 +6694,9 @@ public Builder setColumns(com.google.apps.card.v1.Columns value) {
      *
      * 
      * Displays up to 2 columns.
-     *
      * To include more than 2 columns, or to use rows, use the `Grid` widget.
-     *
      * For example, the following JSON creates 2 columns that each contain
      * text paragraphs:
-     *
      * ```
      * "columns": {
      *   "columnItems": [
@@ -6950,12 +6747,9 @@ public Builder setColumns(com.google.apps.card.v1.Columns.Builder builderForValu
      *
      * 
      * Displays up to 2 columns.
-     *
      * To include more than 2 columns, or to use rows, use the `Grid` widget.
-     *
      * For example, the following JSON creates 2 columns that each contain
      * text paragraphs:
-     *
      * ```
      * "columns": {
      *   "columnItems": [
@@ -7017,12 +6811,9 @@ public Builder mergeColumns(com.google.apps.card.v1.Columns value) {
      *
      * 
      * Displays up to 2 columns.
-     *
      * To include more than 2 columns, or to use rows, use the `Grid` widget.
-     *
      * For example, the following JSON creates 2 columns that each contain
      * text paragraphs:
-     *
      * ```
      * "columns": {
      *   "columnItems": [
@@ -7079,12 +6870,9 @@ public Builder clearColumns() {
      *
      * 
      * Displays up to 2 columns.
-     *
      * To include more than 2 columns, or to use rows, use the `Grid` widget.
-     *
      * For example, the following JSON creates 2 columns that each contain
      * text paragraphs:
-     *
      * ```
      * "columns": {
      *   "columnItems": [
@@ -7128,12 +6916,9 @@ public com.google.apps.card.v1.Columns.Builder getColumnsBuilder() {
      *
      * 
      * Displays up to 2 columns.
-     *
      * To include more than 2 columns, or to use rows, use the `Grid` widget.
-     *
      * For example, the following JSON creates 2 columns that each contain
      * text paragraphs:
-     *
      * ```
      * "columns": {
      *   "columnItems": [
@@ -7185,12 +6970,9 @@ public com.google.apps.card.v1.ColumnsOrBuilder getColumnsOrBuilder() {
      *
      * 
      * Displays up to 2 columns.
-     *
      * To include more than 2 columns, or to use rows, use the `Grid` widget.
-     *
      * For example, the following JSON creates 2 columns that each contain
      * text paragraphs:
-     *
      * ```
      * "columns": {
      *   "columnItems": [
@@ -7244,6 +7026,7 @@ public com.google.apps.card.v1.ColumnsOrBuilder getColumnsOrBuilder() {
       }
       dataCase_ = 11;
       onChanged();
+      ;
       return columnsBuilder_;
     }
 
@@ -7260,7 +7043,6 @@ public com.google.apps.card.v1.ColumnsOrBuilder getColumnsOrBuilder() {
      * A carousel contains a collection of nested widgets.
      * For example, this is a JSON representation of a carousel that contains
      * two text paragraphs.
-     *
      * ```
      * {
      *   "widgets": [
@@ -7295,7 +7077,6 @@ public boolean hasCarousel() {
      * A carousel contains a collection of nested widgets.
      * For example, this is a JSON representation of a carousel that contains
      * two text paragraphs.
-     *
      * ```
      * {
      *   "widgets": [
@@ -7340,7 +7121,6 @@ public com.google.apps.card.v1.Carousel getCarousel() {
      * A carousel contains a collection of nested widgets.
      * For example, this is a JSON representation of a carousel that contains
      * two text paragraphs.
-     *
      * ```
      * {
      *   "widgets": [
@@ -7382,7 +7162,6 @@ public Builder setCarousel(com.google.apps.card.v1.Carousel value) {
      * A carousel contains a collection of nested widgets.
      * For example, this is a JSON representation of a carousel that contains
      * two text paragraphs.
-     *
      * ```
      * {
      *   "widgets": [
@@ -7421,7 +7200,6 @@ public Builder setCarousel(com.google.apps.card.v1.Carousel.Builder builderForVa
      * A carousel contains a collection of nested widgets.
      * For example, this is a JSON representation of a carousel that contains
      * two text paragraphs.
-     *
      * ```
      * {
      *   "widgets": [
@@ -7471,7 +7249,6 @@ public Builder mergeCarousel(com.google.apps.card.v1.Carousel value) {
      * A carousel contains a collection of nested widgets.
      * For example, this is a JSON representation of a carousel that contains
      * two text paragraphs.
-     *
      * ```
      * {
      *   "widgets": [
@@ -7516,7 +7293,6 @@ public Builder clearCarousel() {
      * A carousel contains a collection of nested widgets.
      * For example, this is a JSON representation of a carousel that contains
      * two text paragraphs.
-     *
      * ```
      * {
      *   "widgets": [
@@ -7548,7 +7324,6 @@ public com.google.apps.card.v1.Carousel.Builder getCarouselBuilder() {
      * A carousel contains a collection of nested widgets.
      * For example, this is a JSON representation of a carousel that contains
      * two text paragraphs.
-     *
      * ```
      * {
      *   "widgets": [
@@ -7588,7 +7363,6 @@ public com.google.apps.card.v1.CarouselOrBuilder getCarouselOrBuilder() {
      * A carousel contains a collection of nested widgets.
      * For example, this is a JSON representation of a carousel that contains
      * two text paragraphs.
-     *
      * ```
      * {
      *   "widgets": [
@@ -7628,6 +7402,7 @@ public com.google.apps.card.v1.CarouselOrBuilder getCarouselOrBuilder() {
       }
       dataCase_ = 13;
       onChanged();
+      ;
       return carouselBuilder_;
     }
 
@@ -7642,7 +7417,6 @@ public com.google.apps.card.v1.CarouselOrBuilder getCarouselOrBuilder() {
      *
      * 
      * A list of chips.
-     *
      * For example, the following JSON creates two chips. The first
      * is a text chip and the second is an icon chip that opens a
      * link:
@@ -7683,7 +7457,6 @@ public boolean hasChipList() {
      *
      * 
      * A list of chips.
-     *
      * For example, the following JSON creates two chips. The first
      * is a text chip and the second is an icon chip that opens a
      * link:
@@ -7734,7 +7507,6 @@ public com.google.apps.card.v1.ChipList getChipList() {
      *
      * 
      * A list of chips.
-     *
      * For example, the following JSON creates two chips. The first
      * is a text chip and the second is an icon chip that opens a
      * link:
@@ -7782,7 +7554,6 @@ public Builder setChipList(com.google.apps.card.v1.ChipList value) {
      *
      * 
      * A list of chips.
-     *
      * For example, the following JSON creates two chips. The first
      * is a text chip and the second is an icon chip that opens a
      * link:
@@ -7827,7 +7598,6 @@ public Builder setChipList(com.google.apps.card.v1.ChipList.Builder builderForVa
      *
      * 
      * A list of chips.
-     *
      * For example, the following JSON creates two chips. The first
      * is a text chip and the second is an icon chip that opens a
      * link:
@@ -7883,7 +7653,6 @@ public Builder mergeChipList(com.google.apps.card.v1.ChipList value) {
      *
      * 
      * A list of chips.
-     *
      * For example, the following JSON creates two chips. The first
      * is a text chip and the second is an icon chip that opens a
      * link:
@@ -7934,7 +7703,6 @@ public Builder clearChipList() {
      *
      * 
      * A list of chips.
-     *
      * For example, the following JSON creates two chips. The first
      * is a text chip and the second is an icon chip that opens a
      * link:
@@ -7972,7 +7740,6 @@ public com.google.apps.card.v1.ChipList.Builder getChipListBuilder() {
      *
      * 
      * A list of chips.
-     *
      * For example, the following JSON creates two chips. The first
      * is a text chip and the second is an icon chip that opens a
      * link:
@@ -8018,7 +7785,6 @@ public com.google.apps.card.v1.ChipListOrBuilder getChipListOrBuilder() {
      *
      * 
      * A list of chips.
-     *
      * For example, the following JSON creates two chips. The first
      * is a text chip and the second is an icon chip that opens a
      * link:
@@ -8066,6 +7832,7 @@ public com.google.apps.card.v1.ChipListOrBuilder getChipListOrBuilder() {
       }
       dataCase_ = 14;
       onChanged();
+      ;
       return chipListBuilder_;
     }
 
@@ -8100,8 +7867,8 @@ public int getHorizontalAlignmentValue() {
      * @return This builder for chaining.
      */
     public Builder setHorizontalAlignmentValue(int value) {
+
       horizontalAlignment_ = value;
-      bitField0_ |= 0x00001000;
       onChanged();
       return this;
     }
@@ -8119,8 +7886,9 @@ public Builder setHorizontalAlignmentValue(int value) {
      */
     @java.lang.Override
     public com.google.apps.card.v1.Widget.HorizontalAlignment getHorizontalAlignment() {
+      @SuppressWarnings("deprecation")
       com.google.apps.card.v1.Widget.HorizontalAlignment result =
-          com.google.apps.card.v1.Widget.HorizontalAlignment.forNumber(horizontalAlignment_);
+          com.google.apps.card.v1.Widget.HorizontalAlignment.valueOf(horizontalAlignment_);
       return result == null
           ? com.google.apps.card.v1.Widget.HorizontalAlignment.UNRECOGNIZED
           : result;
@@ -8143,7 +7911,7 @@ public Builder setHorizontalAlignment(
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00001000;
+
       horizontalAlignment_ = value.getNumber();
       onChanged();
       return this;
@@ -8161,7 +7929,7 @@ public Builder setHorizontalAlignment(
      * @return This builder for chaining.
      */
     public Builder clearHorizontalAlignment() {
-      bitField0_ = (bitField0_ & ~0x00001000);
+
       horizontalAlignment_ = 0;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/WidgetOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/WidgetOrBuilder.java
index 18570d6208..c548fbdd52 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/WidgetOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/WidgetOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/apps/card/v1/card.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.apps.card.v1;
 
 public interface WidgetOrBuilder
@@ -36,7 +35,6 @@ public interface WidgetOrBuilder
    * [Formatting
    * text in Google Workspace
    * add-ons](https://developers.google.com/apps-script/add-ons/concepts/widgets#text_formatting).
-   *
    * For example, the following JSON creates a bolded text:
    * ```
    * "textParagraph": {
@@ -63,7 +61,6 @@ public interface WidgetOrBuilder
    * [Formatting
    * text in Google Workspace
    * add-ons](https://developers.google.com/apps-script/add-ons/concepts/widgets#text_formatting).
-   *
    * For example, the following JSON creates a bolded text:
    * ```
    * "textParagraph": {
@@ -90,7 +87,6 @@ public interface WidgetOrBuilder
    * [Formatting
    * text in Google Workspace
    * add-ons](https://developers.google.com/apps-script/add-ons/concepts/widgets#text_formatting).
-   *
    * For example, the following JSON creates a bolded text:
    * ```
    * "textParagraph": {
@@ -108,7 +104,6 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays an image.
-   *
    * For example, the following JSON creates an image with alternative text:
    * ```
    * "image": {
@@ -130,7 +125,6 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays an image.
-   *
    * For example, the following JSON creates an image with alternative text:
    * ```
    * "image": {
@@ -152,7 +146,6 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays an image.
-   *
    * For example, the following JSON creates an image with alternative text:
    * ```
    * "image": {
@@ -172,10 +165,8 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays a decorated text item.
-   *
    * For example, the following JSON creates a decorated text widget showing
    * email address:
-   *
    * ```
    * "decoratedText": {
    *   "icon": {
@@ -204,10 +195,8 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays a decorated text item.
-   *
    * For example, the following JSON creates a decorated text widget showing
    * email address:
-   *
    * ```
    * "decoratedText": {
    *   "icon": {
@@ -236,10 +225,8 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays a decorated text item.
-   *
    * For example, the following JSON creates a decorated text widget showing
    * email address:
-   *
    * ```
    * "decoratedText": {
    *   "icon": {
@@ -266,7 +253,6 @@ public interface WidgetOrBuilder
    *
    * 
    * A list of buttons.
-   *
    * For example, the following JSON creates two buttons. The first
    * is a blue text button and the second is an image button that opens a
    * link:
@@ -309,7 +295,6 @@ public interface WidgetOrBuilder
    *
    * 
    * A list of buttons.
-   *
    * For example, the following JSON creates two buttons. The first
    * is a blue text button and the second is an image button that opens a
    * link:
@@ -352,7 +337,6 @@ public interface WidgetOrBuilder
    *
    * 
    * A list of buttons.
-   *
    * For example, the following JSON creates two buttons. The first
    * is a blue text button and the second is an image button that opens a
    * link:
@@ -393,17 +377,14 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays a text box that users can type into.
-   *
    * For example, the following JSON creates a text input for an email
    * address:
-   *
    * ```
    * "textInput": {
    *   "name": "mailing_address",
    *   "label": "Mailing Address"
    * }
    * ```
-   *
    * As another example, the following JSON creates a text input for a
    * programming language with static suggestions:
    * ```
@@ -441,17 +422,14 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays a text box that users can type into.
-   *
    * For example, the following JSON creates a text input for an email
    * address:
-   *
    * ```
    * "textInput": {
    *   "name": "mailing_address",
    *   "label": "Mailing Address"
    * }
    * ```
-   *
    * As another example, the following JSON creates a text input for a
    * programming language with static suggestions:
    * ```
@@ -489,17 +467,14 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays a text box that users can type into.
-   *
    * For example, the following JSON creates a text input for an email
    * address:
-   *
    * ```
    * "textInput": {
    *   "name": "mailing_address",
    *   "label": "Mailing Address"
    * }
    * ```
-   *
    * As another example, the following JSON creates a text input for a
    * programming language with static suggestions:
    * ```
@@ -536,10 +511,8 @@ public interface WidgetOrBuilder
    * 
    * Displays a selection control that lets users select items. Selection
    * controls can be checkboxes, radio buttons, switches, or dropdown menus.
-   *
    * For example, the following JSON creates a dropdown menu that lets users
    * choose a size:
-   *
    * ```
    * "selectionInput": {
    *   "name": "size",
@@ -583,10 +556,8 @@ public interface WidgetOrBuilder
    * 
    * Displays a selection control that lets users select items. Selection
    * controls can be checkboxes, radio buttons, switches, or dropdown menus.
-   *
    * For example, the following JSON creates a dropdown menu that lets users
    * choose a size:
-   *
    * ```
    * "selectionInput": {
    *   "name": "size",
@@ -630,10 +601,8 @@ public interface WidgetOrBuilder
    * 
    * Displays a selection control that lets users select items. Selection
    * controls can be checkboxes, radio buttons, switches, or dropdown menus.
-   *
    * For example, the following JSON creates a dropdown menu that lets users
    * choose a size:
-   *
    * ```
    * "selectionInput": {
    *   "name": "size",
@@ -674,11 +643,8 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays a widget that lets users input a date, time, or date and time.
-   *
    * For example, the following JSON creates a date time picker to schedule an
    * appointment:
-   *
-   *
    * ```
    * "dateTimePicker": {
    *   "name": "appointment_time",
@@ -700,11 +666,8 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays a widget that lets users input a date, time, or date and time.
-   *
    * For example, the following JSON creates a date time picker to schedule an
    * appointment:
-   *
-   *
    * ```
    * "dateTimePicker": {
    *   "name": "appointment_time",
@@ -726,11 +689,8 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays a widget that lets users input a date, time, or date and time.
-   *
    * For example, the following JSON creates a date time picker to schedule an
    * appointment:
-   *
-   *
    * ```
    * "dateTimePicker": {
    *   "name": "appointment_time",
@@ -750,7 +710,6 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays a horizontal line divider between widgets.
-   *
    * For example, the following JSON creates a divider:
    * ```
    * "divider": {
@@ -769,7 +728,6 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays a horizontal line divider between widgets.
-   *
    * For example, the following JSON creates a divider:
    * ```
    * "divider": {
@@ -788,7 +746,6 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays a horizontal line divider between widgets.
-   *
    * For example, the following JSON creates a divider:
    * ```
    * "divider": {
@@ -805,18 +762,14 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays a grid with a collection of items.
-   *
    * A grid supports any number of columns and items. The number of rows is
    * determined by the upper bounds of the number items divided by the number
    * of columns. A grid with 10 items and 2 columns has 5 rows. A grid with 11
    * items and 2 columns has 6 rows.
-   *
    * [Google Workspace add-ons and
    * Chat apps](https://developers.google.com/workspace/extend):
-   *
    * For example, the following JSON creates a 2 column grid with a single
    * item:
-   *
    * ```
    * "grid": {
    *   "title": "A fine collection of items",
@@ -860,18 +813,14 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays a grid with a collection of items.
-   *
    * A grid supports any number of columns and items. The number of rows is
    * determined by the upper bounds of the number items divided by the number
    * of columns. A grid with 10 items and 2 columns has 5 rows. A grid with 11
    * items and 2 columns has 6 rows.
-   *
    * [Google Workspace add-ons and
    * Chat apps](https://developers.google.com/workspace/extend):
-   *
    * For example, the following JSON creates a 2 column grid with a single
    * item:
-   *
    * ```
    * "grid": {
    *   "title": "A fine collection of items",
@@ -915,18 +864,14 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays a grid with a collection of items.
-   *
    * A grid supports any number of columns and items. The number of rows is
    * determined by the upper bounds of the number items divided by the number
    * of columns. A grid with 10 items and 2 columns has 5 rows. A grid with 11
    * items and 2 columns has 6 rows.
-   *
    * [Google Workspace add-ons and
    * Chat apps](https://developers.google.com/workspace/extend):
-   *
    * For example, the following JSON creates a 2 column grid with a single
    * item:
-   *
    * ```
    * "grid": {
    *   "title": "A fine collection of items",
@@ -968,12 +913,9 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays up to 2 columns.
-   *
    * To include more than 2 columns, or to use rows, use the `Grid` widget.
-   *
    * For example, the following JSON creates 2 columns that each contain
    * text paragraphs:
-   *
    * ```
    * "columns": {
    *   "columnItems": [
@@ -1017,12 +959,9 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays up to 2 columns.
-   *
    * To include more than 2 columns, or to use rows, use the `Grid` widget.
-   *
    * For example, the following JSON creates 2 columns that each contain
    * text paragraphs:
-   *
    * ```
    * "columns": {
    *   "columnItems": [
@@ -1066,12 +1005,9 @@ public interface WidgetOrBuilder
    *
    * 
    * Displays up to 2 columns.
-   *
    * To include more than 2 columns, or to use rows, use the `Grid` widget.
-   *
    * For example, the following JSON creates 2 columns that each contain
    * text paragraphs:
-   *
    * ```
    * "columns": {
    *   "columnItems": [
@@ -1115,7 +1051,6 @@ public interface WidgetOrBuilder
    * A carousel contains a collection of nested widgets.
    * For example, this is a JSON representation of a carousel that contains
    * two text paragraphs.
-   *
    * ```
    * {
    *   "widgets": [
@@ -1147,7 +1082,6 @@ public interface WidgetOrBuilder
    * A carousel contains a collection of nested widgets.
    * For example, this is a JSON representation of a carousel that contains
    * two text paragraphs.
-   *
    * ```
    * {
    *   "widgets": [
@@ -1179,7 +1113,6 @@ public interface WidgetOrBuilder
    * A carousel contains a collection of nested widgets.
    * For example, this is a JSON representation of a carousel that contains
    * two text paragraphs.
-   *
    * ```
    * {
    *   "widgets": [
@@ -1207,7 +1140,6 @@ public interface WidgetOrBuilder
    *
    * 
    * A list of chips.
-   *
    * For example, the following JSON creates two chips. The first
    * is a text chip and the second is an icon chip that opens a
    * link:
@@ -1245,7 +1177,6 @@ public interface WidgetOrBuilder
    *
    * 
    * A list of chips.
-   *
    * For example, the following JSON creates two chips. The first
    * is a text chip and the second is an icon chip that opens a
    * link:
@@ -1283,7 +1214,6 @@ public interface WidgetOrBuilder
    *
    * 
    * A list of chips.
-   *
    * For example, the following JSON creates two chips. The first
    * is a text chip and the second is an icon chip that opens a
    * link:
@@ -1340,5 +1270,5 @@ public interface WidgetOrBuilder
    */
   com.google.apps.card.v1.Widget.HorizontalAlignment getHorizontalAlignment();
 
-  com.google.apps.card.v1.Widget.DataCase getDataCase();
+  public com.google.apps.card.v1.Widget.DataCase getDataCase();
 }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/ExtendedOperationsProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/ExtendedOperationsProto.java
index 9777eff3c1..fb4fc6e43a 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/ExtendedOperationsProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/ExtendedOperationsProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/extended_operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud;
 
 public final class ExtendedOperationsProto {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/OperationResponseMapping.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/OperationResponseMapping.java
index feb2109cbc..f9cb1b81d4 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/OperationResponseMapping.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/OperationResponseMapping.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/extended_operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud;
 
 /**
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 b44a872589..d7eaf47d39 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 /**
@@ -52,6 +51,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;
@@ -66,11 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.cloud.audit.AuditLog.class, com.google.cloud.audit.AuditLog.Builder.class);
   }
 
-  private int bitField0_;
   public static final int SERVICE_NAME_FIELD_NUMBER = 7;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object serviceName_ = "";
+  private volatile java.lang.Object serviceName_;
 
   /**
    *
@@ -123,9 +124,7 @@ public com.google.protobuf.ByteString getServiceNameBytes() {
   }
 
   public static final int METHOD_NAME_FIELD_NUMBER = 8;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object methodName_ = "";
+  private volatile java.lang.Object methodName_;
 
   /**
    *
@@ -134,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"
    * 

@@ -163,7 +161,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"
    * 

@@ -186,9 +183,7 @@ public com.google.protobuf.ByteString getMethodNameBytes() {
   }
 
   public static final int RESOURCE_NAME_FIELD_NUMBER = 11;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object resourceName_ = "";
+  private volatile java.lang.Object resourceName_;
 
   /**
    *
@@ -197,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"
    * 

@@ -226,7 +220,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"
    * 

@@ -264,7 +257,7 @@ public com.google.protobuf.ByteString getResourceNameBytes() {
    */
   @java.lang.Override
   public boolean hasResourceLocation() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return resourceLocation_ != null;
   }
 
   /**
@@ -296,9 +289,7 @@ public com.google.cloud.audit.ResourceLocation getResourceLocation() {
    */
   @java.lang.Override
   public com.google.cloud.audit.ResourceLocationOrBuilder getResourceLocationOrBuilder() {
-    return resourceLocation_ == null
-        ? com.google.cloud.audit.ResourceLocation.getDefaultInstance()
-        : resourceLocation_;
+    return getResourceLocation();
   }
 
   public static final int RESOURCE_ORIGINAL_STATE_FIELD_NUMBER = 19;
@@ -323,7 +314,7 @@ public com.google.cloud.audit.ResourceLocationOrBuilder getResourceLocationOrBui
    */
   @java.lang.Override
   public boolean hasResourceOriginalState() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return resourceOriginalState_ != null;
   }
 
   /**
@@ -367,13 +358,11 @@ public com.google.protobuf.Struct getResourceOriginalState() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getResourceOriginalStateOrBuilder() {
-    return resourceOriginalState_ == null
-        ? com.google.protobuf.Struct.getDefaultInstance()
-        : resourceOriginalState_;
+    return getResourceOriginalState();
   }
 
   public static final int NUM_RESPONSE_ITEMS_FIELD_NUMBER = 12;
-  private long numResponseItems_ = 0L;
+  private long numResponseItems_;
 
   /**
    *
@@ -408,7 +397,7 @@ public long getNumResponseItems() {
    */
   @java.lang.Override
   public boolean hasStatus() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return status_ != null;
   }
 
   /**
@@ -438,7 +427,7 @@ public com.google.rpc.Status getStatus() {
    */
   @java.lang.Override
   public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
-    return status_ == null ? com.google.rpc.Status.getDefaultInstance() : status_;
+    return getStatus();
   }
 
   public static final int AUTHENTICATION_INFO_FIELD_NUMBER = 3;
@@ -457,7 +446,7 @@ public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
    */
   @java.lang.Override
   public boolean hasAuthenticationInfo() {
-    return ((bitField0_ & 0x00000008) != 0);
+    return authenticationInfo_ != null;
   }
 
   /**
@@ -489,14 +478,10 @@ public com.google.cloud.audit.AuthenticationInfo getAuthenticationInfo() {
    */
   @java.lang.Override
   public com.google.cloud.audit.AuthenticationInfoOrBuilder getAuthenticationInfoOrBuilder() {
-    return authenticationInfo_ == null
-        ? com.google.cloud.audit.AuthenticationInfo.getDefaultInstance()
-        : authenticationInfo_;
+    return getAuthenticationInfo();
   }
 
   public static final int AUTHORIZATION_INFO_FIELD_NUMBER = 9;
-
-  @SuppressWarnings("serial")
   private java.util.List authorizationInfo_;
 
   /**
@@ -599,7 +584,7 @@ public com.google.cloud.audit.AuthorizationInfoOrBuilder getAuthorizationInfoOrB
    */
   @java.lang.Override
   public boolean hasPolicyViolationInfo() {
-    return ((bitField0_ & 0x00000010) != 0);
+    return policyViolationInfo_ != null;
   }
 
   /**
@@ -635,9 +620,7 @@ public com.google.cloud.audit.PolicyViolationInfo getPolicyViolationInfo() {
    */
   @java.lang.Override
   public com.google.cloud.audit.PolicyViolationInfoOrBuilder getPolicyViolationInfoOrBuilder() {
-    return policyViolationInfo_ == null
-        ? com.google.cloud.audit.PolicyViolationInfo.getDefaultInstance()
-        : policyViolationInfo_;
+    return getPolicyViolationInfo();
   }
 
   public static final int REQUEST_METADATA_FIELD_NUMBER = 4;
@@ -656,7 +639,7 @@ public com.google.cloud.audit.PolicyViolationInfoOrBuilder getPolicyViolationInf
    */
   @java.lang.Override
   public boolean hasRequestMetadata() {
-    return ((bitField0_ & 0x00000020) != 0);
+    return requestMetadata_ != null;
   }
 
   /**
@@ -688,9 +671,7 @@ public com.google.cloud.audit.RequestMetadata getRequestMetadata() {
    */
   @java.lang.Override
   public com.google.cloud.audit.RequestMetadataOrBuilder getRequestMetadataOrBuilder() {
-    return requestMetadata_ == null
-        ? com.google.cloud.audit.RequestMetadata.getDefaultInstance()
-        : requestMetadata_;
+    return getRequestMetadata();
   }
 
   public static final int REQUEST_FIELD_NUMBER = 16;
@@ -714,7 +695,7 @@ public com.google.cloud.audit.RequestMetadataOrBuilder getRequestMetadataOrBuild
    */
   @java.lang.Override
   public boolean hasRequest() {
-    return ((bitField0_ & 0x00000040) != 0);
+    return request_ != null;
   }
 
   /**
@@ -754,7 +735,7 @@ public com.google.protobuf.Struct getRequest() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getRequestOrBuilder() {
-    return request_ == null ? com.google.protobuf.Struct.getDefaultInstance() : request_;
+    return getRequest();
   }
 
   public static final int RESPONSE_FIELD_NUMBER = 17;
@@ -778,7 +759,7 @@ public com.google.protobuf.StructOrBuilder getRequestOrBuilder() {
    */
   @java.lang.Override
   public boolean hasResponse() {
-    return ((bitField0_ & 0x00000080) != 0);
+    return response_ != null;
   }
 
   /**
@@ -818,7 +799,7 @@ public com.google.protobuf.Struct getResponse() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getResponseOrBuilder() {
-    return response_ == null ? com.google.protobuf.Struct.getDefaultInstance() : response_;
+    return getResponse();
   }
 
   public static final int METADATA_FIELD_NUMBER = 18;
@@ -838,7 +819,7 @@ public com.google.protobuf.StructOrBuilder getResponseOrBuilder() {
    */
   @java.lang.Override
   public boolean hasMetadata() {
-    return ((bitField0_ & 0x00000100) != 0);
+    return metadata_ != null;
   }
 
   /**
@@ -870,7 +851,7 @@ public com.google.protobuf.Struct getMetadata() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getMetadataOrBuilder() {
-    return metadata_ == null ? com.google.protobuf.Struct.getDefaultInstance() : metadata_;
+    return getMetadata();
   }
 
   public static final int SERVICE_DATA_FIELD_NUMBER = 15;
@@ -894,7 +875,7 @@ public com.google.protobuf.StructOrBuilder getMetadataOrBuilder() {
   @java.lang.Override
   @java.lang.Deprecated
   public boolean hasServiceData() {
-    return ((bitField0_ & 0x00000200) != 0);
+    return serviceData_ != null;
   }
 
   /**
@@ -932,7 +913,7 @@ public com.google.protobuf.Any getServiceData() {
   @java.lang.Override
   @java.lang.Deprecated
   public com.google.protobuf.AnyOrBuilder getServiceDataOrBuilder() {
-    return serviceData_ == null ? com.google.protobuf.Any.getDefaultInstance() : serviceData_;
+    return getServiceData();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -949,13 +930,13 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (status_ != null) {
       output.writeMessage(2, getStatus());
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (authenticationInfo_ != null) {
       output.writeMessage(3, getAuthenticationInfo());
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (requestMetadata_ != null) {
       output.writeMessage(4, getRequestMetadata());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceName_)) {
@@ -973,25 +954,25 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (numResponseItems_ != 0L) {
       output.writeInt64(12, numResponseItems_);
     }
-    if (((bitField0_ & 0x00000200) != 0)) {
+    if (serviceData_ != null) {
       output.writeMessage(15, getServiceData());
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
+    if (request_ != null) {
       output.writeMessage(16, getRequest());
     }
-    if (((bitField0_ & 0x00000080) != 0)) {
+    if (response_ != null) {
       output.writeMessage(17, getResponse());
     }
-    if (((bitField0_ & 0x00000100) != 0)) {
+    if (metadata_ != null) {
       output.writeMessage(18, getMetadata());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (resourceOriginalState_ != null) {
       output.writeMessage(19, getResourceOriginalState());
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (resourceLocation_ != null) {
       output.writeMessage(20, getResourceLocation());
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (policyViolationInfo_ != null) {
       output.writeMessage(25, getPolicyViolationInfo());
     }
     getUnknownFields().writeTo(output);
@@ -1003,13 +984,13 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (status_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getStatus());
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (authenticationInfo_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getAuthenticationInfo());
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (requestMetadata_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getRequestMetadata());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceName_)) {
@@ -1028,26 +1009,26 @@ public int getSerializedSize() {
     if (numResponseItems_ != 0L) {
       size += com.google.protobuf.CodedOutputStream.computeInt64Size(12, numResponseItems_);
     }
-    if (((bitField0_ & 0x00000200) != 0)) {
+    if (serviceData_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(15, getServiceData());
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
+    if (request_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(16, getRequest());
     }
-    if (((bitField0_ & 0x00000080) != 0)) {
+    if (response_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(17, getResponse());
     }
-    if (((bitField0_ & 0x00000100) != 0)) {
+    if (metadata_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(18, getMetadata());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (resourceOriginalState_ != null) {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(19, getResourceOriginalState());
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (resourceLocation_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(20, getResourceLocation());
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (policyViolationInfo_ != null) {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(25, getPolicyViolationInfo());
     }
@@ -1302,57 +1283,45 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.cloud.audit.AuditLog.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getResourceLocationFieldBuilder();
-        getResourceOriginalStateFieldBuilder();
-        getStatusFieldBuilder();
-        getAuthenticationInfoFieldBuilder();
-        getAuthorizationInfoFieldBuilder();
-        getPolicyViolationInfoFieldBuilder();
-        getRequestMetadataFieldBuilder();
-        getRequestFieldBuilder();
-        getResponseFieldBuilder();
-        getMetadataFieldBuilder();
-        getServiceDataFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       serviceName_ = "";
+
       methodName_ = "";
+
       resourceName_ = "";
-      resourceLocation_ = null;
-      if (resourceLocationBuilder_ != null) {
-        resourceLocationBuilder_.dispose();
+
+      if (resourceLocationBuilder_ == null) {
+        resourceLocation_ = null;
+      } else {
+        resourceLocation_ = null;
         resourceLocationBuilder_ = null;
       }
-      resourceOriginalState_ = null;
-      if (resourceOriginalStateBuilder_ != null) {
-        resourceOriginalStateBuilder_.dispose();
+      if (resourceOriginalStateBuilder_ == null) {
+        resourceOriginalState_ = null;
+      } else {
+        resourceOriginalState_ = null;
         resourceOriginalStateBuilder_ = null;
       }
       numResponseItems_ = 0L;
-      status_ = null;
-      if (statusBuilder_ != null) {
-        statusBuilder_.dispose();
+
+      if (statusBuilder_ == null) {
+        status_ = null;
+      } else {
+        status_ = null;
         statusBuilder_ = null;
       }
-      authenticationInfo_ = null;
-      if (authenticationInfoBuilder_ != null) {
-        authenticationInfoBuilder_.dispose();
+      if (authenticationInfoBuilder_ == null) {
+        authenticationInfo_ = null;
+      } else {
+        authenticationInfo_ = null;
         authenticationInfoBuilder_ = null;
       }
       if (authorizationInfoBuilder_ == null) {
@@ -1361,35 +1330,41 @@ public Builder clear() {
         authorizationInfo_ = null;
         authorizationInfoBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000100);
-      policyViolationInfo_ = null;
-      if (policyViolationInfoBuilder_ != null) {
-        policyViolationInfoBuilder_.dispose();
+      bitField0_ = (bitField0_ & ~0x00000001);
+      if (policyViolationInfoBuilder_ == null) {
+        policyViolationInfo_ = null;
+      } else {
+        policyViolationInfo_ = null;
         policyViolationInfoBuilder_ = null;
       }
-      requestMetadata_ = null;
-      if (requestMetadataBuilder_ != null) {
-        requestMetadataBuilder_.dispose();
+      if (requestMetadataBuilder_ == null) {
+        requestMetadata_ = null;
+      } else {
+        requestMetadata_ = null;
         requestMetadataBuilder_ = null;
       }
-      request_ = null;
-      if (requestBuilder_ != null) {
-        requestBuilder_.dispose();
+      if (requestBuilder_ == null) {
+        request_ = null;
+      } else {
+        request_ = null;
         requestBuilder_ = null;
       }
-      response_ = null;
-      if (responseBuilder_ != null) {
-        responseBuilder_.dispose();
+      if (responseBuilder_ == null) {
+        response_ = null;
+      } else {
+        response_ = null;
         responseBuilder_ = null;
       }
-      metadata_ = null;
-      if (metadataBuilder_ != null) {
-        metadataBuilder_.dispose();
+      if (metadataBuilder_ == null) {
+        metadata_ = null;
+      } else {
+        metadata_ = null;
         metadataBuilder_ = null;
       }
-      serviceData_ = null;
-      if (serviceDataBuilder_ != null) {
-        serviceDataBuilder_.dispose();
+      if (serviceDataBuilder_ == null) {
+        serviceData_ = null;
+      } else {
+        serviceData_ = null;
         serviceDataBuilder_ = null;
       }
       return this;
@@ -1418,94 +1393,72 @@ public com.google.cloud.audit.AuditLog build() {
     @java.lang.Override
     public com.google.cloud.audit.AuditLog buildPartial() {
       com.google.cloud.audit.AuditLog result = new com.google.cloud.audit.AuditLog(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      result.serviceName_ = serviceName_;
+      result.methodName_ = methodName_;
+      result.resourceName_ = resourceName_;
+      if (resourceLocationBuilder_ == null) {
+        result.resourceLocation_ = resourceLocation_;
+      } else {
+        result.resourceLocation_ = resourceLocationBuilder_.build();
+      }
+      if (resourceOriginalStateBuilder_ == null) {
+        result.resourceOriginalState_ = resourceOriginalState_;
+      } else {
+        result.resourceOriginalState_ = resourceOriginalStateBuilder_.build();
+      }
+      result.numResponseItems_ = numResponseItems_;
+      if (statusBuilder_ == null) {
+        result.status_ = status_;
+      } else {
+        result.status_ = statusBuilder_.build();
+      }
+      if (authenticationInfoBuilder_ == null) {
+        result.authenticationInfo_ = authenticationInfo_;
+      } else {
+        result.authenticationInfo_ = authenticationInfoBuilder_.build();
       }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.cloud.audit.AuditLog result) {
       if (authorizationInfoBuilder_ == null) {
-        if (((bitField0_ & 0x00000100) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           authorizationInfo_ = java.util.Collections.unmodifiableList(authorizationInfo_);
-          bitField0_ = (bitField0_ & ~0x00000100);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.authorizationInfo_ = authorizationInfo_;
       } else {
         result.authorizationInfo_ = authorizationInfoBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.cloud.audit.AuditLog result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.serviceName_ = serviceName_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.methodName_ = methodName_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.resourceName_ = resourceName_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.resourceLocation_ =
-            resourceLocationBuilder_ == null ? resourceLocation_ : resourceLocationBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.resourceOriginalState_ =
-            resourceOriginalStateBuilder_ == null
-                ? resourceOriginalState_
-                : resourceOriginalStateBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.numResponseItems_ = numResponseItems_;
-      }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.status_ = statusBuilder_ == null ? status_ : statusBuilder_.build();
-        to_bitField0_ |= 0x00000004;
-      }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.authenticationInfo_ =
-            authenticationInfoBuilder_ == null
-                ? authenticationInfo_
-                : authenticationInfoBuilder_.build();
-        to_bitField0_ |= 0x00000008;
-      }
-      if (((from_bitField0_ & 0x00000200) != 0)) {
-        result.policyViolationInfo_ =
-            policyViolationInfoBuilder_ == null
-                ? policyViolationInfo_
-                : policyViolationInfoBuilder_.build();
-        to_bitField0_ |= 0x00000010;
-      }
-      if (((from_bitField0_ & 0x00000400) != 0)) {
-        result.requestMetadata_ =
-            requestMetadataBuilder_ == null ? requestMetadata_ : requestMetadataBuilder_.build();
-        to_bitField0_ |= 0x00000020;
-      }
-      if (((from_bitField0_ & 0x00000800) != 0)) {
-        result.request_ = requestBuilder_ == null ? request_ : requestBuilder_.build();
-        to_bitField0_ |= 0x00000040;
-      }
-      if (((from_bitField0_ & 0x00001000) != 0)) {
-        result.response_ = responseBuilder_ == null ? response_ : responseBuilder_.build();
-        to_bitField0_ |= 0x00000080;
-      }
-      if (((from_bitField0_ & 0x00002000) != 0)) {
-        result.metadata_ = metadataBuilder_ == null ? metadata_ : metadataBuilder_.build();
-        to_bitField0_ |= 0x00000100;
-      }
-      if (((from_bitField0_ & 0x00004000) != 0)) {
-        result.serviceData_ =
-            serviceDataBuilder_ == null ? serviceData_ : serviceDataBuilder_.build();
-        to_bitField0_ |= 0x00000200;
-      }
-      result.bitField0_ |= to_bitField0_;
+      if (policyViolationInfoBuilder_ == null) {
+        result.policyViolationInfo_ = policyViolationInfo_;
+      } else {
+        result.policyViolationInfo_ = policyViolationInfoBuilder_.build();
+      }
+      if (requestMetadataBuilder_ == null) {
+        result.requestMetadata_ = requestMetadata_;
+      } else {
+        result.requestMetadata_ = requestMetadataBuilder_.build();
+      }
+      if (requestBuilder_ == null) {
+        result.request_ = request_;
+      } else {
+        result.request_ = requestBuilder_.build();
+      }
+      if (responseBuilder_ == null) {
+        result.response_ = response_;
+      } else {
+        result.response_ = responseBuilder_.build();
+      }
+      if (metadataBuilder_ == null) {
+        result.metadata_ = metadata_;
+      } else {
+        result.metadata_ = metadataBuilder_.build();
+      }
+      if (serviceDataBuilder_ == null) {
+        result.serviceData_ = serviceData_;
+      } else {
+        result.serviceData_ = serviceDataBuilder_.build();
+      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1555,17 +1508,14 @@ public Builder mergeFrom(com.google.cloud.audit.AuditLog other) {
       if (other == com.google.cloud.audit.AuditLog.getDefaultInstance()) return this;
       if (!other.getServiceName().isEmpty()) {
         serviceName_ = other.serviceName_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getMethodName().isEmpty()) {
         methodName_ = other.methodName_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getResourceName().isEmpty()) {
         resourceName_ = other.resourceName_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.hasResourceLocation()) {
@@ -1587,7 +1537,7 @@ public Builder mergeFrom(com.google.cloud.audit.AuditLog other) {
         if (!other.authorizationInfo_.isEmpty()) {
           if (authorizationInfo_.isEmpty()) {
             authorizationInfo_ = other.authorizationInfo_;
-            bitField0_ = (bitField0_ & ~0x00000100);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureAuthorizationInfoIsMutable();
             authorizationInfo_.addAll(other.authorizationInfo_);
@@ -1600,7 +1550,7 @@ public Builder mergeFrom(com.google.cloud.audit.AuditLog other) {
             authorizationInfoBuilder_.dispose();
             authorizationInfoBuilder_ = null;
             authorizationInfo_ = other.authorizationInfo_;
-            bitField0_ = (bitField0_ & ~0x00000100);
+            bitField0_ = (bitField0_ & ~0x00000001);
             authorizationInfoBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getAuthorizationInfoFieldBuilder()
@@ -1657,32 +1607,32 @@ public Builder mergeFrom(
             case 18:
               {
                 input.readMessage(getStatusFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(
                     getAuthenticationInfoFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getRequestMetadataFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000400;
+
                 break;
               } // case 34
             case 58:
               {
                 serviceName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 58
             case 66:
               {
                 methodName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 66
             case 74:
@@ -1701,58 +1651,58 @@ public Builder mergeFrom(
             case 90:
               {
                 resourceName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 90
             case 96:
               {
                 numResponseItems_ = input.readInt64();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 96
             case 122:
               {
                 input.readMessage(getServiceDataFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00004000;
+
                 break;
               } // case 122
             case 130:
               {
                 input.readMessage(getRequestFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000800;
+
                 break;
               } // case 130
             case 138:
               {
                 input.readMessage(getResponseFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00001000;
+
                 break;
               } // case 138
             case 146:
               {
                 input.readMessage(getMetadataFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00002000;
+
                 break;
               } // case 146
             case 154:
               {
                 input.readMessage(
                     getResourceOriginalStateFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 154
             case 162:
               {
                 input.readMessage(
                     getResourceLocationFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 162
             case 202:
               {
                 input.readMessage(
                     getPolicyViolationInfoFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000200;
+
                 break;
               } // case 202
             default:
@@ -1841,8 +1791,8 @@ public Builder setServiceName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       serviceName_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1860,8 +1810,8 @@ public Builder setServiceName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearServiceName() {
+
       serviceName_ = getDefaultInstance().getServiceName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1884,8 +1834,8 @@ public Builder setServiceNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       serviceName_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1899,7 +1849,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"
      * 

@@ -1927,7 +1876,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"
      * 

@@ -1955,7 +1903,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"
      * 

@@ -1969,8 +1916,8 @@ public Builder setMethodName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       methodName_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1982,7 +1929,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"
      * 

@@ -1992,8 +1938,8 @@ public Builder setMethodName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearMethodName() {
+
       methodName_ = getDefaultInstance().getMethodName();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -2005,7 +1951,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"
      * 

@@ -2020,8 +1965,8 @@ public Builder setMethodNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       methodName_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2035,7 +1980,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"
      * 

@@ -2063,7 +2007,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"
      * 

@@ -2091,7 +2034,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"
      * 

@@ -2105,8 +2047,8 @@ public Builder setResourceName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       resourceName_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2118,7 +2060,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"
      * 

@@ -2128,8 +2069,8 @@ public Builder setResourceName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResourceName() {
+
       resourceName_ = getDefaultInstance().getResourceName();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -2141,7 +2082,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"
      * 

@@ -2156,8 +2096,8 @@ public Builder setResourceNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       resourceName_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2181,7 +2121,7 @@ public Builder setResourceNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the resourceLocation field is set.
      */
     public boolean hasResourceLocation() {
-      return ((bitField0_ & 0x00000008) != 0);
+      return resourceLocationBuilder_ != null || resourceLocation_ != null;
     }
 
     /**
@@ -2220,11 +2160,11 @@ public Builder setResourceLocation(com.google.cloud.audit.ResourceLocation value
           throw new NullPointerException();
         }
         resourceLocation_ = value;
+        onChanged();
       } else {
         resourceLocationBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -2241,11 +2181,11 @@ public Builder setResourceLocation(
         com.google.cloud.audit.ResourceLocation.Builder builderForValue) {
       if (resourceLocationBuilder_ == null) {
         resourceLocation_ = builderForValue.build();
+        onChanged();
       } else {
         resourceLocationBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -2260,20 +2200,19 @@ public Builder setResourceLocation(
      */
     public Builder mergeResourceLocation(com.google.cloud.audit.ResourceLocation value) {
       if (resourceLocationBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)
-            && resourceLocation_ != null
-            && resourceLocation_ != com.google.cloud.audit.ResourceLocation.getDefaultInstance()) {
-          getResourceLocationBuilder().mergeFrom(value);
+        if (resourceLocation_ != null) {
+          resourceLocation_ =
+              com.google.cloud.audit.ResourceLocation.newBuilder(resourceLocation_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           resourceLocation_ = value;
         }
+        onChanged();
       } else {
         resourceLocationBuilder_.mergeFrom(value);
       }
-      if (resourceLocation_ != null) {
-        bitField0_ |= 0x00000008;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2287,13 +2226,14 @@ public Builder mergeResourceLocation(com.google.cloud.audit.ResourceLocation val
      * .google.cloud.audit.ResourceLocation resource_location = 20;
      */
     public Builder clearResourceLocation() {
-      bitField0_ = (bitField0_ & ~0x00000008);
-      resourceLocation_ = null;
-      if (resourceLocationBuilder_ != null) {
-        resourceLocationBuilder_.dispose();
+      if (resourceLocationBuilder_ == null) {
+        resourceLocation_ = null;
+        onChanged();
+      } else {
+        resourceLocation_ = null;
         resourceLocationBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2307,7 +2247,7 @@ public Builder clearResourceLocation() {
      * .google.cloud.audit.ResourceLocation resource_location = 20;
      */
     public com.google.cloud.audit.ResourceLocation.Builder getResourceLocationBuilder() {
-      bitField0_ |= 0x00000008;
+
       onChanged();
       return getResourceLocationFieldBuilder().getBuilder();
     }
@@ -2382,7 +2322,7 @@ public com.google.cloud.audit.ResourceLocationOrBuilder getResourceLocationOrBui
      * @return Whether the resourceOriginalState field is set.
      */
     public boolean hasResourceOriginalState() {
-      return ((bitField0_ & 0x00000010) != 0);
+      return resourceOriginalStateBuilder_ != null || resourceOriginalState_ != null;
     }
 
     /**
@@ -2433,11 +2373,11 @@ public Builder setResourceOriginalState(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         resourceOriginalState_ = value;
+        onChanged();
       } else {
         resourceOriginalStateBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -2459,11 +2399,11 @@ public Builder setResourceOriginalState(com.google.protobuf.Struct value) {
     public Builder setResourceOriginalState(com.google.protobuf.Struct.Builder builderForValue) {
       if (resourceOriginalStateBuilder_ == null) {
         resourceOriginalState_ = builderForValue.build();
+        onChanged();
       } else {
         resourceOriginalStateBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -2484,20 +2424,19 @@ public Builder setResourceOriginalState(com.google.protobuf.Struct.Builder build
      */
     public Builder mergeResourceOriginalState(com.google.protobuf.Struct value) {
       if (resourceOriginalStateBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)
-            && resourceOriginalState_ != null
-            && resourceOriginalState_ != com.google.protobuf.Struct.getDefaultInstance()) {
-          getResourceOriginalStateBuilder().mergeFrom(value);
+        if (resourceOriginalState_ != null) {
+          resourceOriginalState_ =
+              com.google.protobuf.Struct.newBuilder(resourceOriginalState_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           resourceOriginalState_ = value;
         }
+        onChanged();
       } else {
         resourceOriginalStateBuilder_.mergeFrom(value);
       }
-      if (resourceOriginalState_ != null) {
-        bitField0_ |= 0x00000010;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2517,13 +2456,14 @@ public Builder mergeResourceOriginalState(com.google.protobuf.Struct value) {
      * .google.protobuf.Struct resource_original_state = 19;
      */
     public Builder clearResourceOriginalState() {
-      bitField0_ = (bitField0_ & ~0x00000010);
-      resourceOriginalState_ = null;
-      if (resourceOriginalStateBuilder_ != null) {
-        resourceOriginalStateBuilder_.dispose();
+      if (resourceOriginalStateBuilder_ == null) {
+        resourceOriginalState_ = null;
+        onChanged();
+      } else {
+        resourceOriginalState_ = null;
         resourceOriginalStateBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2543,7 +2483,7 @@ public Builder clearResourceOriginalState() {
      * .google.protobuf.Struct resource_original_state = 19;
      */
     public com.google.protobuf.Struct.Builder getResourceOriginalStateBuilder() {
-      bitField0_ |= 0x00000010;
+
       onChanged();
       return getResourceOriginalStateFieldBuilder().getBuilder();
     }
@@ -2640,7 +2580,6 @@ public long getNumResponseItems() {
     public Builder setNumResponseItems(long value) {
 
       numResponseItems_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2658,7 +2597,7 @@ public Builder setNumResponseItems(long value) {
      * @return This builder for chaining.
      */
     public Builder clearNumResponseItems() {
-      bitField0_ = (bitField0_ & ~0x00000020);
+
       numResponseItems_ = 0L;
       onChanged();
       return this;
@@ -2681,7 +2620,7 @@ public Builder clearNumResponseItems() {
      * @return Whether the status field is set.
      */
     public boolean hasStatus() {
-      return ((bitField0_ & 0x00000040) != 0);
+      return statusBuilder_ != null || status_ != null;
     }
 
     /**
@@ -2718,11 +2657,11 @@ public Builder setStatus(com.google.rpc.Status value) {
           throw new NullPointerException();
         }
         status_ = value;
+        onChanged();
       } else {
         statusBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -2738,11 +2677,11 @@ public Builder setStatus(com.google.rpc.Status value) {
     public Builder setStatus(com.google.rpc.Status.Builder builderForValue) {
       if (statusBuilder_ == null) {
         status_ = builderForValue.build();
+        onChanged();
       } else {
         statusBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -2757,20 +2696,16 @@ public Builder setStatus(com.google.rpc.Status.Builder builderForValue) {
      */
     public Builder mergeStatus(com.google.rpc.Status value) {
       if (statusBuilder_ == null) {
-        if (((bitField0_ & 0x00000040) != 0)
-            && status_ != null
-            && status_ != com.google.rpc.Status.getDefaultInstance()) {
-          getStatusBuilder().mergeFrom(value);
+        if (status_ != null) {
+          status_ = com.google.rpc.Status.newBuilder(status_).mergeFrom(value).buildPartial();
         } else {
           status_ = value;
         }
+        onChanged();
       } else {
         statusBuilder_.mergeFrom(value);
       }
-      if (status_ != null) {
-        bitField0_ |= 0x00000040;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2784,13 +2719,14 @@ public Builder mergeStatus(com.google.rpc.Status value) {
      * .google.rpc.Status status = 2;
      */
     public Builder clearStatus() {
-      bitField0_ = (bitField0_ & ~0x00000040);
-      status_ = null;
-      if (statusBuilder_ != null) {
-        statusBuilder_.dispose();
+      if (statusBuilder_ == null) {
+        status_ = null;
+        onChanged();
+      } else {
+        status_ = null;
         statusBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2804,7 +2740,7 @@ public Builder clearStatus() {
      * .google.rpc.Status status = 2;
      */
     public com.google.rpc.Status.Builder getStatusBuilder() {
-      bitField0_ |= 0x00000040;
+
       onChanged();
       return getStatusFieldBuilder().getBuilder();
     }
@@ -2868,7 +2804,7 @@ public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
      * @return Whether the authenticationInfo field is set.
      */
     public boolean hasAuthenticationInfo() {
-      return ((bitField0_ & 0x00000080) != 0);
+      return authenticationInfoBuilder_ != null || authenticationInfo_ != null;
     }
 
     /**
@@ -2907,11 +2843,11 @@ public Builder setAuthenticationInfo(com.google.cloud.audit.AuthenticationInfo v
           throw new NullPointerException();
         }
         authenticationInfo_ = value;
+        onChanged();
       } else {
         authenticationInfoBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -2928,11 +2864,11 @@ public Builder setAuthenticationInfo(
         com.google.cloud.audit.AuthenticationInfo.Builder builderForValue) {
       if (authenticationInfoBuilder_ == null) {
         authenticationInfo_ = builderForValue.build();
+        onChanged();
       } else {
         authenticationInfoBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -2947,21 +2883,19 @@ public Builder setAuthenticationInfo(
      */
     public Builder mergeAuthenticationInfo(com.google.cloud.audit.AuthenticationInfo value) {
       if (authenticationInfoBuilder_ == null) {
-        if (((bitField0_ & 0x00000080) != 0)
-            && authenticationInfo_ != null
-            && authenticationInfo_
-                != com.google.cloud.audit.AuthenticationInfo.getDefaultInstance()) {
-          getAuthenticationInfoBuilder().mergeFrom(value);
+        if (authenticationInfo_ != null) {
+          authenticationInfo_ =
+              com.google.cloud.audit.AuthenticationInfo.newBuilder(authenticationInfo_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           authenticationInfo_ = value;
         }
+        onChanged();
       } else {
         authenticationInfoBuilder_.mergeFrom(value);
       }
-      if (authenticationInfo_ != null) {
-        bitField0_ |= 0x00000080;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2975,13 +2909,14 @@ public Builder mergeAuthenticationInfo(com.google.cloud.audit.AuthenticationInfo
      * .google.cloud.audit.AuthenticationInfo authentication_info = 3;
      */
     public Builder clearAuthenticationInfo() {
-      bitField0_ = (bitField0_ & ~0x00000080);
-      authenticationInfo_ = null;
-      if (authenticationInfoBuilder_ != null) {
-        authenticationInfoBuilder_.dispose();
+      if (authenticationInfoBuilder_ == null) {
+        authenticationInfo_ = null;
+        onChanged();
+      } else {
+        authenticationInfo_ = null;
         authenticationInfoBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2995,7 +2930,7 @@ public Builder clearAuthenticationInfo() {
      * .google.cloud.audit.AuthenticationInfo authentication_info = 3;
      */
     public com.google.cloud.audit.AuthenticationInfo.Builder getAuthenticationInfoBuilder() {
-      bitField0_ |= 0x00000080;
+
       onChanged();
       return getAuthenticationInfoFieldBuilder().getBuilder();
     }
@@ -3049,10 +2984,10 @@ public com.google.cloud.audit.AuthenticationInfoOrBuilder getAuthenticationInfoO
         java.util.Collections.emptyList();
 
     private void ensureAuthorizationInfoIsMutable() {
-      if (!((bitField0_ & 0x00000100) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         authorizationInfo_ =
             new java.util.ArrayList(authorizationInfo_);
-        bitField0_ |= 0x00000100;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -3300,7 +3235,7 @@ public Builder addAllAuthorizationInfo(
     public Builder clearAuthorizationInfo() {
       if (authorizationInfoBuilder_ == null) {
         authorizationInfo_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000100);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         authorizationInfoBuilder_.clear();
@@ -3445,7 +3380,7 @@ public com.google.cloud.audit.AuthorizationInfo.Builder addAuthorizationInfoBuil
                 com.google.cloud.audit.AuthorizationInfo.Builder,
                 com.google.cloud.audit.AuthorizationInfoOrBuilder>(
                 authorizationInfo_,
-                ((bitField0_ & 0x00000100) != 0),
+                ((bitField0_ & 0x00000001) != 0),
                 getParentForChildren(),
                 isClean());
         authorizationInfo_ = null;
@@ -3474,7 +3409,7 @@ public com.google.cloud.audit.AuthorizationInfo.Builder addAuthorizationInfoBuil
      * @return Whether the policyViolationInfo field is set.
      */
     public boolean hasPolicyViolationInfo() {
-      return ((bitField0_ & 0x00000200) != 0);
+      return policyViolationInfoBuilder_ != null || policyViolationInfo_ != null;
     }
 
     /**
@@ -3517,11 +3452,11 @@ public Builder setPolicyViolationInfo(com.google.cloud.audit.PolicyViolationInfo
           throw new NullPointerException();
         }
         policyViolationInfo_ = value;
+        onChanged();
       } else {
         policyViolationInfoBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000200;
-      onChanged();
+
       return this;
     }
 
@@ -3540,11 +3475,11 @@ public Builder setPolicyViolationInfo(
         com.google.cloud.audit.PolicyViolationInfo.Builder builderForValue) {
       if (policyViolationInfoBuilder_ == null) {
         policyViolationInfo_ = builderForValue.build();
+        onChanged();
       } else {
         policyViolationInfoBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000200;
-      onChanged();
+
       return this;
     }
 
@@ -3561,21 +3496,19 @@ public Builder setPolicyViolationInfo(
      */
     public Builder mergePolicyViolationInfo(com.google.cloud.audit.PolicyViolationInfo value) {
       if (policyViolationInfoBuilder_ == null) {
-        if (((bitField0_ & 0x00000200) != 0)
-            && policyViolationInfo_ != null
-            && policyViolationInfo_
-                != com.google.cloud.audit.PolicyViolationInfo.getDefaultInstance()) {
-          getPolicyViolationInfoBuilder().mergeFrom(value);
+        if (policyViolationInfo_ != null) {
+          policyViolationInfo_ =
+              com.google.cloud.audit.PolicyViolationInfo.newBuilder(policyViolationInfo_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           policyViolationInfo_ = value;
         }
+        onChanged();
       } else {
         policyViolationInfoBuilder_.mergeFrom(value);
       }
-      if (policyViolationInfo_ != null) {
-        bitField0_ |= 0x00000200;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -3591,13 +3524,14 @@ public Builder mergePolicyViolationInfo(com.google.cloud.audit.PolicyViolationIn
      * .google.cloud.audit.PolicyViolationInfo policy_violation_info = 25;
      */
     public Builder clearPolicyViolationInfo() {
-      bitField0_ = (bitField0_ & ~0x00000200);
-      policyViolationInfo_ = null;
-      if (policyViolationInfoBuilder_ != null) {
-        policyViolationInfoBuilder_.dispose();
+      if (policyViolationInfoBuilder_ == null) {
+        policyViolationInfo_ = null;
+        onChanged();
+      } else {
+        policyViolationInfo_ = null;
         policyViolationInfoBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -3613,7 +3547,7 @@ public Builder clearPolicyViolationInfo() {
      * .google.cloud.audit.PolicyViolationInfo policy_violation_info = 25;
      */
     public com.google.cloud.audit.PolicyViolationInfo.Builder getPolicyViolationInfoBuilder() {
-      bitField0_ |= 0x00000200;
+
       onChanged();
       return getPolicyViolationInfoFieldBuilder().getBuilder();
     }
@@ -3686,7 +3620,7 @@ public com.google.cloud.audit.PolicyViolationInfoOrBuilder getPolicyViolationInf
      * @return Whether the requestMetadata field is set.
      */
     public boolean hasRequestMetadata() {
-      return ((bitField0_ & 0x00000400) != 0);
+      return requestMetadataBuilder_ != null || requestMetadata_ != null;
     }
 
     /**
@@ -3725,11 +3659,11 @@ public Builder setRequestMetadata(com.google.cloud.audit.RequestMetadata value)
           throw new NullPointerException();
         }
         requestMetadata_ = value;
+        onChanged();
       } else {
         requestMetadataBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000400;
-      onChanged();
+
       return this;
     }
 
@@ -3746,11 +3680,11 @@ public Builder setRequestMetadata(
         com.google.cloud.audit.RequestMetadata.Builder builderForValue) {
       if (requestMetadataBuilder_ == null) {
         requestMetadata_ = builderForValue.build();
+        onChanged();
       } else {
         requestMetadataBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000400;
-      onChanged();
+
       return this;
     }
 
@@ -3765,20 +3699,19 @@ public Builder setRequestMetadata(
      */
     public Builder mergeRequestMetadata(com.google.cloud.audit.RequestMetadata value) {
       if (requestMetadataBuilder_ == null) {
-        if (((bitField0_ & 0x00000400) != 0)
-            && requestMetadata_ != null
-            && requestMetadata_ != com.google.cloud.audit.RequestMetadata.getDefaultInstance()) {
-          getRequestMetadataBuilder().mergeFrom(value);
+        if (requestMetadata_ != null) {
+          requestMetadata_ =
+              com.google.cloud.audit.RequestMetadata.newBuilder(requestMetadata_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           requestMetadata_ = value;
         }
+        onChanged();
       } else {
         requestMetadataBuilder_.mergeFrom(value);
       }
-      if (requestMetadata_ != null) {
-        bitField0_ |= 0x00000400;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -3792,13 +3725,14 @@ public Builder mergeRequestMetadata(com.google.cloud.audit.RequestMetadata value
      * .google.cloud.audit.RequestMetadata request_metadata = 4;
      */
     public Builder clearRequestMetadata() {
-      bitField0_ = (bitField0_ & ~0x00000400);
-      requestMetadata_ = null;
-      if (requestMetadataBuilder_ != null) {
-        requestMetadataBuilder_.dispose();
+      if (requestMetadataBuilder_ == null) {
+        requestMetadata_ = null;
+        onChanged();
+      } else {
+        requestMetadata_ = null;
         requestMetadataBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -3812,7 +3746,7 @@ public Builder clearRequestMetadata() {
      * .google.cloud.audit.RequestMetadata request_metadata = 4;
      */
     public com.google.cloud.audit.RequestMetadata.Builder getRequestMetadataBuilder() {
-      bitField0_ |= 0x00000400;
+
       onChanged();
       return getRequestMetadataFieldBuilder().getBuilder();
     }
@@ -3886,7 +3820,7 @@ public com.google.cloud.audit.RequestMetadataOrBuilder getRequestMetadataOrBuild
      * @return Whether the request field is set.
      */
     public boolean hasRequest() {
-      return ((bitField0_ & 0x00000800) != 0);
+      return requestBuilder_ != null || request_ != null;
     }
 
     /**
@@ -3933,11 +3867,11 @@ public Builder setRequest(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         request_ = value;
+        onChanged();
       } else {
         requestBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000800;
-      onChanged();
+
       return this;
     }
 
@@ -3958,11 +3892,11 @@ public Builder setRequest(com.google.protobuf.Struct value) {
     public Builder setRequest(com.google.protobuf.Struct.Builder builderForValue) {
       if (requestBuilder_ == null) {
         request_ = builderForValue.build();
+        onChanged();
       } else {
         requestBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000800;
-      onChanged();
+
       return this;
     }
 
@@ -3982,20 +3916,17 @@ public Builder setRequest(com.google.protobuf.Struct.Builder builderForValue) {
      */
     public Builder mergeRequest(com.google.protobuf.Struct value) {
       if (requestBuilder_ == null) {
-        if (((bitField0_ & 0x00000800) != 0)
-            && request_ != null
-            && request_ != com.google.protobuf.Struct.getDefaultInstance()) {
-          getRequestBuilder().mergeFrom(value);
+        if (request_ != null) {
+          request_ =
+              com.google.protobuf.Struct.newBuilder(request_).mergeFrom(value).buildPartial();
         } else {
           request_ = value;
         }
+        onChanged();
       } else {
         requestBuilder_.mergeFrom(value);
       }
-      if (request_ != null) {
-        bitField0_ |= 0x00000800;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -4014,13 +3945,14 @@ public Builder mergeRequest(com.google.protobuf.Struct value) {
      * .google.protobuf.Struct request = 16;
      */
     public Builder clearRequest() {
-      bitField0_ = (bitField0_ & ~0x00000800);
-      request_ = null;
-      if (requestBuilder_ != null) {
-        requestBuilder_.dispose();
+      if (requestBuilder_ == null) {
+        request_ = null;
+        onChanged();
+      } else {
+        request_ = null;
         requestBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -4039,7 +3971,7 @@ public Builder clearRequest() {
      * .google.protobuf.Struct request = 16;
      */
     public com.google.protobuf.Struct.Builder getRequestBuilder() {
-      bitField0_ |= 0x00000800;
+
       onChanged();
       return getRequestFieldBuilder().getBuilder();
     }
@@ -4121,7 +4053,7 @@ public com.google.protobuf.StructOrBuilder getRequestOrBuilder() {
      * @return Whether the response field is set.
      */
     public boolean hasResponse() {
-      return ((bitField0_ & 0x00001000) != 0);
+      return responseBuilder_ != null || response_ != null;
     }
 
     /**
@@ -4168,11 +4100,11 @@ public Builder setResponse(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         response_ = value;
+        onChanged();
       } else {
         responseBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00001000;
-      onChanged();
+
       return this;
     }
 
@@ -4193,11 +4125,11 @@ public Builder setResponse(com.google.protobuf.Struct value) {
     public Builder setResponse(com.google.protobuf.Struct.Builder builderForValue) {
       if (responseBuilder_ == null) {
         response_ = builderForValue.build();
+        onChanged();
       } else {
         responseBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00001000;
-      onChanged();
+
       return this;
     }
 
@@ -4217,20 +4149,17 @@ public Builder setResponse(com.google.protobuf.Struct.Builder builderForValue) {
      */
     public Builder mergeResponse(com.google.protobuf.Struct value) {
       if (responseBuilder_ == null) {
-        if (((bitField0_ & 0x00001000) != 0)
-            && response_ != null
-            && response_ != com.google.protobuf.Struct.getDefaultInstance()) {
-          getResponseBuilder().mergeFrom(value);
+        if (response_ != null) {
+          response_ =
+              com.google.protobuf.Struct.newBuilder(response_).mergeFrom(value).buildPartial();
         } else {
           response_ = value;
         }
+        onChanged();
       } else {
         responseBuilder_.mergeFrom(value);
       }
-      if (response_ != null) {
-        bitField0_ |= 0x00001000;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -4249,13 +4178,14 @@ public Builder mergeResponse(com.google.protobuf.Struct value) {
      * .google.protobuf.Struct response = 17;
      */
     public Builder clearResponse() {
-      bitField0_ = (bitField0_ & ~0x00001000);
-      response_ = null;
-      if (responseBuilder_ != null) {
-        responseBuilder_.dispose();
+      if (responseBuilder_ == null) {
+        response_ = null;
+        onChanged();
+      } else {
+        response_ = null;
         responseBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -4274,7 +4204,7 @@ public Builder clearResponse() {
      * .google.protobuf.Struct response = 17;
      */
     public com.google.protobuf.Struct.Builder getResponseBuilder() {
-      bitField0_ |= 0x00001000;
+
       onChanged();
       return getResponseFieldBuilder().getBuilder();
     }
@@ -4352,7 +4282,7 @@ public com.google.protobuf.StructOrBuilder getResponseOrBuilder() {
      * @return Whether the metadata field is set.
      */
     public boolean hasMetadata() {
-      return ((bitField0_ & 0x00002000) != 0);
+      return metadataBuilder_ != null || metadata_ != null;
     }
 
     /**
@@ -4391,11 +4321,11 @@ public Builder setMetadata(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         metadata_ = value;
+        onChanged();
       } else {
         metadataBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00002000;
-      onChanged();
+
       return this;
     }
 
@@ -4412,11 +4342,11 @@ public Builder setMetadata(com.google.protobuf.Struct value) {
     public Builder setMetadata(com.google.protobuf.Struct.Builder builderForValue) {
       if (metadataBuilder_ == null) {
         metadata_ = builderForValue.build();
+        onChanged();
       } else {
         metadataBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00002000;
-      onChanged();
+
       return this;
     }
 
@@ -4432,20 +4362,17 @@ public Builder setMetadata(com.google.protobuf.Struct.Builder builderForValue) {
      */
     public Builder mergeMetadata(com.google.protobuf.Struct value) {
       if (metadataBuilder_ == null) {
-        if (((bitField0_ & 0x00002000) != 0)
-            && metadata_ != null
-            && metadata_ != com.google.protobuf.Struct.getDefaultInstance()) {
-          getMetadataBuilder().mergeFrom(value);
+        if (metadata_ != null) {
+          metadata_ =
+              com.google.protobuf.Struct.newBuilder(metadata_).mergeFrom(value).buildPartial();
         } else {
           metadata_ = value;
         }
+        onChanged();
       } else {
         metadataBuilder_.mergeFrom(value);
       }
-      if (metadata_ != null) {
-        bitField0_ |= 0x00002000;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -4460,13 +4387,14 @@ public Builder mergeMetadata(com.google.protobuf.Struct value) {
      * .google.protobuf.Struct metadata = 18;
      */
     public Builder clearMetadata() {
-      bitField0_ = (bitField0_ & ~0x00002000);
-      metadata_ = null;
-      if (metadataBuilder_ != null) {
-        metadataBuilder_.dispose();
+      if (metadataBuilder_ == null) {
+        metadata_ = null;
+        onChanged();
+      } else {
+        metadata_ = null;
         metadataBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -4481,7 +4409,7 @@ public Builder clearMetadata() {
      * .google.protobuf.Struct metadata = 18;
      */
     public com.google.protobuf.Struct.Builder getMetadataBuilder() {
-      bitField0_ |= 0x00002000;
+
       onChanged();
       return getMetadataFieldBuilder().getBuilder();
     }
@@ -4555,7 +4483,7 @@ public com.google.protobuf.StructOrBuilder getMetadataOrBuilder() {
      */
     @java.lang.Deprecated
     public boolean hasServiceData() {
-      return ((bitField0_ & 0x00004000) != 0);
+      return serviceDataBuilder_ != null || serviceData_ != null;
     }
 
     /**
@@ -4600,11 +4528,11 @@ public Builder setServiceData(com.google.protobuf.Any value) {
           throw new NullPointerException();
         }
         serviceData_ = value;
+        onChanged();
       } else {
         serviceDataBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00004000;
-      onChanged();
+
       return this;
     }
 
@@ -4623,11 +4551,11 @@ public Builder setServiceData(com.google.protobuf.Any value) {
     public Builder setServiceData(com.google.protobuf.Any.Builder builderForValue) {
       if (serviceDataBuilder_ == null) {
         serviceData_ = builderForValue.build();
+        onChanged();
       } else {
         serviceDataBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00004000;
-      onChanged();
+
       return this;
     }
 
@@ -4645,20 +4573,17 @@ public Builder setServiceData(com.google.protobuf.Any.Builder builderForValue) {
     @java.lang.Deprecated
     public Builder mergeServiceData(com.google.protobuf.Any value) {
       if (serviceDataBuilder_ == null) {
-        if (((bitField0_ & 0x00004000) != 0)
-            && serviceData_ != null
-            && serviceData_ != com.google.protobuf.Any.getDefaultInstance()) {
-          getServiceDataBuilder().mergeFrom(value);
+        if (serviceData_ != null) {
+          serviceData_ =
+              com.google.protobuf.Any.newBuilder(serviceData_).mergeFrom(value).buildPartial();
         } else {
           serviceData_ = value;
         }
+        onChanged();
       } else {
         serviceDataBuilder_.mergeFrom(value);
       }
-      if (serviceData_ != null) {
-        bitField0_ |= 0x00004000;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -4675,13 +4600,14 @@ public Builder mergeServiceData(com.google.protobuf.Any value) {
      */
     @java.lang.Deprecated
     public Builder clearServiceData() {
-      bitField0_ = (bitField0_ & ~0x00004000);
-      serviceData_ = null;
-      if (serviceDataBuilder_ != null) {
-        serviceDataBuilder_.dispose();
+      if (serviceDataBuilder_ == null) {
+        serviceData_ = null;
+        onChanged();
+      } else {
+        serviceData_ = null;
         serviceDataBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -4698,7 +4624,7 @@ public Builder clearServiceData() {
      */
     @java.lang.Deprecated
     public com.google.protobuf.Any.Builder getServiceDataBuilder() {
-      bitField0_ |= 0x00004000;
+
       onChanged();
       return getServiceDataFieldBuilder().getBuilder();
     }
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 4969cc92c4..a1aaf3c93f 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 public interface AuditLogOrBuilder
@@ -59,7 +58,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"
    * 

@@ -77,7 +75,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"
    * 

@@ -95,7 +92,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"
    * 

@@ -113,7 +109,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"
    * 

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 7c18fc0ff6..628f40116a 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 public final class AuditLogProto {
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 0577f68990..75a97dd87f 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 /**
@@ -53,6 +52,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;
@@ -68,11 +72,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.cloud.audit.AuthenticationInfo.Builder.class);
   }
 
-  private int bitField0_;
   public static final int PRINCIPAL_EMAIL_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object principalEmail_ = "";
+  private volatile java.lang.Object principalEmail_;
 
   /**
    *
@@ -133,9 +134,7 @@ public com.google.protobuf.ByteString getPrincipalEmailBytes() {
   }
 
   public static final int AUTHORITY_SELECTOR_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object authoritySelector_ = "";
+  private volatile java.lang.Object authoritySelector_;
 
   /**
    *
@@ -206,7 +205,7 @@ public com.google.protobuf.ByteString getAuthoritySelectorBytes() {
    */
   @java.lang.Override
   public boolean hasThirdPartyPrincipal() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return thirdPartyPrincipal_ != null;
   }
 
   /**
@@ -244,15 +243,11 @@ public com.google.protobuf.Struct getThirdPartyPrincipal() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getThirdPartyPrincipalOrBuilder() {
-    return thirdPartyPrincipal_ == null
-        ? com.google.protobuf.Struct.getDefaultInstance()
-        : thirdPartyPrincipal_;
+    return getThirdPartyPrincipal();
   }
 
   public static final int SERVICE_ACCOUNT_KEY_NAME_FIELD_NUMBER = 5;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object serviceAccountKeyName_ = "";
+  private volatile java.lang.Object serviceAccountKeyName_;
 
   /**
    *
@@ -261,7 +256,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}"
    * 

    *
@@ -289,7 +283,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}"
    * 

    *
@@ -311,8 +304,6 @@ public com.google.protobuf.ByteString getServiceAccountKeyNameBytes() {
   }
 
   public static final int SERVICE_ACCOUNT_DELEGATION_INFO_FIELD_NUMBER = 6;
-
-  @SuppressWarnings("serial")
   private java.util.List
       serviceAccountDelegationInfo_;
 
@@ -421,9 +412,7 @@ public com.google.cloud.audit.ServiceAccountDelegationInfo getServiceAccountDele
   }
 
   public static final int PRINCIPAL_SUBJECT_FIELD_NUMBER = 8;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object principalSubject_ = "";
+  private volatile java.lang.Object principalSubject_;
 
   /**
    *
@@ -495,7 +484,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authoritySelector_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, authoritySelector_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (thirdPartyPrincipal_ != null) {
       output.writeMessage(4, getThirdPartyPrincipal());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceAccountKeyName_)) {
@@ -522,7 +511,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authoritySelector_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, authoritySelector_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (thirdPartyPrincipal_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getThirdPartyPrincipal());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceAccountKeyName_)) {
@@ -719,42 +708,36 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.cloud.audit.AuthenticationInfo.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getThirdPartyPrincipalFieldBuilder();
-        getServiceAccountDelegationInfoFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       principalEmail_ = "";
+
       authoritySelector_ = "";
-      thirdPartyPrincipal_ = null;
-      if (thirdPartyPrincipalBuilder_ != null) {
-        thirdPartyPrincipalBuilder_.dispose();
+
+      if (thirdPartyPrincipalBuilder_ == null) {
+        thirdPartyPrincipal_ = null;
+      } else {
+        thirdPartyPrincipal_ = null;
         thirdPartyPrincipalBuilder_ = null;
       }
       serviceAccountKeyName_ = "";
+
       if (serviceAccountDelegationInfoBuilder_ == null) {
         serviceAccountDelegationInfo_ = java.util.Collections.emptyList();
       } else {
         serviceAccountDelegationInfo_ = null;
         serviceAccountDelegationInfoBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000010);
+      bitField0_ = (bitField0_ & ~0x00000001);
       principalSubject_ = "";
+
       return this;
     }
 
@@ -782,50 +765,28 @@ public com.google.cloud.audit.AuthenticationInfo build() {
     public com.google.cloud.audit.AuthenticationInfo buildPartial() {
       com.google.cloud.audit.AuthenticationInfo result =
           new com.google.cloud.audit.AuthenticationInfo(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      result.principalEmail_ = principalEmail_;
+      result.authoritySelector_ = authoritySelector_;
+      if (thirdPartyPrincipalBuilder_ == null) {
+        result.thirdPartyPrincipal_ = thirdPartyPrincipal_;
+      } else {
+        result.thirdPartyPrincipal_ = thirdPartyPrincipalBuilder_.build();
       }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.cloud.audit.AuthenticationInfo result) {
+      result.serviceAccountKeyName_ = serviceAccountKeyName_;
       if (serviceAccountDelegationInfoBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           serviceAccountDelegationInfo_ =
               java.util.Collections.unmodifiableList(serviceAccountDelegationInfo_);
-          bitField0_ = (bitField0_ & ~0x00000010);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.serviceAccountDelegationInfo_ = serviceAccountDelegationInfo_;
       } else {
         result.serviceAccountDelegationInfo_ = serviceAccountDelegationInfoBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.cloud.audit.AuthenticationInfo result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.principalEmail_ = principalEmail_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.authoritySelector_ = authoritySelector_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.thirdPartyPrincipal_ =
-            thirdPartyPrincipalBuilder_ == null
-                ? thirdPartyPrincipal_
-                : thirdPartyPrincipalBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.serviceAccountKeyName_ = serviceAccountKeyName_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.principalSubject_ = principalSubject_;
-      }
-      result.bitField0_ |= to_bitField0_;
+      result.principalSubject_ = principalSubject_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -875,12 +836,10 @@ public Builder mergeFrom(com.google.cloud.audit.AuthenticationInfo other) {
       if (other == com.google.cloud.audit.AuthenticationInfo.getDefaultInstance()) return this;
       if (!other.getPrincipalEmail().isEmpty()) {
         principalEmail_ = other.principalEmail_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getAuthoritySelector().isEmpty()) {
         authoritySelector_ = other.authoritySelector_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasThirdPartyPrincipal()) {
@@ -888,14 +847,13 @@ public Builder mergeFrom(com.google.cloud.audit.AuthenticationInfo other) {
       }
       if (!other.getServiceAccountKeyName().isEmpty()) {
         serviceAccountKeyName_ = other.serviceAccountKeyName_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (serviceAccountDelegationInfoBuilder_ == null) {
         if (!other.serviceAccountDelegationInfo_.isEmpty()) {
           if (serviceAccountDelegationInfo_.isEmpty()) {
             serviceAccountDelegationInfo_ = other.serviceAccountDelegationInfo_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureServiceAccountDelegationInfoIsMutable();
             serviceAccountDelegationInfo_.addAll(other.serviceAccountDelegationInfo_);
@@ -908,7 +866,7 @@ public Builder mergeFrom(com.google.cloud.audit.AuthenticationInfo other) {
             serviceAccountDelegationInfoBuilder_.dispose();
             serviceAccountDelegationInfoBuilder_ = null;
             serviceAccountDelegationInfo_ = other.serviceAccountDelegationInfo_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00000001);
             serviceAccountDelegationInfoBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getServiceAccountDelegationInfoFieldBuilder()
@@ -921,7 +879,6 @@ public Builder mergeFrom(com.google.cloud.audit.AuthenticationInfo other) {
       }
       if (!other.getPrincipalSubject().isEmpty()) {
         principalSubject_ = other.principalSubject_;
-        bitField0_ |= 0x00000020;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -953,26 +910,26 @@ public Builder mergeFrom(
             case 10:
               {
                 principalEmail_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 authoritySelector_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 34:
               {
                 input.readMessage(
                     getThirdPartyPrincipalFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 34
             case 42:
               {
                 serviceAccountKeyName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 42
             case 50:
@@ -992,7 +949,7 @@ public Builder mergeFrom(
             case 66:
               {
                 principalSubject_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 66
             default:
@@ -1093,8 +1050,8 @@ public Builder setPrincipalEmail(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       principalEmail_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1116,8 +1073,8 @@ public Builder setPrincipalEmail(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPrincipalEmail() {
+
       principalEmail_ = getDefaultInstance().getPrincipalEmail();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1144,8 +1101,8 @@ public Builder setPrincipalEmailBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       principalEmail_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1217,8 +1174,8 @@ public Builder setAuthoritySelector(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       authoritySelector_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1236,8 +1193,8 @@ public Builder setAuthoritySelector(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAuthoritySelector() {
+
       authoritySelector_ = getDefaultInstance().getAuthoritySelector();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1260,8 +1217,8 @@ public Builder setAuthoritySelectorBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       authoritySelector_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1288,7 +1245,7 @@ public Builder setAuthoritySelectorBytes(com.google.protobuf.ByteString value) {
      * @return Whether the thirdPartyPrincipal field is set.
      */
     public boolean hasThirdPartyPrincipal() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return thirdPartyPrincipalBuilder_ != null || thirdPartyPrincipal_ != null;
     }
 
     /**
@@ -1333,11 +1290,11 @@ public Builder setThirdPartyPrincipal(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         thirdPartyPrincipal_ = value;
+        onChanged();
       } else {
         thirdPartyPrincipalBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1356,11 +1313,11 @@ public Builder setThirdPartyPrincipal(com.google.protobuf.Struct value) {
     public Builder setThirdPartyPrincipal(com.google.protobuf.Struct.Builder builderForValue) {
       if (thirdPartyPrincipalBuilder_ == null) {
         thirdPartyPrincipal_ = builderForValue.build();
+        onChanged();
       } else {
         thirdPartyPrincipalBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1378,20 +1335,19 @@ public Builder setThirdPartyPrincipal(com.google.protobuf.Struct.Builder builder
      */
     public Builder mergeThirdPartyPrincipal(com.google.protobuf.Struct value) {
       if (thirdPartyPrincipalBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && thirdPartyPrincipal_ != null
-            && thirdPartyPrincipal_ != com.google.protobuf.Struct.getDefaultInstance()) {
-          getThirdPartyPrincipalBuilder().mergeFrom(value);
+        if (thirdPartyPrincipal_ != null) {
+          thirdPartyPrincipal_ =
+              com.google.protobuf.Struct.newBuilder(thirdPartyPrincipal_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           thirdPartyPrincipal_ = value;
         }
+        onChanged();
       } else {
         thirdPartyPrincipalBuilder_.mergeFrom(value);
       }
-      if (thirdPartyPrincipal_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1408,13 +1364,14 @@ public Builder mergeThirdPartyPrincipal(com.google.protobuf.Struct value) {
      * .google.protobuf.Struct third_party_principal = 4;
      */
     public Builder clearThirdPartyPrincipal() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      thirdPartyPrincipal_ = null;
-      if (thirdPartyPrincipalBuilder_ != null) {
-        thirdPartyPrincipalBuilder_.dispose();
+      if (thirdPartyPrincipalBuilder_ == null) {
+        thirdPartyPrincipal_ = null;
+        onChanged();
+      } else {
+        thirdPartyPrincipal_ = null;
         thirdPartyPrincipalBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1431,7 +1388,7 @@ public Builder clearThirdPartyPrincipal() {
      * .google.protobuf.Struct third_party_principal = 4;
      */
     public com.google.protobuf.Struct.Builder getThirdPartyPrincipalBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getThirdPartyPrincipalFieldBuilder().getBuilder();
     }
@@ -1496,7 +1453,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}"
      * 

      *
@@ -1523,7 +1479,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}"
      * 

      *
@@ -1550,7 +1505,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}"
      * 

      *
@@ -1563,8 +1517,8 @@ public Builder setServiceAccountKeyName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       serviceAccountKeyName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1576,7 +1530,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}"
      * 

      *
@@ -1585,8 +1538,8 @@ public Builder setServiceAccountKeyName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearServiceAccountKeyName() {
+
       serviceAccountKeyName_ = getDefaultInstance().getServiceAccountKeyName();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1598,7 +1551,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}"
      * 

      *
@@ -1612,8 +1564,8 @@ public Builder setServiceAccountKeyNameBytes(com.google.protobuf.ByteString valu
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       serviceAccountKeyName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1622,11 +1574,11 @@ public Builder setServiceAccountKeyNameBytes(com.google.protobuf.ByteString valu
         serviceAccountDelegationInfo_ = java.util.Collections.emptyList();
 
     private void ensureServiceAccountDelegationInfoIsMutable() {
-      if (!((bitField0_ & 0x00000010) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         serviceAccountDelegationInfo_ =
             new java.util.ArrayList(
                 serviceAccountDelegationInfo_);
-        bitField0_ |= 0x00000010;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1924,7 +1876,7 @@ public Builder addAllServiceAccountDelegationInfo(
     public Builder clearServiceAccountDelegationInfo() {
       if (serviceAccountDelegationInfoBuilder_ == null) {
         serviceAccountDelegationInfo_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000010);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         serviceAccountDelegationInfoBuilder_.clear();
@@ -2101,7 +2053,7 @@ public Builder removeServiceAccountDelegationInfo(int index) {
                 com.google.cloud.audit.ServiceAccountDelegationInfo.Builder,
                 com.google.cloud.audit.ServiceAccountDelegationInfoOrBuilder>(
                 serviceAccountDelegationInfo_,
-                ((bitField0_ & 0x00000010) != 0),
+                ((bitField0_ & 0x00000001) != 0),
                 getParentForChildren(),
                 isClean());
         serviceAccountDelegationInfo_ = null;
@@ -2176,8 +2128,8 @@ public Builder setPrincipalSubject(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       principalSubject_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2195,8 +2147,8 @@ public Builder setPrincipalSubject(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPrincipalSubject() {
+
       principalSubject_ = getDefaultInstance().getPrincipalSubject();
-      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -2219,8 +2171,8 @@ public Builder setPrincipalSubjectBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       principalSubject_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
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 3cc87ecd5c..eb4fe525d4 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 public interface AuthenticationInfoOrBuilder
@@ -141,7 +140,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}"
    * 

    *
@@ -158,7 +156,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}"
    * 

    *
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 cb1bc88398..350404d7f4 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 /**
@@ -51,6 +50,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;
@@ -271,11 +275,8 @@ private PermissionType(int value) {
     // @@protoc_insertion_point(enum_scope:google.cloud.audit.AuthorizationInfo.PermissionType)
   }
 
-  private int bitField0_;
   public static final int RESOURCE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object resource_ = "";
+  private volatile java.lang.Object resource_;
 
   /**
    *
@@ -283,7 +284,6 @@ private PermissionType(int value) {
    * 
    * 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
@@ -312,7 +312,6 @@ public java.lang.String getResource() {
    * 
    * 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
@@ -336,9 +335,7 @@ public com.google.protobuf.ByteString getResourceBytes() {
   }
 
   public static final int PERMISSION_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object permission_ = "";
+  private volatile java.lang.Object permission_;
 
   /**
    *
@@ -389,7 +386,7 @@ public com.google.protobuf.ByteString getPermissionBytes() {
   }
 
   public static final int GRANTED_FIELD_NUMBER = 3;
-  private boolean granted_ = false;
+  private boolean granted_;
 
   /**
    *
@@ -417,7 +414,6 @@ public boolean getGranted() {
    * 
    * 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`.
@@ -429,7 +425,7 @@ public boolean getGranted() {
    */
   @java.lang.Override
   public boolean hasResourceAttributes() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return resourceAttributes_ != null;
   }
 
   /**
@@ -438,7 +434,6 @@ public boolean hasResourceAttributes() {
    * 
    * 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`.
@@ -461,7 +456,6 @@ public com.google.rpc.context.AttributeContext.Resource getResourceAttributes()
    * 
    * 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`.
@@ -472,13 +466,11 @@ public com.google.rpc.context.AttributeContext.Resource getResourceAttributes()
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.ResourceOrBuilder
       getResourceAttributesOrBuilder() {
-    return resourceAttributes_ == null
-        ? com.google.rpc.context.AttributeContext.Resource.getDefaultInstance()
-        : resourceAttributes_;
+    return getResourceAttributes();
   }
 
   public static final int PERMISSION_TYPE_FIELD_NUMBER = 7;
-  private int permissionType_ = 0;
+  private int permissionType_;
 
   /**
    *
@@ -513,8 +505,9 @@ public int getPermissionTypeValue() {
    */
   @java.lang.Override
   public com.google.cloud.audit.AuthorizationInfo.PermissionType getPermissionType() {
+    @SuppressWarnings("deprecation")
     com.google.cloud.audit.AuthorizationInfo.PermissionType result =
-        com.google.cloud.audit.AuthorizationInfo.PermissionType.forNumber(permissionType_);
+        com.google.cloud.audit.AuthorizationInfo.PermissionType.valueOf(permissionType_);
     return result == null
         ? com.google.cloud.audit.AuthorizationInfo.PermissionType.UNRECOGNIZED
         : result;
@@ -543,7 +536,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (granted_ != false) {
       output.writeBool(3, granted_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (resourceAttributes_ != null) {
       output.writeMessage(5, getResourceAttributes());
     }
     if (permissionType_
@@ -569,7 +562,7 @@ public int getSerializedSize() {
     if (granted_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(3, granted_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (resourceAttributes_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getResourceAttributes());
     }
     if (permissionType_
@@ -753,34 +746,29 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.cloud.audit.AuthorizationInfo.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getResourceAttributesFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       resource_ = "";
+
       permission_ = "";
+
       granted_ = false;
-      resourceAttributes_ = null;
-      if (resourceAttributesBuilder_ != null) {
-        resourceAttributesBuilder_.dispose();
+
+      if (resourceAttributesBuilder_ == null) {
+        resourceAttributes_ = null;
+      } else {
+        resourceAttributes_ = null;
         resourceAttributesBuilder_ = null;
       }
       permissionType_ = 0;
+
       return this;
     }
 
@@ -808,38 +796,19 @@ public com.google.cloud.audit.AuthorizationInfo build() {
     public com.google.cloud.audit.AuthorizationInfo buildPartial() {
       com.google.cloud.audit.AuthorizationInfo result =
           new com.google.cloud.audit.AuthorizationInfo(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.resource_ = resource_;
+      result.permission_ = permission_;
+      result.granted_ = granted_;
+      if (resourceAttributesBuilder_ == null) {
+        result.resourceAttributes_ = resourceAttributes_;
+      } else {
+        result.resourceAttributes_ = resourceAttributesBuilder_.build();
       }
+      result.permissionType_ = permissionType_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.cloud.audit.AuthorizationInfo result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.resource_ = resource_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.permission_ = permission_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.granted_ = granted_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.resourceAttributes_ =
-            resourceAttributesBuilder_ == null
-                ? resourceAttributes_
-                : resourceAttributesBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.permissionType_ = permissionType_;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -887,12 +856,10 @@ public Builder mergeFrom(com.google.cloud.audit.AuthorizationInfo other) {
       if (other == com.google.cloud.audit.AuthorizationInfo.getDefaultInstance()) return this;
       if (!other.getResource().isEmpty()) {
         resource_ = other.resource_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getPermission().isEmpty()) {
         permission_ = other.permission_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getGranted() != false) {
@@ -933,32 +900,32 @@ public Builder mergeFrom(
             case 10:
               {
                 resource_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 permission_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 24:
               {
                 granted_ = input.readBool();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 42:
               {
                 input.readMessage(
                     getResourceAttributesFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 42
             case 56:
               {
                 permissionType_ = input.readEnum();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 56
             default:
@@ -978,8 +945,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object resource_ = "";
 
     /**
@@ -988,7 +953,6 @@ public Builder mergeFrom(
      * 
      * 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
@@ -1016,7 +980,6 @@ public java.lang.String getResource() {
      * 
      * 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
@@ -1044,7 +1007,6 @@ public com.google.protobuf.ByteString getResourceBytes() {
      * 
      * 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
@@ -1059,8 +1021,8 @@ public Builder setResource(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       resource_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1071,7 +1033,6 @@ public Builder setResource(java.lang.String value) {
      * 
      * 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
@@ -1082,8 +1043,8 @@ public Builder setResource(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResource() {
+
       resource_ = getDefaultInstance().getResource();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1094,7 +1055,6 @@ public Builder clearResource() {
      * 
      * 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
@@ -1110,8 +1070,8 @@ public Builder setResourceBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       resource_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1180,8 +1140,8 @@ public Builder setPermission(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       permission_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1198,8 +1158,8 @@ public Builder setPermission(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPermission() {
+
       permission_ = getDefaultInstance().getPermission();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1221,8 +1181,8 @@ public Builder setPermissionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       permission_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1262,7 +1222,6 @@ public boolean getGranted() {
     public Builder setGranted(boolean value) {
 
       granted_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1280,7 +1239,7 @@ public Builder setGranted(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearGranted() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       granted_ = false;
       onChanged();
       return this;
@@ -1299,7 +1258,6 @@ public Builder clearGranted() {
      * 
      * 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`.
@@ -1310,7 +1268,7 @@ public Builder clearGranted() {
      * @return Whether the resourceAttributes field is set.
      */
     public boolean hasResourceAttributes() {
-      return ((bitField0_ & 0x00000008) != 0);
+      return resourceAttributesBuilder_ != null || resourceAttributes_ != null;
     }
 
     /**
@@ -1319,7 +1277,6 @@ public boolean hasResourceAttributes() {
      * 
      * 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`.
@@ -1345,7 +1302,6 @@ public com.google.rpc.context.AttributeContext.Resource getResourceAttributes()
      * 
      * 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`.
@@ -1359,11 +1315,11 @@ public Builder setResourceAttributes(com.google.rpc.context.AttributeContext.Res
           throw new NullPointerException();
         }
         resourceAttributes_ = value;
+        onChanged();
       } else {
         resourceAttributesBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -1373,7 +1329,6 @@ public Builder setResourceAttributes(com.google.rpc.context.AttributeContext.Res
      * 
      * 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`.
@@ -1385,11 +1340,11 @@ public Builder setResourceAttributes(
         com.google.rpc.context.AttributeContext.Resource.Builder builderForValue) {
       if (resourceAttributesBuilder_ == null) {
         resourceAttributes_ = builderForValue.build();
+        onChanged();
       } else {
         resourceAttributesBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -1399,7 +1354,6 @@ public Builder setResourceAttributes(
      * 
      * 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`.
@@ -1409,21 +1363,19 @@ public Builder setResourceAttributes(
      */
     public Builder mergeResourceAttributes(com.google.rpc.context.AttributeContext.Resource value) {
       if (resourceAttributesBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)
-            && resourceAttributes_ != null
-            && resourceAttributes_
-                != com.google.rpc.context.AttributeContext.Resource.getDefaultInstance()) {
-          getResourceAttributesBuilder().mergeFrom(value);
+        if (resourceAttributes_ != null) {
+          resourceAttributes_ =
+              com.google.rpc.context.AttributeContext.Resource.newBuilder(resourceAttributes_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           resourceAttributes_ = value;
         }
+        onChanged();
       } else {
         resourceAttributesBuilder_.mergeFrom(value);
       }
-      if (resourceAttributes_ != null) {
-        bitField0_ |= 0x00000008;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1433,7 +1385,6 @@ public Builder mergeResourceAttributes(com.google.rpc.context.AttributeContext.R
      * 
      * 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`.
@@ -1442,13 +1393,14 @@ public Builder mergeResourceAttributes(com.google.rpc.context.AttributeContext.R
      * .google.rpc.context.AttributeContext.Resource resource_attributes = 5;
      */
     public Builder clearResourceAttributes() {
-      bitField0_ = (bitField0_ & ~0x00000008);
-      resourceAttributes_ = null;
-      if (resourceAttributesBuilder_ != null) {
-        resourceAttributesBuilder_.dispose();
+      if (resourceAttributesBuilder_ == null) {
+        resourceAttributes_ = null;
+        onChanged();
+      } else {
+        resourceAttributes_ = null;
         resourceAttributesBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1458,7 +1410,6 @@ public Builder clearResourceAttributes() {
      * 
      * 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`.
@@ -1467,7 +1418,7 @@ public Builder clearResourceAttributes() {
      * .google.rpc.context.AttributeContext.Resource resource_attributes = 5;
      */
     public com.google.rpc.context.AttributeContext.Resource.Builder getResourceAttributesBuilder() {
-      bitField0_ |= 0x00000008;
+
       onChanged();
       return getResourceAttributesFieldBuilder().getBuilder();
     }
@@ -1478,7 +1429,6 @@ public com.google.rpc.context.AttributeContext.Resource.Builder getResourceAttri
      * 
      * 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`.
@@ -1503,7 +1453,6 @@ public com.google.rpc.context.AttributeContext.Resource.Builder getResourceAttri
      * 
      * 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`.
@@ -1563,8 +1512,8 @@ public int getPermissionTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setPermissionTypeValue(int value) {
+
       permissionType_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1584,8 +1533,9 @@ public Builder setPermissionTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.audit.AuthorizationInfo.PermissionType getPermissionType() {
+      @SuppressWarnings("deprecation")
       com.google.cloud.audit.AuthorizationInfo.PermissionType result =
-          com.google.cloud.audit.AuthorizationInfo.PermissionType.forNumber(permissionType_);
+          com.google.cloud.audit.AuthorizationInfo.PermissionType.valueOf(permissionType_);
       return result == null
           ? com.google.cloud.audit.AuthorizationInfo.PermissionType.UNRECOGNIZED
           : result;
@@ -1610,7 +1560,7 @@ public Builder setPermissionType(
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000010;
+
       permissionType_ = value.getNumber();
       onChanged();
       return this;
@@ -1630,7 +1580,7 @@ public Builder setPermissionType(
      * @return This builder for chaining.
      */
     public Builder clearPermissionType() {
-      bitField0_ = (bitField0_ & ~0x00000010);
+
       permissionType_ = 0;
       onChanged();
       return this;
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 74fdc6c8d9..2be65bf07f 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 public interface AuthorizationInfoOrBuilder
@@ -30,7 +29,6 @@ public interface AuthorizationInfoOrBuilder
    * 
    * 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
@@ -48,7 +46,6 @@ public interface AuthorizationInfoOrBuilder
    * 
    * 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
@@ -106,7 +103,6 @@ public interface AuthorizationInfoOrBuilder
    * 
    * 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`.
@@ -124,7 +120,6 @@ public interface AuthorizationInfoOrBuilder
    * 
    * 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`.
@@ -142,7 +137,6 @@ public interface AuthorizationInfoOrBuilder
    * 
    * 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 8a268c6d01..ed20390b81 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 /**
@@ -50,6 +49,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;
@@ -57,8 +61,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 3:
         return internalGetResourceTags();
@@ -77,7 +80,6 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
             com.google.cloud.audit.OrgPolicyViolationInfo.Builder.class);
   }
 
-  private int bitField0_;
   public static final int PAYLOAD_FIELD_NUMBER = 1;
   private com.google.protobuf.Struct payload_;
 
@@ -96,7 +98,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
    */
   @java.lang.Override
   public boolean hasPayload() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return payload_ != null;
   }
 
   /**
@@ -130,13 +132,11 @@ public com.google.protobuf.Struct getPayload() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() {
-    return payload_ == null ? com.google.protobuf.Struct.getDefaultInstance() : payload_;
+    return getPayload();
   }
 
   public static final int RESOURCE_TYPE_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object resourceType_ = "";
+  private volatile java.lang.Object resourceType_;
 
   /**
    *
@@ -201,7 +201,6 @@ private static final class ResourceTagsDefaultEntryHolder {
             "");
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField resourceTags_;
 
   private com.google.protobuf.MapField
@@ -224,7 +223,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.
@@ -255,7 +253,6 @@ public java.util.Map 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.
@@ -276,7 +273,6 @@ public java.util.Map 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.
@@ -286,10 +282,8 @@ public java.util.Map getResourceTagsMap() {
    * 
    */
   @java.lang.Override
-  public /* nullable */ java.lang.String getResourceTagsOrDefault(
-      java.lang.String key,
-      /* nullable */
-      java.lang.String defaultValue) {
+  public java.lang.String getResourceTagsOrDefault(
+      java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -304,7 +298,6 @@ public java.util.Map 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.
@@ -326,8 +319,6 @@ public java.lang.String getResourceTagsOrThrow(java.lang.String key) {
   }
 
   public static final int VIOLATION_INFO_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
   private java.util.List violationInfo_;
 
   /**
@@ -425,7 +416,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (payload_ != null) {
       output.writeMessage(1, getPayload());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(resourceType_)) {
@@ -445,7 +436,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (payload_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getPayload());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(resourceType_)) {
@@ -632,8 +623,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 3:
           return internalGetResourceTags();
@@ -643,8 +633,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 3:
           return internalGetMutableResourceTags();
@@ -664,32 +653,23 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     }
 
     // Construct using com.google.cloud.audit.OrgPolicyViolationInfo.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPayloadFieldBuilder();
-        getViolationInfoFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      payload_ = null;
-      if (payloadBuilder_ != null) {
-        payloadBuilder_.dispose();
+      if (payloadBuilder_ == null) {
+        payload_ = null;
+      } else {
+        payload_ = null;
         payloadBuilder_ = null;
       }
       resourceType_ = "";
+
       internalGetMutableResourceTags().clear();
       if (violationInfoBuilder_ == null) {
         violationInfo_ = java.util.Collections.emptyList();
@@ -697,7 +677,7 @@ public Builder clear() {
         violationInfo_ = null;
         violationInfoBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000008);
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -725,41 +705,26 @@ public com.google.cloud.audit.OrgPolicyViolationInfo build() {
     public com.google.cloud.audit.OrgPolicyViolationInfo buildPartial() {
       com.google.cloud.audit.OrgPolicyViolationInfo result =
           new com.google.cloud.audit.OrgPolicyViolationInfo(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      if (payloadBuilder_ == null) {
+        result.payload_ = payload_;
+      } else {
+        result.payload_ = payloadBuilder_.build();
       }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.cloud.audit.OrgPolicyViolationInfo result) {
+      result.resourceType_ = resourceType_;
+      result.resourceTags_ = internalGetResourceTags();
+      result.resourceTags_.makeImmutable();
       if (violationInfoBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           violationInfo_ = java.util.Collections.unmodifiableList(violationInfo_);
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.violationInfo_ = violationInfo_;
       } else {
         result.violationInfo_ = violationInfoBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.cloud.audit.OrgPolicyViolationInfo result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.payload_ = payloadBuilder_ == null ? payload_ : payloadBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.resourceType_ = resourceType_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.resourceTags_ = internalGetResourceTags();
-        result.resourceTags_.makeImmutable();
-      }
-      result.bitField0_ |= to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -812,16 +777,14 @@ public Builder mergeFrom(com.google.cloud.audit.OrgPolicyViolationInfo other) {
       }
       if (!other.getResourceType().isEmpty()) {
         resourceType_ = other.resourceType_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       internalGetMutableResourceTags().mergeFrom(other.internalGetResourceTags());
-      bitField0_ |= 0x00000004;
       if (violationInfoBuilder_ == null) {
         if (!other.violationInfo_.isEmpty()) {
           if (violationInfo_.isEmpty()) {
             violationInfo_ = other.violationInfo_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureViolationInfoIsMutable();
             violationInfo_.addAll(other.violationInfo_);
@@ -834,7 +797,7 @@ public Builder mergeFrom(com.google.cloud.audit.OrgPolicyViolationInfo other) {
             violationInfoBuilder_.dispose();
             violationInfoBuilder_ = null;
             violationInfo_ = other.violationInfo_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000002);
             violationInfoBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getViolationInfoFieldBuilder()
@@ -873,13 +836,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getPayloadFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 resourceType_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
@@ -891,7 +854,6 @@ public Builder mergeFrom(
                 internalGetMutableResourceTags()
                     .getMutableMap()
                     .put(resourceTags__.getKey(), resourceTags__.getValue());
-                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             case 34:
@@ -947,7 +909,7 @@ public Builder mergeFrom(
      * @return Whether the payload field is set.
      */
     public boolean hasPayload() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return payloadBuilder_ != null || payload_ != null;
     }
 
     /**
@@ -988,11 +950,11 @@ public Builder setPayload(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         payload_ = value;
+        onChanged();
       } else {
         payloadBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -1010,11 +972,11 @@ public Builder setPayload(com.google.protobuf.Struct value) {
     public Builder setPayload(com.google.protobuf.Struct.Builder builderForValue) {
       if (payloadBuilder_ == null) {
         payload_ = builderForValue.build();
+        onChanged();
       } else {
         payloadBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -1031,20 +993,17 @@ public Builder setPayload(com.google.protobuf.Struct.Builder builderForValue) {
      */
     public Builder mergePayload(com.google.protobuf.Struct value) {
       if (payloadBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && payload_ != null
-            && payload_ != com.google.protobuf.Struct.getDefaultInstance()) {
-          getPayloadBuilder().mergeFrom(value);
+        if (payload_ != null) {
+          payload_ =
+              com.google.protobuf.Struct.newBuilder(payload_).mergeFrom(value).buildPartial();
         } else {
           payload_ = value;
         }
+        onChanged();
       } else {
         payloadBuilder_.mergeFrom(value);
       }
-      if (payload_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1060,13 +1019,14 @@ public Builder mergePayload(com.google.protobuf.Struct value) {
      * .google.protobuf.Struct payload = 1 [(.google.api.field_behavior) = OPTIONAL];
      */
     public Builder clearPayload() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      payload_ = null;
-      if (payloadBuilder_ != null) {
-        payloadBuilder_.dispose();
+      if (payloadBuilder_ == null) {
+        payload_ = null;
+        onChanged();
+      } else {
+        payload_ = null;
         payloadBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1082,7 +1042,7 @@ public Builder clearPayload() {
      * .google.protobuf.Struct payload = 1 [(.google.api.field_behavior) = OPTIONAL];
      */
     public com.google.protobuf.Struct.Builder getPayloadBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getPayloadFieldBuilder().getBuilder();
     }
@@ -1201,8 +1161,8 @@ public Builder setResourceType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       resourceType_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1220,8 +1180,8 @@ public Builder setResourceType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResourceType() {
+
       resourceType_ = getDefaultInstance().getResourceType();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1244,8 +1204,8 @@ public Builder setResourceTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       resourceType_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1263,6 +1223,8 @@ public Builder setResourceTypeBytes(com.google.protobuf.ByteString value) {
 
     private com.google.protobuf.MapField
         internalGetMutableResourceTags() {
+      onChanged();
+      ;
       if (resourceTags_ == null) {
         resourceTags_ =
             com.google.protobuf.MapField.newMapField(ResourceTagsDefaultEntryHolder.defaultEntry);
@@ -1270,8 +1232,6 @@ public Builder setResourceTypeBytes(com.google.protobuf.ByteString value) {
       if (!resourceTags_.isMutable()) {
         resourceTags_ = resourceTags_.copy();
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
       return resourceTags_;
     }
 
@@ -1286,7 +1246,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.
@@ -1317,7 +1276,6 @@ public java.util.Map 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.
@@ -1338,7 +1296,6 @@ public java.util.Map 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.
@@ -1348,10 +1305,8 @@ public java.util.Map getResourceTagsMap() {
      * 
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getResourceTagsOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getResourceTagsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1366,7 +1321,6 @@ public java.util.Map 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.
@@ -1388,7 +1342,6 @@ public java.lang.String getResourceTagsOrThrow(java.lang.String key) {
     }
 
     public Builder clearResourceTags() {
-      bitField0_ = (bitField0_ & ~0x00000004);
       internalGetMutableResourceTags().getMutableMap().clear();
       return this;
     }
@@ -1400,7 +1353,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.
@@ -1420,7 +1372,6 @@ public Builder removeResourceTags(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableResourceTags() {
-      bitField0_ |= 0x00000004;
       return internalGetMutableResourceTags().getMutableMap();
     }
 
@@ -1431,7 +1382,6 @@ public java.util.Map 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.
@@ -1447,8 +1397,8 @@ public Builder putResourceTags(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
+
       internalGetMutableResourceTags().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000004;
       return this;
     }
 
@@ -1459,7 +1409,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.
@@ -1470,7 +1419,6 @@ public Builder putResourceTags(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllResourceTags(java.util.Map values) {
       internalGetMutableResourceTags().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000004;
       return this;
     }
 
@@ -1478,10 +1426,10 @@ public Builder putAllResourceTags(java.util.Map(violationInfo_);
-        bitField0_ |= 0x00000008;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -1728,7 +1676,7 @@ public Builder addAllViolationInfo(
     public Builder clearViolationInfo() {
       if (violationInfoBuilder_ == null) {
         violationInfo_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         violationInfoBuilder_.clear();
@@ -1872,7 +1820,7 @@ public com.google.cloud.audit.ViolationInfo.Builder addViolationInfoBuilder(int
                 com.google.cloud.audit.ViolationInfo.Builder,
                 com.google.cloud.audit.ViolationInfoOrBuilder>(
                 violationInfo_,
-                ((bitField0_ & 0x00000008) != 0),
+                ((bitField0_ & 0x00000002) != 0),
                 getParentForChildren(),
                 isClean());
         violationInfo_ = null;
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 41f5dccfee..06ec489c99 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 public interface OrgPolicyViolationInfoOrBuilder
@@ -102,7 +101,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.
@@ -120,7 +118,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.
@@ -142,7 +139,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.
@@ -160,7 +156,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.
@@ -169,6 +164,7 @@ public interface OrgPolicyViolationInfoOrBuilder
    * map<string, string> resource_tags = 3 [(.google.api.field_behavior) = OPTIONAL];
    * 
    */
+
   /* nullable */
   java.lang.String getResourceTagsOrDefault(
       java.lang.String key,
@@ -182,7 +178,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 ea3f179527..07bc1a2b1e 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 /**
@@ -47,6 +46,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;
@@ -62,7 +66,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.cloud.audit.PolicyViolationInfo.Builder.class);
   }
 
-  private int bitField0_;
   public static final int ORG_POLICY_VIOLATION_INFO_FIELD_NUMBER = 1;
   private com.google.cloud.audit.OrgPolicyViolationInfo orgPolicyViolationInfo_;
 
@@ -79,7 +82,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasOrgPolicyViolationInfo() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return orgPolicyViolationInfo_ != null;
   }
 
   /**
@@ -112,9 +115,7 @@ public com.google.cloud.audit.OrgPolicyViolationInfo getOrgPolicyViolationInfo()
   @java.lang.Override
   public com.google.cloud.audit.OrgPolicyViolationInfoOrBuilder
       getOrgPolicyViolationInfoOrBuilder() {
-    return orgPolicyViolationInfo_ == null
-        ? com.google.cloud.audit.OrgPolicyViolationInfo.getDefaultInstance()
-        : orgPolicyViolationInfo_;
+    return getOrgPolicyViolationInfo();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -131,7 +132,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (orgPolicyViolationInfo_ != null) {
       output.writeMessage(1, getOrgPolicyViolationInfo());
     }
     getUnknownFields().writeTo(output);
@@ -143,7 +144,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (orgPolicyViolationInfo_ != null) {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(1, getOrgPolicyViolationInfo());
     }
@@ -312,28 +313,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.cloud.audit.PolicyViolationInfo.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getOrgPolicyViolationInfoFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      orgPolicyViolationInfo_ = null;
-      if (orgPolicyViolationInfoBuilder_ != null) {
-        orgPolicyViolationInfoBuilder_.dispose();
+      if (orgPolicyViolationInfoBuilder_ == null) {
+        orgPolicyViolationInfo_ = null;
+      } else {
+        orgPolicyViolationInfo_ = null;
         orgPolicyViolationInfoBuilder_ = null;
       }
       return this;
@@ -363,26 +355,15 @@ public com.google.cloud.audit.PolicyViolationInfo build() {
     public com.google.cloud.audit.PolicyViolationInfo buildPartial() {
       com.google.cloud.audit.PolicyViolationInfo result =
           new com.google.cloud.audit.PolicyViolationInfo(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (orgPolicyViolationInfoBuilder_ == null) {
+        result.orgPolicyViolationInfo_ = orgPolicyViolationInfo_;
+      } else {
+        result.orgPolicyViolationInfo_ = orgPolicyViolationInfoBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.cloud.audit.PolicyViolationInfo result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.orgPolicyViolationInfo_ =
-            orgPolicyViolationInfoBuilder_ == null
-                ? orgPolicyViolationInfo_
-                : orgPolicyViolationInfoBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -461,7 +442,7 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getOrgPolicyViolationInfoFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -481,8 +462,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.cloud.audit.OrgPolicyViolationInfo orgPolicyViolationInfo_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.audit.OrgPolicyViolationInfo,
@@ -502,7 +481,7 @@ public Builder mergeFrom(
      * @return Whether the orgPolicyViolationInfo field is set.
      */
     public boolean hasOrgPolicyViolationInfo() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return orgPolicyViolationInfoBuilder_ != null || orgPolicyViolationInfo_ != null;
     }
 
     /**
@@ -541,11 +520,11 @@ public Builder setOrgPolicyViolationInfo(com.google.cloud.audit.OrgPolicyViolati
           throw new NullPointerException();
         }
         orgPolicyViolationInfo_ = value;
+        onChanged();
       } else {
         orgPolicyViolationInfoBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -562,11 +541,11 @@ public Builder setOrgPolicyViolationInfo(
         com.google.cloud.audit.OrgPolicyViolationInfo.Builder builderForValue) {
       if (orgPolicyViolationInfoBuilder_ == null) {
         orgPolicyViolationInfo_ = builderForValue.build();
+        onChanged();
       } else {
         orgPolicyViolationInfoBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -582,21 +561,19 @@ public Builder setOrgPolicyViolationInfo(
     public Builder mergeOrgPolicyViolationInfo(
         com.google.cloud.audit.OrgPolicyViolationInfo value) {
       if (orgPolicyViolationInfoBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && orgPolicyViolationInfo_ != null
-            && orgPolicyViolationInfo_
-                != com.google.cloud.audit.OrgPolicyViolationInfo.getDefaultInstance()) {
-          getOrgPolicyViolationInfoBuilder().mergeFrom(value);
+        if (orgPolicyViolationInfo_ != null) {
+          orgPolicyViolationInfo_ =
+              com.google.cloud.audit.OrgPolicyViolationInfo.newBuilder(orgPolicyViolationInfo_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           orgPolicyViolationInfo_ = value;
         }
+        onChanged();
       } else {
         orgPolicyViolationInfoBuilder_.mergeFrom(value);
       }
-      if (orgPolicyViolationInfo_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -610,13 +587,14 @@ public Builder mergeOrgPolicyViolationInfo(
      * .google.cloud.audit.OrgPolicyViolationInfo org_policy_violation_info = 1;
      */
     public Builder clearOrgPolicyViolationInfo() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      orgPolicyViolationInfo_ = null;
-      if (orgPolicyViolationInfoBuilder_ != null) {
-        orgPolicyViolationInfoBuilder_.dispose();
+      if (orgPolicyViolationInfoBuilder_ == null) {
+        orgPolicyViolationInfo_ = null;
+        onChanged();
+      } else {
+        orgPolicyViolationInfo_ = null;
         orgPolicyViolationInfoBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -631,7 +609,7 @@ public Builder clearOrgPolicyViolationInfo() {
      */
     public com.google.cloud.audit.OrgPolicyViolationInfo.Builder
         getOrgPolicyViolationInfoBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getOrgPolicyViolationInfoFieldBuilder().getBuilder();
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/PolicyViolationInfoOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/PolicyViolationInfoOrBuilder.java
index 59f619ac2f..fa822cda65 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/PolicyViolationInfoOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/PolicyViolationInfoOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 public interface PolicyViolationInfoOrBuilder
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 c61ecac193..b4804b7534 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 /**
@@ -51,6 +50,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;
@@ -66,11 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.cloud.audit.RequestMetadata.Builder.class);
   }
 
-  private int bitField0_;
   public static final int CALLER_IP_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object callerIp_ = "";
+  private volatile java.lang.Object callerIp_;
 
   /**
    *
@@ -141,9 +142,7 @@ public com.google.protobuf.ByteString getCallerIpBytes() {
   }
 
   public static final int CALLER_SUPPLIED_USER_AGENT_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object callerSuppliedUserAgent_ = "";
+  private volatile java.lang.Object callerSuppliedUserAgent_;
 
   /**
    *
@@ -152,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`:
@@ -186,7 +184,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`:
@@ -214,9 +211,7 @@ public com.google.protobuf.ByteString getCallerSuppliedUserAgentBytes() {
   }
 
   public static final int CALLER_NETWORK_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object callerNetwork_ = "";
+  private volatile java.lang.Object callerNetwork_;
 
   /**
    *
@@ -227,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"
    * 

    *
@@ -257,7 +251,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"
    * 

    *
@@ -288,8 +281,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`.
@@ -301,7 +292,7 @@ public com.google.protobuf.ByteString getCallerNetworkBytes() {
    */
   @java.lang.Override
   public boolean hasRequestAttributes() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return requestAttributes_ != null;
   }
 
   /**
@@ -311,8 +302,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`.
@@ -336,8 +325,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`.
@@ -347,9 +334,7 @@ public com.google.rpc.context.AttributeContext.Request getRequestAttributes() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.RequestOrBuilder getRequestAttributesOrBuilder() {
-    return requestAttributes_ == null
-        ? com.google.rpc.context.AttributeContext.Request.getDefaultInstance()
-        : requestAttributes_;
+    return getRequestAttributes();
   }
 
   public static final int DESTINATION_ATTRIBUTES_FIELD_NUMBER = 8;
@@ -372,7 +357,7 @@ public com.google.rpc.context.AttributeContext.RequestOrBuilder getRequestAttrib
    */
   @java.lang.Override
   public boolean hasDestinationAttributes() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return destinationAttributes_ != null;
   }
 
   /**
@@ -412,9 +397,7 @@ public com.google.rpc.context.AttributeContext.Peer getDestinationAttributes() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.PeerOrBuilder getDestinationAttributesOrBuilder() {
-    return destinationAttributes_ == null
-        ? com.google.rpc.context.AttributeContext.Peer.getDefaultInstance()
-        : destinationAttributes_;
+    return getDestinationAttributes();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -440,10 +423,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(callerNetwork_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, callerNetwork_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (requestAttributes_ != null) {
       output.writeMessage(7, getRequestAttributes());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (destinationAttributes_ != null) {
       output.writeMessage(8, getDestinationAttributes());
     }
     getUnknownFields().writeTo(output);
@@ -464,10 +447,10 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(callerNetwork_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, callerNetwork_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (requestAttributes_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getRequestAttributes());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (destinationAttributes_ != null) {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(8, getDestinationAttributes());
     }
@@ -652,37 +635,31 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.cloud.audit.RequestMetadata.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getRequestAttributesFieldBuilder();
-        getDestinationAttributesFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       callerIp_ = "";
+
       callerSuppliedUserAgent_ = "";
+
       callerNetwork_ = "";
-      requestAttributes_ = null;
-      if (requestAttributesBuilder_ != null) {
-        requestAttributesBuilder_.dispose();
+
+      if (requestAttributesBuilder_ == null) {
+        requestAttributes_ = null;
+      } else {
+        requestAttributes_ = null;
         requestAttributesBuilder_ = null;
       }
-      destinationAttributes_ = null;
-      if (destinationAttributesBuilder_ != null) {
-        destinationAttributesBuilder_.dispose();
+      if (destinationAttributesBuilder_ == null) {
+        destinationAttributes_ = null;
+      } else {
+        destinationAttributes_ = null;
         destinationAttributesBuilder_ = null;
       }
       return this;
@@ -712,42 +689,23 @@ public com.google.cloud.audit.RequestMetadata build() {
     public com.google.cloud.audit.RequestMetadata buildPartial() {
       com.google.cloud.audit.RequestMetadata result =
           new com.google.cloud.audit.RequestMetadata(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.callerIp_ = callerIp_;
+      result.callerSuppliedUserAgent_ = callerSuppliedUserAgent_;
+      result.callerNetwork_ = callerNetwork_;
+      if (requestAttributesBuilder_ == null) {
+        result.requestAttributes_ = requestAttributes_;
+      } else {
+        result.requestAttributes_ = requestAttributesBuilder_.build();
+      }
+      if (destinationAttributesBuilder_ == null) {
+        result.destinationAttributes_ = destinationAttributes_;
+      } else {
+        result.destinationAttributes_ = destinationAttributesBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.cloud.audit.RequestMetadata result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.callerIp_ = callerIp_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.callerSuppliedUserAgent_ = callerSuppliedUserAgent_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.callerNetwork_ = callerNetwork_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.requestAttributes_ =
-            requestAttributesBuilder_ == null
-                ? requestAttributes_
-                : requestAttributesBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.destinationAttributes_ =
-            destinationAttributesBuilder_ == null
-                ? destinationAttributes_
-                : destinationAttributesBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -795,17 +753,14 @@ public Builder mergeFrom(com.google.cloud.audit.RequestMetadata other) {
       if (other == com.google.cloud.audit.RequestMetadata.getDefaultInstance()) return this;
       if (!other.getCallerIp().isEmpty()) {
         callerIp_ = other.callerIp_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getCallerSuppliedUserAgent().isEmpty()) {
         callerSuppliedUserAgent_ = other.callerSuppliedUserAgent_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getCallerNetwork().isEmpty()) {
         callerNetwork_ = other.callerNetwork_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.hasRequestAttributes()) {
@@ -843,33 +798,33 @@ public Builder mergeFrom(
             case 10:
               {
                 callerIp_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 callerSuppliedUserAgent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 callerNetwork_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 58:
               {
                 input.readMessage(
                     getRequestAttributesFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 58
             case 66:
               {
                 input.readMessage(
                     getDestinationAttributesFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 66
             default:
@@ -889,8 +844,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object callerIp_ = "";
 
     /**
@@ -985,8 +938,8 @@ public Builder setCallerIp(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       callerIp_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1013,8 +966,8 @@ public Builder setCallerIp(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearCallerIp() {
+
       callerIp_ = getDefaultInstance().getCallerIp();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1046,8 +999,8 @@ public Builder setCallerIpBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       callerIp_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1061,7 +1014,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`:
@@ -1094,7 +1046,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`:
@@ -1127,7 +1078,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`:
@@ -1146,8 +1096,8 @@ public Builder setCallerSuppliedUserAgent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       callerSuppliedUserAgent_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1159,7 +1109,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`:
@@ -1174,8 +1123,8 @@ public Builder setCallerSuppliedUserAgent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearCallerSuppliedUserAgent() {
+
       callerSuppliedUserAgent_ = getDefaultInstance().getCallerSuppliedUserAgent();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1187,7 +1136,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`:
@@ -1207,8 +1155,8 @@ public Builder setCallerSuppliedUserAgentBytes(com.google.protobuf.ByteString va
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       callerSuppliedUserAgent_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1224,7 +1172,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"
      * 

      *
@@ -1253,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"
      * 

      *
@@ -1282,7 +1228,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"
      * 

      *
@@ -1295,8 +1240,8 @@ public Builder setCallerNetwork(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       callerNetwork_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1310,7 +1255,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"
      * 

      *
@@ -1319,8 +1263,8 @@ public Builder setCallerNetwork(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearCallerNetwork() {
+
       callerNetwork_ = getDefaultInstance().getCallerNetwork();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1334,7 +1278,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"
      * 

      *
@@ -1348,8 +1291,8 @@ public Builder setCallerNetworkBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       callerNetwork_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1368,8 +1311,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`.
@@ -1380,7 +1321,7 @@ public Builder setCallerNetworkBytes(com.google.protobuf.ByteString value) {
      * @return Whether the requestAttributes field is set.
      */
     public boolean hasRequestAttributes() {
-      return ((bitField0_ & 0x00000008) != 0);
+      return requestAttributesBuilder_ != null || requestAttributes_ != null;
     }
 
     /**
@@ -1390,8 +1331,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`.
@@ -1418,8 +1357,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`.
@@ -1433,11 +1370,11 @@ public Builder setRequestAttributes(com.google.rpc.context.AttributeContext.Requ
           throw new NullPointerException();
         }
         requestAttributes_ = value;
+        onChanged();
       } else {
         requestAttributesBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -1448,8 +1385,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`.
@@ -1461,11 +1396,11 @@ public Builder setRequestAttributes(
         com.google.rpc.context.AttributeContext.Request.Builder builderForValue) {
       if (requestAttributesBuilder_ == null) {
         requestAttributes_ = builderForValue.build();
+        onChanged();
       } else {
         requestAttributesBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -1476,8 +1411,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`.
@@ -1487,21 +1420,19 @@ public Builder setRequestAttributes(
      */
     public Builder mergeRequestAttributes(com.google.rpc.context.AttributeContext.Request value) {
       if (requestAttributesBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)
-            && requestAttributes_ != null
-            && requestAttributes_
-                != com.google.rpc.context.AttributeContext.Request.getDefaultInstance()) {
-          getRequestAttributesBuilder().mergeFrom(value);
+        if (requestAttributes_ != null) {
+          requestAttributes_ =
+              com.google.rpc.context.AttributeContext.Request.newBuilder(requestAttributes_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           requestAttributes_ = value;
         }
+        onChanged();
       } else {
         requestAttributesBuilder_.mergeFrom(value);
       }
-      if (requestAttributes_ != null) {
-        bitField0_ |= 0x00000008;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1512,8 +1443,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`.
@@ -1522,13 +1451,14 @@ public Builder mergeRequestAttributes(com.google.rpc.context.AttributeContext.Re
      * .google.rpc.context.AttributeContext.Request request_attributes = 7;
      */
     public Builder clearRequestAttributes() {
-      bitField0_ = (bitField0_ & ~0x00000008);
-      requestAttributes_ = null;
-      if (requestAttributesBuilder_ != null) {
-        requestAttributesBuilder_.dispose();
+      if (requestAttributesBuilder_ == null) {
+        requestAttributes_ = null;
+        onChanged();
+      } else {
+        requestAttributes_ = null;
         requestAttributesBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1539,8 +1469,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`.
@@ -1549,7 +1477,7 @@ public Builder clearRequestAttributes() {
      * .google.rpc.context.AttributeContext.Request request_attributes = 7;
      */
     public com.google.rpc.context.AttributeContext.Request.Builder getRequestAttributesBuilder() {
-      bitField0_ |= 0x00000008;
+
       onChanged();
       return getRequestAttributesFieldBuilder().getBuilder();
     }
@@ -1561,8 +1489,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`.
@@ -1588,8 +1514,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`.
@@ -1637,7 +1561,7 @@ public com.google.rpc.context.AttributeContext.Request.Builder getRequestAttribu
      * @return Whether the destinationAttributes field is set.
      */
     public boolean hasDestinationAttributes() {
-      return ((bitField0_ & 0x00000010) != 0);
+      return destinationAttributesBuilder_ != null || destinationAttributes_ != null;
     }
 
     /**
@@ -1684,11 +1608,11 @@ public Builder setDestinationAttributes(com.google.rpc.context.AttributeContext.
           throw new NullPointerException();
         }
         destinationAttributes_ = value;
+        onChanged();
       } else {
         destinationAttributesBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -1709,11 +1633,11 @@ public Builder setDestinationAttributes(
         com.google.rpc.context.AttributeContext.Peer.Builder builderForValue) {
       if (destinationAttributesBuilder_ == null) {
         destinationAttributes_ = builderForValue.build();
+        onChanged();
       } else {
         destinationAttributesBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -1732,21 +1656,19 @@ public Builder setDestinationAttributes(
      */
     public Builder mergeDestinationAttributes(com.google.rpc.context.AttributeContext.Peer value) {
       if (destinationAttributesBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)
-            && destinationAttributes_ != null
-            && destinationAttributes_
-                != com.google.rpc.context.AttributeContext.Peer.getDefaultInstance()) {
-          getDestinationAttributesBuilder().mergeFrom(value);
+        if (destinationAttributes_ != null) {
+          destinationAttributes_ =
+              com.google.rpc.context.AttributeContext.Peer.newBuilder(destinationAttributes_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           destinationAttributes_ = value;
         }
+        onChanged();
       } else {
         destinationAttributesBuilder_.mergeFrom(value);
       }
-      if (destinationAttributes_ != null) {
-        bitField0_ |= 0x00000010;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1764,13 +1686,14 @@ public Builder mergeDestinationAttributes(com.google.rpc.context.AttributeContex
      * .google.rpc.context.AttributeContext.Peer destination_attributes = 8;
      */
     public Builder clearDestinationAttributes() {
-      bitField0_ = (bitField0_ & ~0x00000010);
-      destinationAttributes_ = null;
-      if (destinationAttributesBuilder_ != null) {
-        destinationAttributesBuilder_.dispose();
+      if (destinationAttributesBuilder_ == null) {
+        destinationAttributes_ = null;
+        onChanged();
+      } else {
+        destinationAttributes_ = null;
         destinationAttributesBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1788,7 +1711,7 @@ public Builder clearDestinationAttributes() {
      * .google.rpc.context.AttributeContext.Peer destination_attributes = 8;
      */
     public com.google.rpc.context.AttributeContext.Peer.Builder getDestinationAttributesBuilder() {
-      bitField0_ |= 0x00000010;
+
       onChanged();
       return getDestinationAttributesFieldBuilder().getBuilder();
     }
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 6c275f22b8..14f82e79b6 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 public interface RequestMetadataOrBuilder
@@ -77,7 +76,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`:
@@ -100,7 +98,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`:
@@ -125,7 +122,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"
    * 

    *
@@ -144,7 +140,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"
    * 

    *
@@ -161,8 +156,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`.
@@ -181,8 +174,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`.
@@ -201,8 +192,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 2e9aae8735..55197dd791 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 /**
@@ -40,8 +39,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
@@ -50,6 +49,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,10 +70,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_;
 
   /**
    *
@@ -79,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"
@@ -101,7 +101,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"
@@ -123,7 +122,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"
@@ -146,7 +144,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"
@@ -162,10 +159,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_;
 
   /**
    *
@@ -175,7 +169,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"
@@ -197,7 +190,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"
@@ -219,7 +211,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"
@@ -242,7 +233,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"
@@ -477,9 +467,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     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;
     }
 
@@ -507,23 +498,19 @@ 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);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      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_;
+      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_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -574,7 +561,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_);
@@ -584,7 +571,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_);
@@ -650,14 +637,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;
     }
 
     /**
@@ -668,7 +655,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"
@@ -679,8 +665,7 @@ private void ensureCurrentLocationsIsMutable() {
      * @return A list containing the currentLocations.
      */
     public com.google.protobuf.ProtocolStringList getCurrentLocationsList() {
-      currentLocations_.makeImmutable();
-      return currentLocations_;
+      return currentLocations_.getUnmodifiableView();
     }
 
     /**
@@ -691,7 +676,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"
@@ -713,7 +697,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"
@@ -736,7 +719,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"
@@ -759,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"
@@ -777,7 +758,6 @@ public Builder setCurrentLocations(int index, java.lang.String value) {
       }
       ensureCurrentLocationsIsMutable();
       currentLocations_.set(index, value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -790,7 +770,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"
@@ -807,7 +786,6 @@ public Builder addCurrentLocations(java.lang.String value) {
       }
       ensureCurrentLocationsIsMutable();
       currentLocations_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -820,7 +798,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"
@@ -834,7 +811,6 @@ public Builder addCurrentLocations(java.lang.String value) {
     public Builder addAllCurrentLocations(java.lang.Iterable values) {
       ensureCurrentLocationsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, currentLocations_);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -847,7 +823,6 @@ public Builder addAllCurrentLocations(java.lang.Iterable 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"
@@ -858,9 +833,8 @@ public Builder addAllCurrentLocations(java.lang.Iterable 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;
     }
@@ -873,7 +847,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"
@@ -891,19 +864,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;
     }
 
     /**
@@ -914,7 +886,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"
@@ -925,8 +896,7 @@ private void ensureOriginalLocationsIsMutable() {
      * @return A list containing the originalLocations.
      */
     public com.google.protobuf.ProtocolStringList getOriginalLocationsList() {
-      originalLocations_.makeImmutable();
-      return originalLocations_;
+      return originalLocations_.getUnmodifiableView();
     }
 
     /**
@@ -937,7 +907,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"
@@ -959,7 +928,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"
@@ -982,7 +950,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"
@@ -1005,7 +972,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"
@@ -1023,7 +989,6 @@ public Builder setOriginalLocations(int index, java.lang.String value) {
       }
       ensureOriginalLocationsIsMutable();
       originalLocations_.set(index, value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1036,7 +1001,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"
@@ -1053,7 +1017,6 @@ public Builder addOriginalLocations(java.lang.String value) {
       }
       ensureOriginalLocationsIsMutable();
       originalLocations_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1066,7 +1029,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"
@@ -1080,7 +1042,6 @@ public Builder addOriginalLocations(java.lang.String value) {
     public Builder addAllOriginalLocations(java.lang.Iterable values) {
       ensureOriginalLocationsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, originalLocations_);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1093,7 +1054,6 @@ public Builder addAllOriginalLocations(java.lang.Iterable 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"
@@ -1104,9 +1064,8 @@ public Builder addAllOriginalLocations(java.lang.Iterable 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;
     }
@@ -1119,7 +1078,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"
@@ -1137,7 +1095,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 ddb3274b80..d815073889 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 public interface ResourceLocationOrBuilder
@@ -32,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"
@@ -52,7 +50,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"
@@ -72,7 +69,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"
@@ -93,7 +89,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"
@@ -114,7 +109,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"
@@ -134,7 +128,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"
@@ -154,7 +147,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"
@@ -175,7 +167,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 e9dd940b80..2617754fa6 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 /**
@@ -49,6 +48,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;
@@ -163,6 +167,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;
@@ -179,11 +188,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                   .class);
     }
 
-    private int bitField0_;
     public static final int PRINCIPAL_EMAIL_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object principalEmail_ = "";
+    private volatile java.lang.Object principalEmail_;
 
     /**
      *
@@ -249,7 +255,7 @@ public com.google.protobuf.ByteString getPrincipalEmailBytes() {
      */
     @java.lang.Override
     public boolean hasServiceMetadata() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return serviceMetadata_ != null;
     }
 
     /**
@@ -281,9 +287,7 @@ public com.google.protobuf.Struct getServiceMetadata() {
      */
     @java.lang.Override
     public com.google.protobuf.StructOrBuilder getServiceMetadataOrBuilder() {
-      return serviceMetadata_ == null
-          ? com.google.protobuf.Struct.getDefaultInstance()
-          : serviceMetadata_;
+      return getServiceMetadata();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -303,7 +307,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(principalEmail_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, principalEmail_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (serviceMetadata_ != null) {
         output.writeMessage(2, getServiceMetadata());
       }
       getUnknownFields().writeTo(output);
@@ -318,7 +322,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(principalEmail_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, principalEmail_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (serviceMetadata_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getServiceMetadata());
       }
       size += getUnknownFields().getSerializedSize();
@@ -496,29 +500,21 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
       // Construct using
       // com.google.cloud.audit.ServiceAccountDelegationInfo.FirstPartyPrincipal.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getServiceMetadataFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         principalEmail_ = "";
-        serviceMetadata_ = null;
-        if (serviceMetadataBuilder_ != null) {
-          serviceMetadataBuilder_.dispose();
+
+        if (serviceMetadataBuilder_ == null) {
+          serviceMetadata_ = null;
+        } else {
+          serviceMetadata_ = null;
           serviceMetadataBuilder_ = null;
         }
         return this;
@@ -552,28 +548,16 @@ public com.google.cloud.audit.ServiceAccountDelegationInfo.FirstPartyPrincipal b
           buildPartial() {
         com.google.cloud.audit.ServiceAccountDelegationInfo.FirstPartyPrincipal result =
             new com.google.cloud.audit.ServiceAccountDelegationInfo.FirstPartyPrincipal(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        result.principalEmail_ = principalEmail_;
+        if (serviceMetadataBuilder_ == null) {
+          result.serviceMetadata_ = serviceMetadata_;
+        } else {
+          result.serviceMetadata_ = serviceMetadataBuilder_.build();
         }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(
-          com.google.cloud.audit.ServiceAccountDelegationInfo.FirstPartyPrincipal result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.principalEmail_ = principalEmail_;
-        }
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.serviceMetadata_ =
-              serviceMetadataBuilder_ == null ? serviceMetadata_ : serviceMetadataBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        result.bitField0_ |= to_bitField0_;
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -628,7 +612,6 @@ public Builder mergeFrom(
                 .getDefaultInstance()) return this;
         if (!other.getPrincipalEmail().isEmpty()) {
           principalEmail_ = other.principalEmail_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasServiceMetadata()) {
@@ -663,14 +646,14 @@ public Builder mergeFrom(
               case 10:
                 {
                   principalEmail_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   input.readMessage(
                       getServiceMetadataFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               default:
@@ -690,8 +673,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private java.lang.Object principalEmail_ = "";
 
       /**
@@ -756,8 +737,8 @@ public Builder setPrincipalEmail(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         principalEmail_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -774,8 +755,8 @@ public Builder setPrincipalEmail(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearPrincipalEmail() {
+
         principalEmail_ = getDefaultInstance().getPrincipalEmail();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -797,8 +778,8 @@ public Builder setPrincipalEmailBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         principalEmail_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -822,7 +803,7 @@ public Builder setPrincipalEmailBytes(com.google.protobuf.ByteString value) {
        * @return Whether the serviceMetadata field is set.
        */
       public boolean hasServiceMetadata() {
-        return ((bitField0_ & 0x00000002) != 0);
+        return serviceMetadataBuilder_ != null || serviceMetadata_ != null;
       }
 
       /**
@@ -861,11 +842,11 @@ public Builder setServiceMetadata(com.google.protobuf.Struct value) {
             throw new NullPointerException();
           }
           serviceMetadata_ = value;
+          onChanged();
         } else {
           serviceMetadataBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -881,11 +862,11 @@ public Builder setServiceMetadata(com.google.protobuf.Struct value) {
       public Builder setServiceMetadata(com.google.protobuf.Struct.Builder builderForValue) {
         if (serviceMetadataBuilder_ == null) {
           serviceMetadata_ = builderForValue.build();
+          onChanged();
         } else {
           serviceMetadataBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -900,20 +881,19 @@ public Builder setServiceMetadata(com.google.protobuf.Struct.Builder builderForV
        */
       public Builder mergeServiceMetadata(com.google.protobuf.Struct value) {
         if (serviceMetadataBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)
-              && serviceMetadata_ != null
-              && serviceMetadata_ != com.google.protobuf.Struct.getDefaultInstance()) {
-            getServiceMetadataBuilder().mergeFrom(value);
+          if (serviceMetadata_ != null) {
+            serviceMetadata_ =
+                com.google.protobuf.Struct.newBuilder(serviceMetadata_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             serviceMetadata_ = value;
           }
+          onChanged();
         } else {
           serviceMetadataBuilder_.mergeFrom(value);
         }
-        if (serviceMetadata_ != null) {
-          bitField0_ |= 0x00000002;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -927,13 +907,14 @@ public Builder mergeServiceMetadata(com.google.protobuf.Struct value) {
        * .google.protobuf.Struct service_metadata = 2;
        */
       public Builder clearServiceMetadata() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        serviceMetadata_ = null;
-        if (serviceMetadataBuilder_ != null) {
-          serviceMetadataBuilder_.dispose();
+        if (serviceMetadataBuilder_ == null) {
+          serviceMetadata_ = null;
+          onChanged();
+        } else {
+          serviceMetadata_ = null;
           serviceMetadataBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -947,7 +928,7 @@ public Builder clearServiceMetadata() {
        * .google.protobuf.Struct service_metadata = 2;
        */
       public com.google.protobuf.Struct.Builder getServiceMetadataBuilder() {
-        bitField0_ |= 0x00000002;
+
         onChanged();
         return getServiceMetadataFieldBuilder().getBuilder();
       }
@@ -1136,6 +1117,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;
@@ -1152,7 +1138,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                   .class);
     }
 
-    private int bitField0_;
     public static final int THIRD_PARTY_CLAIMS_FIELD_NUMBER = 1;
     private com.google.protobuf.Struct thirdPartyClaims_;
 
@@ -1169,7 +1154,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      */
     @java.lang.Override
     public boolean hasThirdPartyClaims() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return thirdPartyClaims_ != null;
     }
 
     /**
@@ -1201,9 +1186,7 @@ public com.google.protobuf.Struct getThirdPartyClaims() {
      */
     @java.lang.Override
     public com.google.protobuf.StructOrBuilder getThirdPartyClaimsOrBuilder() {
-      return thirdPartyClaims_ == null
-          ? com.google.protobuf.Struct.getDefaultInstance()
-          : thirdPartyClaims_;
+      return getThirdPartyClaims();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1220,7 +1203,7 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (thirdPartyClaims_ != null) {
         output.writeMessage(1, getThirdPartyClaims());
       }
       getUnknownFields().writeTo(output);
@@ -1232,7 +1215,7 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (thirdPartyClaims_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getThirdPartyClaims());
       }
       size += getUnknownFields().getSerializedSize();
@@ -1407,28 +1390,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
       // Construct using
       // com.google.cloud.audit.ServiceAccountDelegationInfo.ThirdPartyPrincipal.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getThirdPartyClaimsFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
-        thirdPartyClaims_ = null;
-        if (thirdPartyClaimsBuilder_ != null) {
-          thirdPartyClaimsBuilder_.dispose();
+        if (thirdPartyClaimsBuilder_ == null) {
+          thirdPartyClaims_ = null;
+        } else {
+          thirdPartyClaims_ = null;
           thirdPartyClaimsBuilder_ = null;
         }
         return this;
@@ -1462,27 +1436,15 @@ public com.google.cloud.audit.ServiceAccountDelegationInfo.ThirdPartyPrincipal b
           buildPartial() {
         com.google.cloud.audit.ServiceAccountDelegationInfo.ThirdPartyPrincipal result =
             new com.google.cloud.audit.ServiceAccountDelegationInfo.ThirdPartyPrincipal(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        if (thirdPartyClaimsBuilder_ == null) {
+          result.thirdPartyClaims_ = thirdPartyClaims_;
+        } else {
+          result.thirdPartyClaims_ = thirdPartyClaimsBuilder_.build();
         }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(
-          com.google.cloud.audit.ServiceAccountDelegationInfo.ThirdPartyPrincipal result) {
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.thirdPartyClaims_ =
-              thirdPartyClaimsBuilder_ == null
-                  ? thirdPartyClaims_
-                  : thirdPartyClaimsBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        result.bitField0_ |= to_bitField0_;
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1568,7 +1530,7 @@ public Builder mergeFrom(
                 {
                   input.readMessage(
                       getThirdPartyClaimsFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               default:
@@ -1588,8 +1550,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private com.google.protobuf.Struct thirdPartyClaims_;
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.protobuf.Struct,
@@ -1609,7 +1569,7 @@ public Builder mergeFrom(
        * @return Whether the thirdPartyClaims field is set.
        */
       public boolean hasThirdPartyClaims() {
-        return ((bitField0_ & 0x00000001) != 0);
+        return thirdPartyClaimsBuilder_ != null || thirdPartyClaims_ != null;
       }
 
       /**
@@ -1648,11 +1608,11 @@ public Builder setThirdPartyClaims(com.google.protobuf.Struct value) {
             throw new NullPointerException();
           }
           thirdPartyClaims_ = value;
+          onChanged();
         } else {
           thirdPartyClaimsBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+
         return this;
       }
 
@@ -1668,11 +1628,11 @@ public Builder setThirdPartyClaims(com.google.protobuf.Struct value) {
       public Builder setThirdPartyClaims(com.google.protobuf.Struct.Builder builderForValue) {
         if (thirdPartyClaimsBuilder_ == null) {
           thirdPartyClaims_ = builderForValue.build();
+          onChanged();
         } else {
           thirdPartyClaimsBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+
         return this;
       }
 
@@ -1687,20 +1647,19 @@ public Builder setThirdPartyClaims(com.google.protobuf.Struct.Builder builderFor
        */
       public Builder mergeThirdPartyClaims(com.google.protobuf.Struct value) {
         if (thirdPartyClaimsBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)
-              && thirdPartyClaims_ != null
-              && thirdPartyClaims_ != com.google.protobuf.Struct.getDefaultInstance()) {
-            getThirdPartyClaimsBuilder().mergeFrom(value);
+          if (thirdPartyClaims_ != null) {
+            thirdPartyClaims_ =
+                com.google.protobuf.Struct.newBuilder(thirdPartyClaims_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             thirdPartyClaims_ = value;
           }
+          onChanged();
         } else {
           thirdPartyClaimsBuilder_.mergeFrom(value);
         }
-        if (thirdPartyClaims_ != null) {
-          bitField0_ |= 0x00000001;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -1714,13 +1673,14 @@ public Builder mergeThirdPartyClaims(com.google.protobuf.Struct value) {
        * .google.protobuf.Struct third_party_claims = 1;
        */
       public Builder clearThirdPartyClaims() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        thirdPartyClaims_ = null;
-        if (thirdPartyClaimsBuilder_ != null) {
-          thirdPartyClaimsBuilder_.dispose();
+        if (thirdPartyClaimsBuilder_ == null) {
+          thirdPartyClaims_ = null;
+          onChanged();
+        } else {
+          thirdPartyClaims_ = null;
           thirdPartyClaimsBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1734,7 +1694,7 @@ public Builder clearThirdPartyClaims() {
        * .google.protobuf.Struct third_party_claims = 1;
        */
       public com.google.protobuf.Struct.Builder getThirdPartyClaimsBuilder() {
-        bitField0_ |= 0x00000001;
+
         onChanged();
         return getThirdPartyClaimsFieldBuilder().getBuilder();
       }
@@ -1853,8 +1813,6 @@ public com.google.protobuf.Parser getParserForType() {
   }
 
   private int authorityCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object authority_;
 
   public enum AuthorityCase
@@ -1903,9 +1861,7 @@ public AuthorityCase getAuthorityCase() {
   }
 
   public static final int PRINCIPAL_SUBJECT_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object principalSubject_ = "";
+  private volatile java.lang.Object principalSubject_;
 
   /**
    *
@@ -2334,8 +2290,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       principalSubject_ = "";
+
       if (firstPartyPrincipalBuilder_ != null) {
         firstPartyPrincipalBuilder_.clear();
       }
@@ -2371,30 +2327,24 @@ public com.google.cloud.audit.ServiceAccountDelegationInfo build() {
     public com.google.cloud.audit.ServiceAccountDelegationInfo buildPartial() {
       com.google.cloud.audit.ServiceAccountDelegationInfo result =
           new com.google.cloud.audit.ServiceAccountDelegationInfo(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.principalSubject_ = principalSubject_;
+      if (authorityCase_ == 1) {
+        if (firstPartyPrincipalBuilder_ == null) {
+          result.authority_ = authority_;
+        } else {
+          result.authority_ = firstPartyPrincipalBuilder_.build();
+        }
       }
-      buildPartialOneofs(result);
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.cloud.audit.ServiceAccountDelegationInfo result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.principalSubject_ = principalSubject_;
+      if (authorityCase_ == 2) {
+        if (thirdPartyPrincipalBuilder_ == null) {
+          result.authority_ = authority_;
+        } else {
+          result.authority_ = thirdPartyPrincipalBuilder_.build();
+        }
       }
-    }
-
-    private void buildPartialOneofs(com.google.cloud.audit.ServiceAccountDelegationInfo result) {
       result.authorityCase_ = authorityCase_;
-      result.authority_ = this.authority_;
-      if (authorityCase_ == 1 && firstPartyPrincipalBuilder_ != null) {
-        result.authority_ = firstPartyPrincipalBuilder_.build();
-      }
-      if (authorityCase_ == 2 && thirdPartyPrincipalBuilder_ != null) {
-        result.authority_ = thirdPartyPrincipalBuilder_.build();
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -2445,7 +2395,6 @@ public Builder mergeFrom(com.google.cloud.audit.ServiceAccountDelegationInfo oth
         return this;
       if (!other.getPrincipalSubject().isEmpty()) {
         principalSubject_ = other.principalSubject_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       switch (other.getAuthorityCase()) {
@@ -2507,7 +2456,7 @@ public Builder mergeFrom(
             case 26:
               {
                 principalSubject_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 26
             default:
@@ -2541,8 +2490,6 @@ public Builder clearAuthority() {
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object principalSubject_ = "";
 
     /**
@@ -2622,8 +2569,8 @@ public Builder setPrincipalSubject(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       principalSubject_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2645,8 +2592,8 @@ public Builder setPrincipalSubject(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPrincipalSubject() {
+
       principalSubject_ = getDefaultInstance().getPrincipalSubject();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -2673,8 +2620,8 @@ public Builder setPrincipalSubjectBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       principalSubject_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2929,6 +2876,7 @@ public Builder clearFirstPartyPrincipal() {
       }
       authorityCase_ = 1;
       onChanged();
+      ;
       return firstPartyPrincipalBuilder_;
     }
 
@@ -3182,6 +3130,7 @@ public Builder clearThirdPartyPrincipal() {
       }
       authorityCase_ = 2;
       onChanged();
+      ;
       return thirdPartyPrincipalBuilder_;
     }
 
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 f2e37b8a09..c5948354ff 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 public interface ServiceAccountDelegationInfoOrBuilder
@@ -148,5 +147,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 d0eeb0c0a7..f5b1de9bf7 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 /**
@@ -52,6 +51,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;
@@ -250,9 +254,7 @@ private PolicyType(int value) {
   }
 
   public static final int CONSTRAINT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object constraint_ = "";
+  private volatile java.lang.Object constraint_;
 
   /**
    *
@@ -303,9 +305,7 @@ public com.google.protobuf.ByteString getConstraintBytes() {
   }
 
   public static final int ERROR_MESSAGE_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object errorMessage_ = "";
+  private volatile java.lang.Object errorMessage_;
 
   /**
    *
@@ -356,9 +356,7 @@ public com.google.protobuf.ByteString getErrorMessageBytes() {
   }
 
   public static final int CHECKED_VALUE_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object checkedValue_ = "";
+  private volatile java.lang.Object checkedValue_;
 
   /**
    *
@@ -413,7 +411,7 @@ public com.google.protobuf.ByteString getCheckedValueBytes() {
   }
 
   public static final int POLICY_TYPE_FIELD_NUMBER = 4;
-  private int policyType_ = 0;
+  private int policyType_;
 
   /**
    *
@@ -448,8 +446,9 @@ public int getPolicyTypeValue() {
    */
   @java.lang.Override
   public com.google.cloud.audit.ViolationInfo.PolicyType getPolicyType() {
+    @SuppressWarnings("deprecation")
     com.google.cloud.audit.ViolationInfo.PolicyType result =
-        com.google.cloud.audit.ViolationInfo.PolicyType.forNumber(policyType_);
+        com.google.cloud.audit.ViolationInfo.PolicyType.valueOf(policyType_);
     return result == null ? com.google.cloud.audit.ViolationInfo.PolicyType.UNRECOGNIZED : result;
   }
 
@@ -678,11 +677,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       constraint_ = "";
+
       errorMessage_ = "";
+
       checkedValue_ = "";
+
       policyType_ = 0;
+
       return this;
     }
 
@@ -709,29 +711,14 @@ public com.google.cloud.audit.ViolationInfo build() {
     @java.lang.Override
     public com.google.cloud.audit.ViolationInfo buildPartial() {
       com.google.cloud.audit.ViolationInfo result = new com.google.cloud.audit.ViolationInfo(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.constraint_ = constraint_;
+      result.errorMessage_ = errorMessage_;
+      result.checkedValue_ = checkedValue_;
+      result.policyType_ = policyType_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.cloud.audit.ViolationInfo result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.constraint_ = constraint_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.errorMessage_ = errorMessage_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.checkedValue_ = checkedValue_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.policyType_ = policyType_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -779,17 +766,14 @@ public Builder mergeFrom(com.google.cloud.audit.ViolationInfo other) {
       if (other == com.google.cloud.audit.ViolationInfo.getDefaultInstance()) return this;
       if (!other.getConstraint().isEmpty()) {
         constraint_ = other.constraint_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getErrorMessage().isEmpty()) {
         errorMessage_ = other.errorMessage_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getCheckedValue().isEmpty()) {
         checkedValue_ = other.checkedValue_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.policyType_ != 0) {
@@ -824,25 +808,25 @@ public Builder mergeFrom(
             case 10:
               {
                 constraint_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 errorMessage_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 checkedValue_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 32:
               {
                 policyType_ = input.readEnum();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             default:
@@ -862,8 +846,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object constraint_ = "";
 
     /**
@@ -928,8 +910,8 @@ public Builder setConstraint(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       constraint_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -946,8 +928,8 @@ public Builder setConstraint(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearConstraint() {
+
       constraint_ = getDefaultInstance().getConstraint();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -969,8 +951,8 @@ public Builder setConstraintBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       constraint_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1039,8 +1021,8 @@ public Builder setErrorMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       errorMessage_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1057,8 +1039,8 @@ public Builder setErrorMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearErrorMessage() {
+
       errorMessage_ = getDefaultInstance().getErrorMessage();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1080,8 +1062,8 @@ public Builder setErrorMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       errorMessage_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1156,8 +1138,8 @@ public Builder setCheckedValue(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       checkedValue_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1176,8 +1158,8 @@ public Builder setCheckedValue(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearCheckedValue() {
+
       checkedValue_ = getDefaultInstance().getCheckedValue();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1201,8 +1183,8 @@ public Builder setCheckedValueBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       checkedValue_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1242,8 +1224,8 @@ public int getPolicyTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setPolicyTypeValue(int value) {
+
       policyType_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1263,8 +1245,9 @@ public Builder setPolicyTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.cloud.audit.ViolationInfo.PolicyType getPolicyType() {
+      @SuppressWarnings("deprecation")
       com.google.cloud.audit.ViolationInfo.PolicyType result =
-          com.google.cloud.audit.ViolationInfo.PolicyType.forNumber(policyType_);
+          com.google.cloud.audit.ViolationInfo.PolicyType.valueOf(policyType_);
       return result == null ? com.google.cloud.audit.ViolationInfo.PolicyType.UNRECOGNIZED : result;
     }
 
@@ -1286,7 +1269,7 @@ public Builder setPolicyType(com.google.cloud.audit.ViolationInfo.PolicyType val
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000008;
+
       policyType_ = value.getNumber();
       onChanged();
       return this;
@@ -1306,7 +1289,7 @@ public Builder setPolicyType(com.google.cloud.audit.ViolationInfo.PolicyType val
      * @return This builder for chaining.
      */
     public Builder clearPolicyType() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       policyType_ = 0;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ViolationInfoOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ViolationInfoOrBuilder.java
index 82044c2cb1..17790a74fb 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ViolationInfoOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/audit/ViolationInfoOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/audit/audit_log.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.audit;
 
 public interface ViolationInfoOrBuilder
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 0971d51a12..41bf5f8ea6 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/location/locations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.location;
 
 /**
@@ -49,6 +48,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;
@@ -65,9 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -315,8 +317,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -344,20 +346,11 @@ public com.google.cloud.location.GetLocationRequest build() {
     public com.google.cloud.location.GetLocationRequest buildPartial() {
       com.google.cloud.location.GetLocationRequest result =
           new com.google.cloud.location.GetLocationRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.cloud.location.GetLocationRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -405,7 +398,6 @@ public Builder mergeFrom(com.google.cloud.location.GetLocationRequest other) {
       if (other == com.google.cloud.location.GetLocationRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -437,7 +429,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -457,8 +449,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -523,8 +513,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -541,8 +531,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -564,8 +554,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/GetLocationRequestOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/GetLocationRequestOrBuilder.java
index 2367f9adb8..7a3be190e6 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/GetLocationRequestOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/GetLocationRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/location/locations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.location;
 
 public interface GetLocationRequestOrBuilder
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 d45e36e5e8..01d0eaaa72 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/location/locations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.location;
 
 /**
@@ -51,6 +50,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;
@@ -67,9 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -120,9 +122,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object filter_ = "";
+  private volatile java.lang.Object filter_;
 
   /**
    *
@@ -173,7 +173,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 3;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -192,9 +192,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -469,11 +467,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       filter_ = "";
+
       pageSize_ = 0;
+
       pageToken_ = "";
+
       return this;
     }
 
@@ -501,29 +502,14 @@ public com.google.cloud.location.ListLocationsRequest build() {
     public com.google.cloud.location.ListLocationsRequest buildPartial() {
       com.google.cloud.location.ListLocationsRequest result =
           new com.google.cloud.location.ListLocationsRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
+      result.filter_ = filter_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.cloud.location.ListLocationsRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.filter_ = filter_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -571,12 +557,10 @@ public Builder mergeFrom(com.google.cloud.location.ListLocationsRequest other) {
       if (other == com.google.cloud.location.ListLocationsRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getFilter().isEmpty()) {
         filter_ = other.filter_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -584,7 +568,6 @@ public Builder mergeFrom(com.google.cloud.location.ListLocationsRequest other) {
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -616,25 +599,25 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 filter_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 24:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 34:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             default:
@@ -654,8 +637,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -720,8 +701,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -738,8 +719,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -761,8 +742,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -831,8 +812,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       filter_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -849,8 +830,8 @@ public Builder setFilter(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFilter() {
+
       filter_ = getDefaultInstance().getFilter();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -872,8 +853,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       filter_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -911,7 +892,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -928,7 +908,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -998,8 +978,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1016,8 +996,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1039,8 +1019,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsRequestOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsRequestOrBuilder.java
index e909b71d14..983e92d06f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsRequestOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/location/locations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.location;
 
 public interface ListLocationsRequestOrBuilder
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 da35413f07..4bbe5283db 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/location/locations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.location;
 
 /**
@@ -50,6 +49,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;
@@ -66,8 +70,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int LOCATIONS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List locations_;
 
   /**
@@ -142,9 +144,7 @@ public com.google.cloud.location.LocationOrBuilder getLocationsOrBuilder(int ind
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -403,7 +403,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (locationsBuilder_ == null) {
         locations_ = java.util.Collections.emptyList();
       } else {
@@ -412,6 +411,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -439,16 +439,7 @@ public com.google.cloud.location.ListLocationsResponse build() {
     public com.google.cloud.location.ListLocationsResponse buildPartial() {
       com.google.cloud.location.ListLocationsResponse result =
           new com.google.cloud.location.ListLocationsResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(
-        com.google.cloud.location.ListLocationsResponse result) {
+      int from_bitField0_ = bitField0_;
       if (locationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           locations_ = java.util.Collections.unmodifiableList(locations_);
@@ -458,13 +449,9 @@ private void buildPartialRepeatedFields(
       } else {
         result.locations_ = locationsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.cloud.location.ListLocationsResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -542,7 +529,6 @@ public Builder mergeFrom(com.google.cloud.location.ListLocationsResponse other)
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -587,7 +573,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1038,8 +1024,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1056,8 +1042,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1079,8 +1065,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsResponseOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsResponseOrBuilder.java
index 849140884c..7d36fe40c6 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsResponseOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/location/locations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.location;
 
 public interface ListLocationsResponseOrBuilder
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 3529cac25a..8968e59ea6 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/location/locations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.location;
 
 /**
@@ -51,6 +50,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;
@@ -58,8 +62,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 2:
         return internalGetLabels();
@@ -78,11 +81,8 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
             com.google.cloud.location.Location.Builder.class);
   }
 
-  private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -135,9 +135,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int LOCATION_ID_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object locationId_ = "";
+  private volatile java.lang.Object locationId_;
 
   /**
    *
@@ -188,9 +186,7 @@ public com.google.protobuf.ByteString getLocationIdBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 5;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object displayName_ = "";
+  private volatile java.lang.Object displayName_;
 
   /**
    *
@@ -255,7 +251,6 @@ private static final class LabelsDefaultEntryHolder {
             "");
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField labels_;
 
   private com.google.protobuf.MapField internalGetLabels() {
@@ -274,7 +269,6 @@ public int getLabelsCount() {
    *
    * 
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * 

    *
@@ -300,7 +294,6 @@ public java.util.Map getLabels() {
    *
    * 
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * 

    *
@@ -316,17 +309,13 @@ public java.util.Map getLabelsMap() {
    *
    * 
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * 

    *
    * map<string, string> labels = 2;
    */
   @java.lang.Override
-  public /* nullable */ java.lang.String getLabelsOrDefault(
-      java.lang.String key,
-      /* nullable */
-      java.lang.String defaultValue) {
+  public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -339,7 +328,6 @@ public java.util.Map getLabelsMap() {
    *
    * 
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * 

    *
@@ -374,7 +362,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
    */
   @java.lang.Override
   public boolean hasMetadata() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return metadata_ != null;
   }
 
   /**
@@ -406,7 +394,7 @@ public com.google.protobuf.Any getMetadata() {
    */
   @java.lang.Override
   public com.google.protobuf.AnyOrBuilder getMetadataOrBuilder() {
-    return metadata_ == null ? com.google.protobuf.Any.getDefaultInstance() : metadata_;
+    return getMetadata();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -428,7 +416,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
         output, internalGetLabels(), LabelsDefaultEntryHolder.defaultEntry, 2);
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (metadata_ != null) {
       output.writeMessage(3, getMetadata());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(locationId_)) {
@@ -459,7 +447,7 @@ public int getSerializedSize() {
               .build();
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, labels__);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (metadata_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getMetadata());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(locationId_)) {
@@ -635,8 +623,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 2:
           return internalGetLabels();
@@ -646,8 +633,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 2:
           return internalGetMutableLabels();
@@ -667,32 +653,26 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     }
 
     // Construct using com.google.cloud.location.Location.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getMetadataFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       locationId_ = "";
+
       displayName_ = "";
+
       internalGetMutableLabels().clear();
-      metadata_ = null;
-      if (metadataBuilder_ != null) {
-        metadataBuilder_.dispose();
+      if (metadataBuilder_ == null) {
+        metadata_ = null;
+      } else {
+        metadata_ = null;
         metadataBuilder_ = null;
       }
       return this;
@@ -721,36 +701,21 @@ public com.google.cloud.location.Location build() {
     @java.lang.Override
     public com.google.cloud.location.Location buildPartial() {
       com.google.cloud.location.Location result = new com.google.cloud.location.Location(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      result.name_ = name_;
+      result.locationId_ = locationId_;
+      result.displayName_ = displayName_;
+      result.labels_ = internalGetLabels();
+      result.labels_.makeImmutable();
+      if (metadataBuilder_ == null) {
+        result.metadata_ = metadata_;
+      } else {
+        result.metadata_ = metadataBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.cloud.location.Location result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.locationId_ = locationId_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.displayName_ = displayName_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.labels_ = internalGetLabels();
-        result.labels_.makeImmutable();
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.metadata_ = metadataBuilder_ == null ? metadata_ : metadataBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -798,21 +763,17 @@ public Builder mergeFrom(com.google.cloud.location.Location other) {
       if (other == com.google.cloud.location.Location.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLocationId().isEmpty()) {
         locationId_ = other.locationId_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       internalGetMutableLabels().mergeFrom(other.internalGetLabels());
-      bitField0_ |= 0x00000008;
       if (other.hasMetadata()) {
         mergeMetadata(other.getMetadata());
       }
@@ -845,7 +806,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -857,25 +818,24 @@ public Builder mergeFrom(
                 internalGetMutableLabels()
                     .getMutableMap()
                     .put(labels__.getKey(), labels__.getValue());
-                bitField0_ |= 0x00000008;
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getMetadataFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 26
             case 34:
               {
                 locationId_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 34
             case 42:
               {
                 displayName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 42
             default:
@@ -964,8 +924,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -983,8 +943,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1007,8 +967,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1077,8 +1037,8 @@ public Builder setLocationId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       locationId_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1095,8 +1055,8 @@ public Builder setLocationId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLocationId() {
+
       locationId_ = getDefaultInstance().getLocationId();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1118,8 +1078,8 @@ public Builder setLocationIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       locationId_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1191,8 +1151,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       displayName_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1210,8 +1170,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
+
       displayName_ = getDefaultInstance().getDisplayName();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1234,8 +1194,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       displayName_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1251,14 +1211,14 @@ private com.google.protobuf.MapField interna
 
     private com.google.protobuf.MapField
         internalGetMutableLabels() {
+      onChanged();
+      ;
       if (labels_ == null) {
         labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
       }
       if (!labels_.isMutable()) {
         labels_ = labels_.copy();
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
       return labels_;
     }
 
@@ -1271,7 +1231,6 @@ public int getLabelsCount() {
      *
      * 
      * Cross-service attributes for the location. For example
-     *
      *     {"cloud.googleapis.com/region": "us-east1"}
      * 

      *
@@ -1297,7 +1256,6 @@ public java.util.Map getLabels() {
      *
      * 
      * Cross-service attributes for the location. For example
-     *
      *     {"cloud.googleapis.com/region": "us-east1"}
      * 

      *
@@ -1313,17 +1271,14 @@ public java.util.Map getLabelsMap() {
      *
      * 
      * Cross-service attributes for the location. For example
-     *
      *     {"cloud.googleapis.com/region": "us-east1"}
      * 

      *
      * map<string, string> labels = 2;
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getLabelsOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getLabelsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1336,7 +1291,6 @@ public java.util.Map getLabelsMap() {
      *
      * 
      * Cross-service attributes for the location. For example
-     *
      *     {"cloud.googleapis.com/region": "us-east1"}
      * 

      *
@@ -1355,7 +1309,6 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
     }
 
     public Builder clearLabels() {
-      bitField0_ = (bitField0_ & ~0x00000008);
       internalGetMutableLabels().getMutableMap().clear();
       return this;
     }
@@ -1365,7 +1318,6 @@ public Builder clearLabels() {
      *
      * 
      * Cross-service attributes for the location. For example
-     *
      *     {"cloud.googleapis.com/region": "us-east1"}
      * 

      *
@@ -1382,7 +1334,6 @@ public Builder removeLabels(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableLabels() {
-      bitField0_ |= 0x00000008;
       return internalGetMutableLabels().getMutableMap();
     }
 
@@ -1391,7 +1342,6 @@ public java.util.Map getMutableLabels() {
      *
      * 
      * Cross-service attributes for the location. For example
-     *
      *     {"cloud.googleapis.com/region": "us-east1"}
      * 

      *
@@ -1404,8 +1354,8 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
+
       internalGetMutableLabels().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000008;
       return this;
     }
 
@@ -1414,7 +1364,6 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
      *
      * 
      * Cross-service attributes for the location. For example
-     *
      *     {"cloud.googleapis.com/region": "us-east1"}
      * 

      *
@@ -1422,7 +1371,6 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllLabels(java.util.Map values) {
       internalGetMutableLabels().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000008;
       return this;
     }
 
@@ -1446,7 +1394,7 @@ public Builder putAllLabels(java.util.Map va
      * @return Whether the metadata field is set.
      */
     public boolean hasMetadata() {
-      return ((bitField0_ & 0x00000010) != 0);
+      return metadataBuilder_ != null || metadata_ != null;
     }
 
     /**
@@ -1485,11 +1433,11 @@ public Builder setMetadata(com.google.protobuf.Any value) {
           throw new NullPointerException();
         }
         metadata_ = value;
+        onChanged();
       } else {
         metadataBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -1506,11 +1454,11 @@ public Builder setMetadata(com.google.protobuf.Any value) {
     public Builder setMetadata(com.google.protobuf.Any.Builder builderForValue) {
       if (metadataBuilder_ == null) {
         metadata_ = builderForValue.build();
+        onChanged();
       } else {
         metadataBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -1526,20 +1474,16 @@ public Builder setMetadata(com.google.protobuf.Any.Builder builderForValue) {
      */
     public Builder mergeMetadata(com.google.protobuf.Any value) {
       if (metadataBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)
-            && metadata_ != null
-            && metadata_ != com.google.protobuf.Any.getDefaultInstance()) {
-          getMetadataBuilder().mergeFrom(value);
+        if (metadata_ != null) {
+          metadata_ = com.google.protobuf.Any.newBuilder(metadata_).mergeFrom(value).buildPartial();
         } else {
           metadata_ = value;
         }
+        onChanged();
       } else {
         metadataBuilder_.mergeFrom(value);
       }
-      if (metadata_ != null) {
-        bitField0_ |= 0x00000010;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1554,13 +1498,14 @@ public Builder mergeMetadata(com.google.protobuf.Any value) {
      * .google.protobuf.Any metadata = 3;
      */
     public Builder clearMetadata() {
-      bitField0_ = (bitField0_ & ~0x00000010);
-      metadata_ = null;
-      if (metadataBuilder_ != null) {
-        metadataBuilder_.dispose();
+      if (metadataBuilder_ == null) {
+        metadata_ = null;
+        onChanged();
+      } else {
+        metadata_ = null;
         metadataBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1575,7 +1520,7 @@ public Builder clearMetadata() {
      * .google.protobuf.Any metadata = 3;
      */
     public com.google.protobuf.Any.Builder getMetadataBuilder() {
-      bitField0_ |= 0x00000010;
+
       onChanged();
       return getMetadataFieldBuilder().getBuilder();
     }
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 46b16a61cd..25c01e3700 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/location/locations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.location;
 
 public interface LocationOrBuilder
@@ -111,7 +110,6 @@ public interface LocationOrBuilder
    *
    * 
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * 

    *
@@ -124,7 +122,6 @@ public interface LocationOrBuilder
    *
    * 
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * 

    *
@@ -141,7 +138,6 @@ public interface LocationOrBuilder
    *
    * 
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * 

    *
@@ -154,12 +150,12 @@ public interface LocationOrBuilder
    *
    * 
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * 

    *
    * map<string, string> labels = 2;
    */
+
   /* nullable */
   java.lang.String getLabelsOrDefault(
       java.lang.String key,
@@ -171,7 +167,6 @@ java.lang.String getLabelsOrDefault(
    *
    * 
    * Cross-service attributes for the location. For example
-   *
    *     {"cloud.googleapis.com/region": "us-east1"}
    * 

    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/LocationsProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/LocationsProto.java
index b4c1c5ba45..0182ac32ce 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/LocationsProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/cloud/location/LocationsProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/cloud/location/locations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.cloud.location;
 
 public final class LocationsProto {
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 92418e352c..81f0e2b75a 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/geo/type/viewport.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.geo.type;
 
 /**
@@ -28,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` > `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` > `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,
@@ -81,6 +72,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;
   }
@@ -94,7 +90,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.geo.type.Viewport.class, com.google.geo.type.Viewport.Builder.class);
   }
 
-  private int bitField0_;
   public static final int LOW_FIELD_NUMBER = 1;
   private com.google.type.LatLng low_;
 
@@ -111,7 +106,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasLow() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return low_ != null;
   }
 
   /**
@@ -141,7 +136,7 @@ public com.google.type.LatLng getLow() {
    */
   @java.lang.Override
   public com.google.type.LatLngOrBuilder getLowOrBuilder() {
-    return low_ == null ? com.google.type.LatLng.getDefaultInstance() : low_;
+    return getLow();
   }
 
   public static final int HIGH_FIELD_NUMBER = 2;
@@ -160,7 +155,7 @@ public com.google.type.LatLngOrBuilder getLowOrBuilder() {
    */
   @java.lang.Override
   public boolean hasHigh() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return high_ != null;
   }
 
   /**
@@ -190,7 +185,7 @@ public com.google.type.LatLng getHigh() {
    */
   @java.lang.Override
   public com.google.type.LatLngOrBuilder getHighOrBuilder() {
-    return high_ == null ? com.google.type.LatLng.getDefaultInstance() : high_;
+    return getHigh();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -207,10 +202,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (low_ != null) {
       output.writeMessage(1, getLow());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (high_ != null) {
       output.writeMessage(2, getHigh());
     }
     getUnknownFields().writeTo(output);
@@ -222,10 +217,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (low_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getLow());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (high_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getHigh());
     }
     size += getUnknownFields().getSerializedSize();
@@ -379,26 +374,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` > `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` > `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,
@@ -431,34 +418,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.geo.type.Viewport.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getLowFieldBuilder();
-        getHighFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      low_ = null;
-      if (lowBuilder_ != null) {
-        lowBuilder_.dispose();
+      if (lowBuilder_ == null) {
+        low_ = null;
+      } else {
+        low_ = null;
         lowBuilder_ = null;
       }
-      high_ = null;
-      if (highBuilder_ != null) {
-        highBuilder_.dispose();
+      if (highBuilder_ == null) {
+        high_ = null;
+      } else {
+        high_ = null;
         highBuilder_ = null;
       }
       return this;
@@ -486,27 +464,20 @@ public com.google.geo.type.Viewport build() {
     @java.lang.Override
     public com.google.geo.type.Viewport buildPartial() {
       com.google.geo.type.Viewport result = new com.google.geo.type.Viewport(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (lowBuilder_ == null) {
+        result.low_ = low_;
+      } else {
+        result.low_ = lowBuilder_.build();
+      }
+      if (highBuilder_ == null) {
+        result.high_ = high_;
+      } else {
+        result.high_ = highBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.geo.type.Viewport result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.low_ = lowBuilder_ == null ? low_ : lowBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.high_ = highBuilder_ == null ? high_ : highBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -587,13 +558,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getLowFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getHighFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -613,8 +584,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.type.LatLng low_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder>
@@ -632,7 +601,7 @@ public Builder mergeFrom(
      * @return Whether the low field is set.
      */
     public boolean hasLow() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return lowBuilder_ != null || low_ != null;
     }
 
     /**
@@ -669,11 +638,11 @@ public Builder setLow(com.google.type.LatLng value) {
           throw new NullPointerException();
         }
         low_ = value;
+        onChanged();
       } else {
         lowBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -689,11 +658,11 @@ public Builder setLow(com.google.type.LatLng value) {
     public Builder setLow(com.google.type.LatLng.Builder builderForValue) {
       if (lowBuilder_ == null) {
         low_ = builderForValue.build();
+        onChanged();
       } else {
         lowBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -708,20 +677,16 @@ public Builder setLow(com.google.type.LatLng.Builder builderForValue) {
      */
     public Builder mergeLow(com.google.type.LatLng value) {
       if (lowBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && low_ != null
-            && low_ != com.google.type.LatLng.getDefaultInstance()) {
-          getLowBuilder().mergeFrom(value);
+        if (low_ != null) {
+          low_ = com.google.type.LatLng.newBuilder(low_).mergeFrom(value).buildPartial();
         } else {
           low_ = value;
         }
+        onChanged();
       } else {
         lowBuilder_.mergeFrom(value);
       }
-      if (low_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -735,13 +700,14 @@ public Builder mergeLow(com.google.type.LatLng value) {
      * .google.type.LatLng low = 1;
      */
     public Builder clearLow() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      low_ = null;
-      if (lowBuilder_ != null) {
-        lowBuilder_.dispose();
+      if (lowBuilder_ == null) {
+        low_ = null;
+        onChanged();
+      } else {
+        low_ = null;
         lowBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -755,7 +721,7 @@ public Builder clearLow() {
      * .google.type.LatLng low = 1;
      */
     public com.google.type.LatLng.Builder getLowBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getLowFieldBuilder().getBuilder();
     }
@@ -817,7 +783,7 @@ public com.google.type.LatLngOrBuilder getLowOrBuilder() {
      * @return Whether the high field is set.
      */
     public boolean hasHigh() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return highBuilder_ != null || high_ != null;
     }
 
     /**
@@ -854,11 +820,11 @@ public Builder setHigh(com.google.type.LatLng value) {
           throw new NullPointerException();
         }
         high_ = value;
+        onChanged();
       } else {
         highBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -874,11 +840,11 @@ public Builder setHigh(com.google.type.LatLng value) {
     public Builder setHigh(com.google.type.LatLng.Builder builderForValue) {
       if (highBuilder_ == null) {
         high_ = builderForValue.build();
+        onChanged();
       } else {
         highBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -893,20 +859,16 @@ public Builder setHigh(com.google.type.LatLng.Builder builderForValue) {
      */
     public Builder mergeHigh(com.google.type.LatLng value) {
       if (highBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && high_ != null
-            && high_ != com.google.type.LatLng.getDefaultInstance()) {
-          getHighBuilder().mergeFrom(value);
+        if (high_ != null) {
+          high_ = com.google.type.LatLng.newBuilder(high_).mergeFrom(value).buildPartial();
         } else {
           high_ = value;
         }
+        onChanged();
       } else {
         highBuilder_.mergeFrom(value);
       }
-      if (high_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -920,13 +882,14 @@ public Builder mergeHigh(com.google.type.LatLng value) {
      * .google.type.LatLng high = 2;
      */
     public Builder clearHigh() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      high_ = null;
-      if (highBuilder_ != null) {
-        highBuilder_.dispose();
+      if (highBuilder_ == null) {
+        high_ = null;
+        onChanged();
+      } else {
+        high_ = null;
         highBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -940,7 +903,7 @@ public Builder clearHigh() {
      * .google.type.LatLng high = 2;
      */
     public com.google.type.LatLng.Builder getHighBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getHighFieldBuilder().getBuilder();
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/geo/type/ViewportOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/geo/type/ViewportOrBuilder.java
index 845df12ceb..214a9d65e1 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/geo/type/ViewportOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/geo/type/ViewportOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/geo/type/viewport.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.geo.type;
 
 public interface ViewportOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/geo/type/ViewportProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/geo/type/ViewportProto.java
index dfb3c82e07..8686c09aa9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/geo/type/ViewportProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/geo/type/ViewportProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/geo/type/viewport.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.geo.type;
 
 public final class ViewportProto {
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 14d4c02c2c..743d0eb2a1 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/logging/type/http_request.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.logging.type;
 
 /**
@@ -57,6 +56,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;
@@ -72,11 +76,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.logging.type.HttpRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int REQUEST_METHOD_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object requestMethod_ = "";
+  private volatile java.lang.Object requestMethod_;
 
   /**
    *
@@ -127,9 +128,7 @@ public com.google.protobuf.ByteString getRequestMethodBytes() {
   }
 
   public static final int REQUEST_URL_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object requestUrl_ = "";
+  private volatile java.lang.Object requestUrl_;
 
   /**
    *
@@ -184,7 +183,7 @@ public com.google.protobuf.ByteString getRequestUrlBytes() {
   }
 
   public static final int REQUEST_SIZE_FIELD_NUMBER = 3;
-  private long requestSize_ = 0L;
+  private long requestSize_;
 
   /**
    *
@@ -204,7 +203,7 @@ public long getRequestSize() {
   }
 
   public static final int STATUS_FIELD_NUMBER = 4;
-  private int status_ = 0;
+  private int status_;
 
   /**
    *
@@ -224,7 +223,7 @@ public int getStatus() {
   }
 
   public static final int RESPONSE_SIZE_FIELD_NUMBER = 5;
-  private long responseSize_ = 0L;
+  private long responseSize_;
 
   /**
    *
@@ -244,9 +243,7 @@ public long getResponseSize() {
   }
 
   public static final int USER_AGENT_FIELD_NUMBER = 6;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object userAgent_ = "";
+  private volatile java.lang.Object userAgent_;
 
   /**
    *
@@ -301,9 +298,7 @@ public com.google.protobuf.ByteString getUserAgentBytes() {
   }
 
   public static final int REMOTE_IP_FIELD_NUMBER = 7;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object remoteIp_ = "";
+  private volatile java.lang.Object remoteIp_;
 
   /**
    *
@@ -358,9 +353,7 @@ public com.google.protobuf.ByteString getRemoteIpBytes() {
   }
 
   public static final int SERVER_IP_FIELD_NUMBER = 13;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object serverIp_ = "";
+  private volatile java.lang.Object serverIp_;
 
   /**
    *
@@ -415,9 +408,7 @@ public com.google.protobuf.ByteString getServerIpBytes() {
   }
 
   public static final int REFERER_FIELD_NUMBER = 8;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object referer_ = "";
+  private volatile java.lang.Object referer_;
 
   /**
    *
@@ -488,7 +479,7 @@ public com.google.protobuf.ByteString getRefererBytes() {
    */
   @java.lang.Override
   public boolean hasLatency() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return latency_ != null;
   }
 
   /**
@@ -520,11 +511,11 @@ public com.google.protobuf.Duration getLatency() {
    */
   @java.lang.Override
   public com.google.protobuf.DurationOrBuilder getLatencyOrBuilder() {
-    return latency_ == null ? com.google.protobuf.Duration.getDefaultInstance() : latency_;
+    return getLatency();
   }
 
   public static final int CACHE_LOOKUP_FIELD_NUMBER = 11;
-  private boolean cacheLookup_ = false;
+  private boolean cacheLookup_;
 
   /**
    *
@@ -543,7 +534,7 @@ public boolean getCacheLookup() {
   }
 
   public static final int CACHE_HIT_FIELD_NUMBER = 9;
-  private boolean cacheHit_ = false;
+  private boolean cacheHit_;
 
   /**
    *
@@ -563,7 +554,7 @@ public boolean getCacheHit() {
   }
 
   public static final int CACHE_VALIDATED_WITH_ORIGIN_SERVER_FIELD_NUMBER = 10;
-  private boolean cacheValidatedWithOriginServer_ = false;
+  private boolean cacheValidatedWithOriginServer_;
 
   /**
    *
@@ -584,7 +575,7 @@ public boolean getCacheValidatedWithOriginServer() {
   }
 
   public static final int CACHE_FILL_BYTES_FIELD_NUMBER = 12;
-  private long cacheFillBytes_ = 0L;
+  private long cacheFillBytes_;
 
   /**
    *
@@ -604,9 +595,7 @@ public long getCacheFillBytes() {
   }
 
   public static final int PROTOCOL_FIELD_NUMBER = 15;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object protocol_ = "";
+  private volatile java.lang.Object protocol_;
 
   /**
    *
@@ -709,7 +698,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serverIp_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 13, serverIp_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (latency_ != null) {
       output.writeMessage(14, getLatency());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(protocol_)) {
@@ -765,7 +754,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serverIp_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, serverIp_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (latency_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(14, getLatency());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(protocol_)) {
@@ -980,44 +969,49 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.logging.type.HttpRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getLatencyFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       requestMethod_ = "";
+
       requestUrl_ = "";
+
       requestSize_ = 0L;
+
       status_ = 0;
+
       responseSize_ = 0L;
+
       userAgent_ = "";
+
       remoteIp_ = "";
+
       serverIp_ = "";
+
       referer_ = "";
-      latency_ = null;
-      if (latencyBuilder_ != null) {
-        latencyBuilder_.dispose();
+
+      if (latencyBuilder_ == null) {
+        latency_ = null;
+      } else {
+        latency_ = null;
         latencyBuilder_ = null;
       }
       cacheLookup_ = false;
+
       cacheHit_ = false;
+
       cacheValidatedWithOriginServer_ = false;
+
       cacheFillBytes_ = 0L;
+
       protocol_ = "";
+
       return this;
     }
 
@@ -1044,65 +1038,29 @@ public com.google.logging.type.HttpRequest build() {
     @java.lang.Override
     public com.google.logging.type.HttpRequest buildPartial() {
       com.google.logging.type.HttpRequest result = new com.google.logging.type.HttpRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.requestMethod_ = requestMethod_;
+      result.requestUrl_ = requestUrl_;
+      result.requestSize_ = requestSize_;
+      result.status_ = status_;
+      result.responseSize_ = responseSize_;
+      result.userAgent_ = userAgent_;
+      result.remoteIp_ = remoteIp_;
+      result.serverIp_ = serverIp_;
+      result.referer_ = referer_;
+      if (latencyBuilder_ == null) {
+        result.latency_ = latency_;
+      } else {
+        result.latency_ = latencyBuilder_.build();
       }
+      result.cacheLookup_ = cacheLookup_;
+      result.cacheHit_ = cacheHit_;
+      result.cacheValidatedWithOriginServer_ = cacheValidatedWithOriginServer_;
+      result.cacheFillBytes_ = cacheFillBytes_;
+      result.protocol_ = protocol_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.logging.type.HttpRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.requestMethod_ = requestMethod_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.requestUrl_ = requestUrl_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.requestSize_ = requestSize_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.status_ = status_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.responseSize_ = responseSize_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.userAgent_ = userAgent_;
-      }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.remoteIp_ = remoteIp_;
-      }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.serverIp_ = serverIp_;
-      }
-      if (((from_bitField0_ & 0x00000100) != 0)) {
-        result.referer_ = referer_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000200) != 0)) {
-        result.latency_ = latencyBuilder_ == null ? latency_ : latencyBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000400) != 0)) {
-        result.cacheLookup_ = cacheLookup_;
-      }
-      if (((from_bitField0_ & 0x00000800) != 0)) {
-        result.cacheHit_ = cacheHit_;
-      }
-      if (((from_bitField0_ & 0x00001000) != 0)) {
-        result.cacheValidatedWithOriginServer_ = cacheValidatedWithOriginServer_;
-      }
-      if (((from_bitField0_ & 0x00002000) != 0)) {
-        result.cacheFillBytes_ = cacheFillBytes_;
-      }
-      if (((from_bitField0_ & 0x00004000) != 0)) {
-        result.protocol_ = protocol_;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1150,12 +1108,10 @@ public Builder mergeFrom(com.google.logging.type.HttpRequest other) {
       if (other == com.google.logging.type.HttpRequest.getDefaultInstance()) return this;
       if (!other.getRequestMethod().isEmpty()) {
         requestMethod_ = other.requestMethod_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getRequestUrl().isEmpty()) {
         requestUrl_ = other.requestUrl_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getRequestSize() != 0L) {
@@ -1169,22 +1125,18 @@ public Builder mergeFrom(com.google.logging.type.HttpRequest other) {
       }
       if (!other.getUserAgent().isEmpty()) {
         userAgent_ = other.userAgent_;
-        bitField0_ |= 0x00000020;
         onChanged();
       }
       if (!other.getRemoteIp().isEmpty()) {
         remoteIp_ = other.remoteIp_;
-        bitField0_ |= 0x00000040;
         onChanged();
       }
       if (!other.getServerIp().isEmpty()) {
         serverIp_ = other.serverIp_;
-        bitField0_ |= 0x00000080;
         onChanged();
       }
       if (!other.getReferer().isEmpty()) {
         referer_ = other.referer_;
-        bitField0_ |= 0x00000100;
         onChanged();
       }
       if (other.hasLatency()) {
@@ -1204,7 +1156,6 @@ public Builder mergeFrom(com.google.logging.type.HttpRequest other) {
       }
       if (!other.getProtocol().isEmpty()) {
         protocol_ = other.protocol_;
-        bitField0_ |= 0x00004000;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -1236,91 +1187,91 @@ public Builder mergeFrom(
             case 10:
               {
                 requestMethod_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 requestUrl_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 24:
               {
                 requestSize_ = input.readInt64();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 32:
               {
                 status_ = input.readInt32();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             case 40:
               {
                 responseSize_ = input.readInt64();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 40
             case 50:
               {
                 userAgent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 50
             case 58:
               {
                 remoteIp_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 58
             case 66:
               {
                 referer_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000100;
+
                 break;
               } // case 66
             case 72:
               {
                 cacheHit_ = input.readBool();
-                bitField0_ |= 0x00000800;
+
                 break;
               } // case 72
             case 80:
               {
                 cacheValidatedWithOriginServer_ = input.readBool();
-                bitField0_ |= 0x00001000;
+
                 break;
               } // case 80
             case 88:
               {
                 cacheLookup_ = input.readBool();
-                bitField0_ |= 0x00000400;
+
                 break;
               } // case 88
             case 96:
               {
                 cacheFillBytes_ = input.readInt64();
-                bitField0_ |= 0x00002000;
+
                 break;
               } // case 96
             case 106:
               {
                 serverIp_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 106
             case 114:
               {
                 input.readMessage(getLatencyFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000200;
+
                 break;
               } // case 114
             case 122:
               {
                 protocol_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00004000;
+
                 break;
               } // case 122
             default:
@@ -1340,8 +1291,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object requestMethod_ = "";
 
     /**
@@ -1406,8 +1355,8 @@ public Builder setRequestMethod(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       requestMethod_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1424,8 +1373,8 @@ public Builder setRequestMethod(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearRequestMethod() {
+
       requestMethod_ = getDefaultInstance().getRequestMethod();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1447,8 +1396,8 @@ public Builder setRequestMethodBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       requestMethod_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1523,8 +1472,8 @@ public Builder setRequestUrl(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       requestUrl_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1543,8 +1492,8 @@ public Builder setRequestUrl(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearRequestUrl() {
+
       requestUrl_ = getDefaultInstance().getRequestUrl();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1568,8 +1517,8 @@ public Builder setRequestUrlBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       requestUrl_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1609,7 +1558,6 @@ public long getRequestSize() {
     public Builder setRequestSize(long value) {
 
       requestSize_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1627,7 +1575,7 @@ public Builder setRequestSize(long value) {
      * @return This builder for chaining.
      */
     public Builder clearRequestSize() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       requestSize_ = 0L;
       onChanged();
       return this;
@@ -1668,7 +1616,6 @@ public int getStatus() {
     public Builder setStatus(int value) {
 
       status_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1686,7 +1633,7 @@ public Builder setStatus(int value) {
      * @return This builder for chaining.
      */
     public Builder clearStatus() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       status_ = 0;
       onChanged();
       return this;
@@ -1727,7 +1674,6 @@ public long getResponseSize() {
     public Builder setResponseSize(long value) {
 
       responseSize_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1745,7 +1691,7 @@ public Builder setResponseSize(long value) {
      * @return This builder for chaining.
      */
     public Builder clearResponseSize() {
-      bitField0_ = (bitField0_ & ~0x00000010);
+
       responseSize_ = 0L;
       onChanged();
       return this;
@@ -1821,8 +1767,8 @@ public Builder setUserAgent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       userAgent_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1841,8 +1787,8 @@ public Builder setUserAgent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearUserAgent() {
+
       userAgent_ = getDefaultInstance().getUserAgent();
-      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -1866,8 +1812,8 @@ public Builder setUserAgentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       userAgent_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1942,8 +1888,8 @@ public Builder setRemoteIp(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       remoteIp_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1962,8 +1908,8 @@ public Builder setRemoteIp(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearRemoteIp() {
+
       remoteIp_ = getDefaultInstance().getRemoteIp();
-      bitField0_ = (bitField0_ & ~0x00000040);
       onChanged();
       return this;
     }
@@ -1987,8 +1933,8 @@ public Builder setRemoteIpBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       remoteIp_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2063,8 +2009,8 @@ public Builder setServerIp(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       serverIp_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2083,8 +2029,8 @@ public Builder setServerIp(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearServerIp() {
+
       serverIp_ = getDefaultInstance().getServerIp();
-      bitField0_ = (bitField0_ & ~0x00000080);
       onChanged();
       return this;
     }
@@ -2108,8 +2054,8 @@ public Builder setServerIpBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       serverIp_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2184,8 +2130,8 @@ public Builder setReferer(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       referer_ = value;
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -2204,8 +2150,8 @@ public Builder setReferer(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearReferer() {
+
       referer_ = getDefaultInstance().getReferer();
-      bitField0_ = (bitField0_ & ~0x00000100);
       onChanged();
       return this;
     }
@@ -2229,8 +2175,8 @@ public Builder setRefererBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       referer_ = value;
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -2255,7 +2201,7 @@ public Builder setRefererBytes(com.google.protobuf.ByteString value) {
      * @return Whether the latency field is set.
      */
     public boolean hasLatency() {
-      return ((bitField0_ & 0x00000200) != 0);
+      return latencyBuilder_ != null || latency_ != null;
     }
 
     /**
@@ -2294,11 +2240,11 @@ public Builder setLatency(com.google.protobuf.Duration value) {
           throw new NullPointerException();
         }
         latency_ = value;
+        onChanged();
       } else {
         latencyBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000200;
-      onChanged();
+
       return this;
     }
 
@@ -2315,11 +2261,11 @@ public Builder setLatency(com.google.protobuf.Duration value) {
     public Builder setLatency(com.google.protobuf.Duration.Builder builderForValue) {
       if (latencyBuilder_ == null) {
         latency_ = builderForValue.build();
+        onChanged();
       } else {
         latencyBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000200;
-      onChanged();
+
       return this;
     }
 
@@ -2335,20 +2281,17 @@ public Builder setLatency(com.google.protobuf.Duration.Builder builderForValue)
      */
     public Builder mergeLatency(com.google.protobuf.Duration value) {
       if (latencyBuilder_ == null) {
-        if (((bitField0_ & 0x00000200) != 0)
-            && latency_ != null
-            && latency_ != com.google.protobuf.Duration.getDefaultInstance()) {
-          getLatencyBuilder().mergeFrom(value);
+        if (latency_ != null) {
+          latency_ =
+              com.google.protobuf.Duration.newBuilder(latency_).mergeFrom(value).buildPartial();
         } else {
           latency_ = value;
         }
+        onChanged();
       } else {
         latencyBuilder_.mergeFrom(value);
       }
-      if (latency_ != null) {
-        bitField0_ |= 0x00000200;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2363,13 +2306,14 @@ public Builder mergeLatency(com.google.protobuf.Duration value) {
      * .google.protobuf.Duration latency = 14;
      */
     public Builder clearLatency() {
-      bitField0_ = (bitField0_ & ~0x00000200);
-      latency_ = null;
-      if (latencyBuilder_ != null) {
-        latencyBuilder_.dispose();
+      if (latencyBuilder_ == null) {
+        latency_ = null;
+        onChanged();
+      } else {
+        latency_ = null;
         latencyBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2384,7 +2328,7 @@ public Builder clearLatency() {
      * .google.protobuf.Duration latency = 14;
      */
     public com.google.protobuf.Duration.Builder getLatencyBuilder() {
-      bitField0_ |= 0x00000200;
+
       onChanged();
       return getLatencyFieldBuilder().getBuilder();
     }
@@ -2467,7 +2411,6 @@ public boolean getCacheLookup() {
     public Builder setCacheLookup(boolean value) {
 
       cacheLookup_ = value;
-      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -2484,7 +2427,7 @@ public Builder setCacheLookup(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearCacheLookup() {
-      bitField0_ = (bitField0_ & ~0x00000400);
+
       cacheLookup_ = false;
       onChanged();
       return this;
@@ -2525,7 +2468,6 @@ public boolean getCacheHit() {
     public Builder setCacheHit(boolean value) {
 
       cacheHit_ = value;
-      bitField0_ |= 0x00000800;
       onChanged();
       return this;
     }
@@ -2543,7 +2485,7 @@ public Builder setCacheHit(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearCacheHit() {
-      bitField0_ = (bitField0_ & ~0x00000800);
+
       cacheHit_ = false;
       onChanged();
       return this;
@@ -2586,7 +2528,6 @@ public boolean getCacheValidatedWithOriginServer() {
     public Builder setCacheValidatedWithOriginServer(boolean value) {
 
       cacheValidatedWithOriginServer_ = value;
-      bitField0_ |= 0x00001000;
       onChanged();
       return this;
     }
@@ -2605,7 +2546,7 @@ public Builder setCacheValidatedWithOriginServer(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearCacheValidatedWithOriginServer() {
-      bitField0_ = (bitField0_ & ~0x00001000);
+
       cacheValidatedWithOriginServer_ = false;
       onChanged();
       return this;
@@ -2646,7 +2587,6 @@ public long getCacheFillBytes() {
     public Builder setCacheFillBytes(long value) {
 
       cacheFillBytes_ = value;
-      bitField0_ |= 0x00002000;
       onChanged();
       return this;
     }
@@ -2664,7 +2604,7 @@ public Builder setCacheFillBytes(long value) {
      * @return This builder for chaining.
      */
     public Builder clearCacheFillBytes() {
-      bitField0_ = (bitField0_ & ~0x00002000);
+
       cacheFillBytes_ = 0L;
       onChanged();
       return this;
@@ -2734,8 +2674,8 @@ public Builder setProtocol(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       protocol_ = value;
-      bitField0_ |= 0x00004000;
       onChanged();
       return this;
     }
@@ -2752,8 +2692,8 @@ public Builder setProtocol(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearProtocol() {
+
       protocol_ = getDefaultInstance().getProtocol();
-      bitField0_ = (bitField0_ & ~0x00004000);
       onChanged();
       return this;
     }
@@ -2775,8 +2715,8 @@ public Builder setProtocolBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       protocol_ = value;
-      bitField0_ |= 0x00004000;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequestOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequestOrBuilder.java
index f481e80015..27f022c068 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequestOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/logging/type/http_request.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.logging.type;
 
 public interface HttpRequestOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequestProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequestProto.java
index 144d77b235..739d2372a2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequestProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequestProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/logging/type/http_request.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.logging.type;
 
 public final class HttpRequestProto {
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 e601ff54f7..a8df6a5eca 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/logging/type/log_severity.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.logging.type;
 
 /**
@@ -27,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 > DEBUG AND severity <= 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/logging/type/LogSeverityProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/LogSeverityProto.java
index 486db0f1d9..5a7f206272 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/LogSeverityProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/LogSeverityProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/logging/type/log_severity.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.logging.type;
 
 public final class LogSeverityProto {
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 da161876a8..fd9de6ab38 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/longrunning/operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.longrunning;
 
 /**
@@ -50,6 +49,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;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -317,8 +319,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -346,20 +348,11 @@ public com.google.longrunning.CancelOperationRequest build() {
     public com.google.longrunning.CancelOperationRequest buildPartial() {
       com.google.longrunning.CancelOperationRequest result =
           new com.google.longrunning.CancelOperationRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.longrunning.CancelOperationRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -407,7 +400,6 @@ public Builder mergeFrom(com.google.longrunning.CancelOperationRequest other) {
       if (other == com.google.longrunning.CancelOperationRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -439,7 +431,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -459,8 +451,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -525,8 +515,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -543,8 +533,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -566,8 +556,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequestOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequestOrBuilder.java
index d4f8e6e5db..f6ed277789 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequestOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/longrunning/operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.longrunning;
 
 public interface CancelOperationRequestOrBuilder
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 b6d73e56b5..2953a2fa09 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/longrunning/operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.longrunning;
 
 /**
@@ -50,6 +49,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;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -317,8 +319,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -346,20 +348,11 @@ public com.google.longrunning.DeleteOperationRequest build() {
     public com.google.longrunning.DeleteOperationRequest buildPartial() {
       com.google.longrunning.DeleteOperationRequest result =
           new com.google.longrunning.DeleteOperationRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.longrunning.DeleteOperationRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -407,7 +400,6 @@ public Builder mergeFrom(com.google.longrunning.DeleteOperationRequest other) {
       if (other == com.google.longrunning.DeleteOperationRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -439,7 +431,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -459,8 +451,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -525,8 +515,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -543,8 +533,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -566,8 +556,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequestOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequestOrBuilder.java
index 8f2ad96306..d224010f93 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequestOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/longrunning/operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.longrunning;
 
 public interface DeleteOperationRequestOrBuilder
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 bcd94037e4..41d98f1fe5 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/longrunning/operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.longrunning;
 
 /**
@@ -50,6 +49,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;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -317,8 +319,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -346,20 +348,11 @@ public com.google.longrunning.GetOperationRequest build() {
     public com.google.longrunning.GetOperationRequest buildPartial() {
       com.google.longrunning.GetOperationRequest result =
           new com.google.longrunning.GetOperationRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.longrunning.GetOperationRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -407,7 +400,6 @@ public Builder mergeFrom(com.google.longrunning.GetOperationRequest other) {
       if (other == com.google.longrunning.GetOperationRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -439,7 +431,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -459,8 +451,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -525,8 +515,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -543,8 +533,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -566,8 +556,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequestOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequestOrBuilder.java
index 8ce7efce67..6bcb30e298 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequestOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/longrunning/operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.longrunning;
 
 public interface GetOperationRequestOrBuilder
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 8dbb4a1ee6..c476659b06 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/longrunning/operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.longrunning;
 
 /**
@@ -52,6 +51,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;
@@ -68,9 +72,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -121,9 +123,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object filter_ = "";
+  private volatile java.lang.Object filter_;
 
   /**
    *
@@ -174,7 +174,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -193,9 +193,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -246,7 +244,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
   }
 
   public static final int RETURN_PARTIAL_SUCCESS_FIELD_NUMBER = 5;
-  private boolean returnPartialSuccess_ = false;
+  private boolean returnPartialSuccess_;
 
   /**
    *
@@ -255,10 +253,8 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
    * When set to `true`, operations that are reachable are returned as normal,
    * and those that are unreachable are returned in the
    * [ListOperationsResponse.unreachable] field.
-   *
    * This can only be `true` when reading across collections e.g. when `parent`
    * is set to `"projects/example/locations/-"`.
-   *
    * This field is not by default supported and will result in an
    * `UNIMPLEMENTED` error if set unless explicitly documented otherwise in
    * service or product specific documentation.
@@ -508,12 +504,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       filter_ = "";
+
       pageSize_ = 0;
+
       pageToken_ = "";
+
       returnPartialSuccess_ = false;
+
       return this;
     }
 
@@ -541,32 +541,15 @@ public com.google.longrunning.ListOperationsRequest build() {
     public com.google.longrunning.ListOperationsRequest buildPartial() {
       com.google.longrunning.ListOperationsRequest result =
           new com.google.longrunning.ListOperationsRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
+      result.filter_ = filter_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
+      result.returnPartialSuccess_ = returnPartialSuccess_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.longrunning.ListOperationsRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.filter_ = filter_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.returnPartialSuccess_ = returnPartialSuccess_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -614,12 +597,10 @@ public Builder mergeFrom(com.google.longrunning.ListOperationsRequest other) {
       if (other == com.google.longrunning.ListOperationsRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getFilter().isEmpty()) {
         filter_ = other.filter_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -627,7 +608,6 @@ public Builder mergeFrom(com.google.longrunning.ListOperationsRequest other) {
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (other.getReturnPartialSuccess() != false) {
@@ -662,31 +642,31 @@ public Builder mergeFrom(
             case 10:
               {
                 filter_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 26
             case 34:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 34
             case 40:
               {
                 returnPartialSuccess_ = input.readBool();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 40
             default:
@@ -706,8 +686,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -772,8 +750,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -790,8 +768,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -813,8 +791,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -883,8 +861,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       filter_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -901,8 +879,8 @@ public Builder setFilter(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFilter() {
+
       filter_ = getDefaultInstance().getFilter();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -924,8 +902,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       filter_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -963,7 +941,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -980,7 +957,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -1050,8 +1027,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1068,8 +1045,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1091,8 +1068,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1106,10 +1083,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
      * When set to `true`, operations that are reachable are returned as normal,
      * and those that are unreachable are returned in the
      * [ListOperationsResponse.unreachable] field.
-     *
      * This can only be `true` when reading across collections e.g. when `parent`
      * is set to `"projects/example/locations/-"`.
-     *
      * This field is not by default supported and will result in an
      * `UNIMPLEMENTED` error if set unless explicitly documented otherwise in
      * service or product specific documentation.
@@ -1131,10 +1106,8 @@ public boolean getReturnPartialSuccess() {
      * When set to `true`, operations that are reachable are returned as normal,
      * and those that are unreachable are returned in the
      * [ListOperationsResponse.unreachable] field.
-     *
      * This can only be `true` when reading across collections e.g. when `parent`
      * is set to `"projects/example/locations/-"`.
-     *
      * This field is not by default supported and will result in an
      * `UNIMPLEMENTED` error if set unless explicitly documented otherwise in
      * service or product specific documentation.
@@ -1148,7 +1121,6 @@ public boolean getReturnPartialSuccess() {
     public Builder setReturnPartialSuccess(boolean value) {
 
       returnPartialSuccess_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1160,10 +1132,8 @@ public Builder setReturnPartialSuccess(boolean value) {
      * When set to `true`, operations that are reachable are returned as normal,
      * and those that are unreachable are returned in the
      * [ListOperationsResponse.unreachable] field.
-     *
      * This can only be `true` when reading across collections e.g. when `parent`
      * is set to `"projects/example/locations/-"`.
-     *
      * This field is not by default supported and will result in an
      * `UNIMPLEMENTED` error if set unless explicitly documented otherwise in
      * service or product specific documentation.
@@ -1174,7 +1144,7 @@ public Builder setReturnPartialSuccess(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearReturnPartialSuccess() {
-      bitField0_ = (bitField0_ & ~0x00000010);
+
       returnPartialSuccess_ = false;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequestOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequestOrBuilder.java
index 2d6b5d3f2a..25b410a8d2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequestOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/longrunning/operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.longrunning;
 
 public interface ListOperationsRequestOrBuilder
@@ -122,10 +121,8 @@ public interface ListOperationsRequestOrBuilder
    * When set to `true`, operations that are reachable are returned as normal,
    * and those that are unreachable are returned in the
    * [ListOperationsResponse.unreachable] field.
-   *
    * This can only be `true` when reading across collections e.g. when `parent`
    * is set to `"projects/example/locations/-"`.
-   *
    * This field is not by default supported and will result in an
    * `UNIMPLEMENTED` error if set unless explicitly documented otherwise in
    * service or product specific documentation.
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 23a021ea53..f4f654dad2 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/longrunning/operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.longrunning;
 
 /**
@@ -43,7 +42,7 @@ private ListOperationsResponse(com.google.protobuf.GeneratedMessageV3.Builder
   private ListOperationsResponse() {
     operations_ = java.util.Collections.emptyList();
     nextPageToken_ = "";
-    unreachable_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    unreachable_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
   @java.lang.Override
@@ -52,6 +51,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;
@@ -68,8 +72,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int OPERATIONS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List operations_;
 
   /**
@@ -144,9 +146,7 @@ public com.google.longrunning.OperationOrBuilder getOperationsOrBuilder(int inde
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -197,10 +197,7 @@ public com.google.protobuf.ByteString getNextPageTokenBytes() {
   }
 
   public static final int UNREACHABLE_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList unreachable_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList unreachable_;
 
   /**
    *
@@ -502,7 +499,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (operationsBuilder_ == null) {
         operations_ = java.util.Collections.emptyList();
       } else {
@@ -511,7 +507,9 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
-      unreachable_ = com.google.protobuf.LazyStringArrayList.emptyList();
+
+      unreachable_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -539,15 +537,7 @@ public com.google.longrunning.ListOperationsResponse build() {
     public com.google.longrunning.ListOperationsResponse buildPartial() {
       com.google.longrunning.ListOperationsResponse result =
           new com.google.longrunning.ListOperationsResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.longrunning.ListOperationsResponse result) {
+      int from_bitField0_ = bitField0_;
       if (operationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           operations_ = java.util.Collections.unmodifiableList(operations_);
@@ -557,17 +547,14 @@ private void buildPartialRepeatedFields(com.google.longrunning.ListOperationsRes
       } else {
         result.operations_ = operationsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.longrunning.ListOperationsResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        unreachable_.makeImmutable();
-        result.unreachable_ = unreachable_;
+      result.nextPageToken_ = nextPageToken_;
+      if (((bitField0_ & 0x00000002) != 0)) {
+        unreachable_ = unreachable_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
       }
+      result.unreachable_ = unreachable_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -644,13 +631,12 @@ public Builder mergeFrom(com.google.longrunning.ListOperationsResponse other) {
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.unreachable_.isEmpty()) {
         if (unreachable_.isEmpty()) {
           unreachable_ = other.unreachable_;
-          bitField0_ |= 0x00000004;
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureUnreachableIsMutable();
           unreachable_.addAll(other.unreachable_);
@@ -698,7 +684,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
@@ -1156,8 +1142,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1174,8 +1160,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1197,20 +1183,20 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList unreachable_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList unreachable_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureUnreachableIsMutable() {
-      if (!unreachable_.isModifiable()) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         unreachable_ = new com.google.protobuf.LazyStringArrayList(unreachable_);
+        bitField0_ |= 0x00000002;
       }
-      bitField0_ |= 0x00000004;
     }
 
     /**
@@ -1228,8 +1214,7 @@ private void ensureUnreachableIsMutable() {
      * @return A list containing the unreachable.
      */
     public com.google.protobuf.ProtocolStringList getUnreachableList() {
-      unreachable_.makeImmutable();
-      return unreachable_;
+      return unreachable_.getUnmodifiableView();
     }
 
     /**
@@ -1310,7 +1295,6 @@ public Builder setUnreachable(int index, java.lang.String value) {
       }
       ensureUnreachableIsMutable();
       unreachable_.set(index, value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1336,7 +1320,6 @@ public Builder addUnreachable(java.lang.String value) {
       }
       ensureUnreachableIsMutable();
       unreachable_.add(value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1359,7 +1342,6 @@ public Builder addUnreachable(java.lang.String value) {
     public Builder addAllUnreachable(java.lang.Iterable values) {
       ensureUnreachableIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, unreachable_);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1379,9 +1361,8 @@ public Builder addAllUnreachable(java.lang.Iterable values) {
      * @return This builder for chaining.
      */
     public Builder clearUnreachable() {
-      unreachable_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000004);
-      ;
+      unreachable_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1408,7 +1389,6 @@ public Builder addUnreachableBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureUnreachableIsMutable();
       unreachable_.add(value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponseOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponseOrBuilder.java
index 9a1f526dc1..a77b627b67 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponseOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/longrunning/operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.longrunning;
 
 public interface ListOperationsResponseOrBuilder
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 46290b0006..8183e06f04 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/longrunning/operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.longrunning;
 
 /**
@@ -50,6 +49,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;
@@ -64,10 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.longrunning.Operation.class, com.google.longrunning.Operation.Builder.class);
   }
 
-  private int bitField0_;
   private int resultCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object result_;
 
   public enum ResultCase
@@ -116,9 +117,7 @@ public ResultCase getResultCase() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -191,7 +190,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    */
   @java.lang.Override
   public boolean hasMetadata() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return metadata_ != null;
   }
 
   /**
@@ -227,11 +226,11 @@ public com.google.protobuf.Any getMetadata() {
    */
   @java.lang.Override
   public com.google.protobuf.AnyOrBuilder getMetadataOrBuilder() {
-    return metadata_ == null ? com.google.protobuf.Any.getDefaultInstance() : metadata_;
+    return getMetadata();
   }
 
   public static final int DONE_FIELD_NUMBER = 3;
-  private boolean done_ = false;
+  private boolean done_;
 
   /**
    *
@@ -397,7 +396,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (metadata_ != null) {
       output.writeMessage(2, getMetadata());
     }
     if (done_ != false) {
@@ -421,7 +420,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (metadata_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getMetadata());
     }
     if (done_ != false) {
@@ -630,32 +629,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.longrunning.Operation.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getMetadataFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
-      metadata_ = null;
-      if (metadataBuilder_ != null) {
-        metadataBuilder_.dispose();
+
+      if (metadataBuilder_ == null) {
+        metadata_ = null;
+      } else {
+        metadata_ = null;
         metadataBuilder_ = null;
       }
       done_ = false;
+
       if (errorBuilder_ != null) {
         errorBuilder_.clear();
       }
@@ -690,39 +682,30 @@ public com.google.longrunning.Operation build() {
     @java.lang.Override
     public com.google.longrunning.Operation buildPartial() {
       com.google.longrunning.Operation result = new com.google.longrunning.Operation(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      buildPartialOneofs(result);
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.longrunning.Operation result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
+      result.name_ = name_;
+      if (metadataBuilder_ == null) {
+        result.metadata_ = metadata_;
+      } else {
+        result.metadata_ = metadataBuilder_.build();
       }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.metadata_ = metadataBuilder_ == null ? metadata_ : metadataBuilder_.build();
-        to_bitField0_ |= 0x00000001;
+      result.done_ = done_;
+      if (resultCase_ == 4) {
+        if (errorBuilder_ == null) {
+          result.result_ = result_;
+        } else {
+          result.result_ = errorBuilder_.build();
+        }
       }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.done_ = done_;
+      if (resultCase_ == 5) {
+        if (responseBuilder_ == null) {
+          result.result_ = result_;
+        } else {
+          result.result_ = responseBuilder_.build();
+        }
       }
-      result.bitField0_ |= to_bitField0_;
-    }
-
-    private void buildPartialOneofs(com.google.longrunning.Operation result) {
       result.resultCase_ = resultCase_;
-      result.result_ = this.result_;
-      if (resultCase_ == 4 && errorBuilder_ != null) {
-        result.result_ = errorBuilder_.build();
-      }
-      if (resultCase_ == 5 && responseBuilder_ != null) {
-        result.result_ = responseBuilder_.build();
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -772,7 +755,6 @@ public Builder mergeFrom(com.google.longrunning.Operation other) {
       if (other == com.google.longrunning.Operation.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasMetadata()) {
@@ -826,19 +808,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getMetadataFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 24:
               {
                 done_ = input.readBool();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 34:
@@ -884,8 +866,6 @@ public Builder clearResult() {
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -956,8 +936,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -976,8 +956,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1001,8 +981,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1029,7 +1009,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the metadata field is set.
      */
     public boolean hasMetadata() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return metadataBuilder_ != null || metadata_ != null;
     }
 
     /**
@@ -1072,11 +1052,11 @@ public Builder setMetadata(com.google.protobuf.Any value) {
           throw new NullPointerException();
         }
         metadata_ = value;
+        onChanged();
       } else {
         metadataBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -1095,11 +1075,11 @@ public Builder setMetadata(com.google.protobuf.Any value) {
     public Builder setMetadata(com.google.protobuf.Any.Builder builderForValue) {
       if (metadataBuilder_ == null) {
         metadata_ = builderForValue.build();
+        onChanged();
       } else {
         metadataBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -1117,20 +1097,16 @@ public Builder setMetadata(com.google.protobuf.Any.Builder builderForValue) {
      */
     public Builder mergeMetadata(com.google.protobuf.Any value) {
       if (metadataBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && metadata_ != null
-            && metadata_ != com.google.protobuf.Any.getDefaultInstance()) {
-          getMetadataBuilder().mergeFrom(value);
+        if (metadata_ != null) {
+          metadata_ = com.google.protobuf.Any.newBuilder(metadata_).mergeFrom(value).buildPartial();
         } else {
           metadata_ = value;
         }
+        onChanged();
       } else {
         metadataBuilder_.mergeFrom(value);
       }
-      if (metadata_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1147,13 +1123,14 @@ public Builder mergeMetadata(com.google.protobuf.Any value) {
      * .google.protobuf.Any metadata = 2;
      */
     public Builder clearMetadata() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      metadata_ = null;
-      if (metadataBuilder_ != null) {
-        metadataBuilder_.dispose();
+      if (metadataBuilder_ == null) {
+        metadata_ = null;
+        onChanged();
+      } else {
+        metadata_ = null;
         metadataBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1170,7 +1147,7 @@ public Builder clearMetadata() {
      * .google.protobuf.Any metadata = 2;
      */
     public com.google.protobuf.Any.Builder getMetadataBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getMetadataFieldBuilder().getBuilder();
     }
@@ -1260,7 +1237,6 @@ public boolean getDone() {
     public Builder setDone(boolean value) {
 
       done_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1279,7 +1255,7 @@ public Builder setDone(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearDone() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       done_ = false;
       onChanged();
       return this;
@@ -1491,6 +1467,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
       }
       resultCase_ = 4;
       onChanged();
+      ;
       return errorBuilder_;
     }
 
@@ -1767,6 +1744,7 @@ public com.google.protobuf.AnyOrBuilder getResponseOrBuilder() {
       }
       resultCase_ = 5;
       onChanged();
+      ;
       return responseBuilder_;
     }
 
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 662682d801..eef288ee67 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/longrunning/operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.longrunning;
 
 /**
@@ -24,9 +23,7 @@
  *
  * 
  * A message representing the message types used by a long-running operation.
- *
  * Example:
- *
  *     rpc Export(ExportRequest) returns (google.longrunning.Operation) {
  *       option (google.longrunning.operation_info) = {
  *         response_type: "ExportResponse"
@@ -59,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;
@@ -75,9 +77,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RESPONSE_TYPE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object responseType_ = "";
+  private volatile java.lang.Object responseType_;
 
   /**
    *
@@ -86,10 +86,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.
    * 

    *
@@ -117,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.
    * 

    *
@@ -142,9 +138,7 @@ public com.google.protobuf.ByteString getResponseTypeBytes() {
   }
 
   public static final int METADATA_TYPE_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object metadataType_ = "";
+  private volatile java.lang.Object metadataType_;
 
   /**
    *
@@ -152,10 +146,8 @@ public com.google.protobuf.ByteString getResponseTypeBytes() {
    * 
    * 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.
    * 

    *
@@ -182,10 +174,8 @@ public java.lang.String getMetadataType() {
    * 
    * 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.
    * 

    *
@@ -378,9 +368,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * A message representing the message types used by a long-running operation.
-   *
    * Example:
-   *
    *     rpc Export(ExportRequest) returns (google.longrunning.Operation) {
    *       option (google.longrunning.operation_info) = {
    *         response_type: "ExportResponse"
@@ -420,9 +408,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       responseType_ = "";
+
       metadataType_ = "";
+
       return this;
     }
 
@@ -449,23 +438,12 @@ public com.google.longrunning.OperationInfo build() {
     @java.lang.Override
     public com.google.longrunning.OperationInfo buildPartial() {
       com.google.longrunning.OperationInfo result = new com.google.longrunning.OperationInfo(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.responseType_ = responseType_;
+      result.metadataType_ = metadataType_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.longrunning.OperationInfo result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.responseType_ = responseType_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.metadataType_ = metadataType_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -513,12 +491,10 @@ public Builder mergeFrom(com.google.longrunning.OperationInfo other) {
       if (other == com.google.longrunning.OperationInfo.getDefaultInstance()) return this;
       if (!other.getResponseType().isEmpty()) {
         responseType_ = other.responseType_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getMetadataType().isEmpty()) {
         metadataType_ = other.metadataType_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -550,13 +526,13 @@ public Builder mergeFrom(
             case 10:
               {
                 responseType_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 metadataType_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -576,8 +552,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object responseType_ = "";
 
     /**
@@ -587,10 +561,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.
      * 

      *
@@ -617,10 +589,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.
      * 

      *
@@ -647,10 +617,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.
      * 

      *
@@ -663,8 +631,8 @@ public Builder setResponseType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       responseType_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -676,10 +644,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.
      * 

      *
@@ -688,8 +654,8 @@ public Builder setResponseType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResponseType() {
+
       responseType_ = getDefaultInstance().getResponseType();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -701,10 +667,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.
      * 

      *
@@ -718,8 +682,8 @@ public Builder setResponseTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       responseType_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -732,10 +696,8 @@ public Builder setResponseTypeBytes(com.google.protobuf.ByteString value) {
      * 
      * 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.
      * 

      *
@@ -761,10 +723,8 @@ public java.lang.String getMetadataType() {
      * 
      * 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.
      * 

      *
@@ -790,10 +750,8 @@ public com.google.protobuf.ByteString getMetadataTypeBytes() {
      * 
      * 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.
      * 

      *
@@ -806,8 +764,8 @@ public Builder setMetadataType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       metadataType_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -818,10 +776,8 @@ public Builder setMetadataType(java.lang.String value) {
      * 
      * 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.
      * 

      *
@@ -830,8 +786,8 @@ public Builder setMetadataType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearMetadataType() {
+
       metadataType_ = getDefaultInstance().getMetadataType();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -842,10 +798,8 @@ public Builder clearMetadataType() {
      * 
      * 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.
      * 

      *
@@ -859,8 +813,8 @@ public Builder setMetadataTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       metadataType_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
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 d901444910..02946a52c6 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/longrunning/operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.longrunning;
 
 public interface OperationInfoOrBuilder
@@ -31,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.
    * 

    *
@@ -51,10 +48,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.
    * 

    *
@@ -70,10 +65,8 @@ public interface OperationInfoOrBuilder
    * 
    * 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.
    * 

    *
@@ -89,10 +82,8 @@ public interface OperationInfoOrBuilder
    * 
    * 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.
    * 

    *
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 ca40953ef5..417fdd171e 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/longrunning/operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.longrunning;
 
 public interface OperationOrBuilder
@@ -210,5 +209,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 da06945f1a..26f3594787 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/longrunning/operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.longrunning;
 
 public final class OperationsProto {
@@ -39,7 +38,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.
    * 

@@ -133,14 +131,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "Operations\022\224\001\n"
           + "\016ListOperations\022).google.longrunning.ListO"
           + "perationsRequest\032*.google.longrunning.Li"
-          + "stOperationsResponse\"+\332A\013name,filter\202\323\344\223\002\027\022\025/v1/{name=operations}\022\177\n"
+          + "stOperationsResponse\"+\202\323\344\223\002\027\022\025/v1/{name=operations}\332A\013name,filter\022\177\n"
           + "\014GetOperation\022\'.google.longrunning.GetOperationReque"
-          + "st\032\035.google.longrunning.Operation\"\'\332A\004name\202\323\344\223\002\032\022\030/v1/{name=operations/**}\022~\n"
+          + "st\032\035.google.longrunning.Operation\"\'\202\323\344\223\002\032\022\030/v1/{name=operations/**}\332A\004name\022~\n"
           + "\017DeleteOperation\022*.google.longrunning.Delet"
           + "eOperationRequest\032\026.google.protobuf.Empt"
-          + "y\"\'\332A\004name\202\323\344\223\002\032*\030/v1/{name=operations/**}\022\210\001\n"
+          + "y\"\'\202\323\344\223\002\032*\030/v1/{name=operations/**}\332A\004name\022\210\001\n"
           + "\017CancelOperation\022*.google.longrunning.CancelOperationRequest\032\026.google.prot"
-          + "obuf.Empty\"1\332A\004name\202\323\344\223\002$\"\037/v1/{name=operations/**}:cancel:\001*\022Z\n\r"
+          + "obuf.Empty\"1\202\323\344\223\002$\"\037/v1/{name=operations/**}:cancel:\001*\332A\004name\022Z\n\r"
           + "WaitOperation\022(.google.longrunning.WaitOperationRequest"
           + "\032\035.google.longrunning.Operation\"\000\032\035\312A\032longrunning.googleapis.com:Z\n"
           + "\016operation_info\022\036.google.protobuf.MethodOptions\030\231\010"
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 74cb2067b4..e7e25686dd 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/longrunning/operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.longrunning;
 
 /**
@@ -50,6 +49,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;
@@ -65,11 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.longrunning.WaitOperationRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -137,7 +138,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    */
   @java.lang.Override
   public boolean hasTimeout() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return timeout_ != null;
   }
 
   /**
@@ -171,7 +172,7 @@ public com.google.protobuf.Duration getTimeout() {
    */
   @java.lang.Override
   public com.google.protobuf.DurationOrBuilder getTimeoutOrBuilder() {
-    return timeout_ == null ? com.google.protobuf.Duration.getDefaultInstance() : timeout_;
+    return getTimeout();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -191,7 +192,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (timeout_ != null) {
       output.writeMessage(2, getTimeout());
     }
     getUnknownFields().writeTo(output);
@@ -206,7 +207,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (timeout_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getTimeout());
     }
     size += getUnknownFields().getSerializedSize();
@@ -378,29 +379,21 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.longrunning.WaitOperationRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getTimeoutFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
-      timeout_ = null;
-      if (timeoutBuilder_ != null) {
-        timeoutBuilder_.dispose();
+
+      if (timeoutBuilder_ == null) {
+        timeout_ = null;
+      } else {
+        timeout_ = null;
         timeoutBuilder_ = null;
       }
       return this;
@@ -430,26 +423,16 @@ public com.google.longrunning.WaitOperationRequest build() {
     public com.google.longrunning.WaitOperationRequest buildPartial() {
       com.google.longrunning.WaitOperationRequest result =
           new com.google.longrunning.WaitOperationRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.name_ = name_;
+      if (timeoutBuilder_ == null) {
+        result.timeout_ = timeout_;
+      } else {
+        result.timeout_ = timeoutBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.longrunning.WaitOperationRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.timeout_ = timeoutBuilder_ == null ? timeout_ : timeoutBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -497,7 +480,6 @@ public Builder mergeFrom(com.google.longrunning.WaitOperationRequest other) {
       if (other == com.google.longrunning.WaitOperationRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasTimeout()) {
@@ -532,13 +514,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getTimeoutFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -558,8 +540,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -624,8 +604,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -642,8 +622,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -665,8 +645,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -692,7 +672,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the timeout field is set.
      */
     public boolean hasTimeout() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return timeoutBuilder_ != null || timeout_ != null;
     }
 
     /**
@@ -733,11 +713,11 @@ public Builder setTimeout(com.google.protobuf.Duration value) {
           throw new NullPointerException();
         }
         timeout_ = value;
+        onChanged();
       } else {
         timeoutBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -755,11 +735,11 @@ public Builder setTimeout(com.google.protobuf.Duration value) {
     public Builder setTimeout(com.google.protobuf.Duration.Builder builderForValue) {
       if (timeoutBuilder_ == null) {
         timeout_ = builderForValue.build();
+        onChanged();
       } else {
         timeoutBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -776,20 +756,17 @@ public Builder setTimeout(com.google.protobuf.Duration.Builder builderForValue)
      */
     public Builder mergeTimeout(com.google.protobuf.Duration value) {
       if (timeoutBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && timeout_ != null
-            && timeout_ != com.google.protobuf.Duration.getDefaultInstance()) {
-          getTimeoutBuilder().mergeFrom(value);
+        if (timeout_ != null) {
+          timeout_ =
+              com.google.protobuf.Duration.newBuilder(timeout_).mergeFrom(value).buildPartial();
         } else {
           timeout_ = value;
         }
+        onChanged();
       } else {
         timeoutBuilder_.mergeFrom(value);
       }
-      if (timeout_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -805,13 +782,14 @@ public Builder mergeTimeout(com.google.protobuf.Duration value) {
      * .google.protobuf.Duration timeout = 2;
      */
     public Builder clearTimeout() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      timeout_ = null;
-      if (timeoutBuilder_ != null) {
-        timeoutBuilder_.dispose();
+      if (timeoutBuilder_ == null) {
+        timeout_ = null;
+        onChanged();
+      } else {
+        timeout_ = null;
         timeoutBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -827,7 +805,7 @@ public Builder clearTimeout() {
      * .google.protobuf.Duration timeout = 2;
      */
     public com.google.protobuf.Duration.Builder getTimeoutBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getTimeoutFieldBuilder().getBuilder();
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/WaitOperationRequestOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/WaitOperationRequestOrBuilder.java
index ba6c66a445..11a479f515 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/WaitOperationRequestOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/longrunning/WaitOperationRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/longrunning/operations.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.longrunning;
 
 public interface WaitOperationRequestOrBuilder
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 c87fc3d5fb..d720872518 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 /**
@@ -50,6 +49,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;
   }
@@ -74,9 +78,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 {
@@ -84,25 +86,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
@@ -123,9 +119,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 {
@@ -133,25 +127,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
@@ -300,6 +288,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;
@@ -315,11 +308,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
               com.google.rpc.BadRequest.FieldViolation.Builder.class);
     }
 
-    private int bitField0_;
     public static final int FIELD_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object field_ = "";
+    private volatile java.lang.Object field_;
 
     /**
      *
@@ -328,9 +318,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 {
@@ -338,25 +326,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
@@ -388,9 +370,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 {
@@ -398,25 +378,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
@@ -442,9 +416,7 @@ public com.google.protobuf.ByteString getFieldBytes() {
     }
 
     public static final int DESCRIPTION_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object description_ = "";
+    private volatile java.lang.Object description_;
 
     /**
      *
@@ -495,9 +467,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
     }
 
     public static final int REASON_FIELD_NUMBER = 3;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object reason_ = "";
+    private volatile java.lang.Object reason_;
 
     /**
      *
@@ -574,7 +544,7 @@ public com.google.protobuf.ByteString getReasonBytes() {
      */
     @java.lang.Override
     public boolean hasLocalizedMessage() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return localizedMessage_ != null;
     }
 
     /**
@@ -608,9 +578,7 @@ public com.google.rpc.LocalizedMessage getLocalizedMessage() {
      */
     @java.lang.Override
     public com.google.rpc.LocalizedMessageOrBuilder getLocalizedMessageOrBuilder() {
-      return localizedMessage_ == null
-          ? com.google.rpc.LocalizedMessage.getDefaultInstance()
-          : localizedMessage_;
+      return getLocalizedMessage();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -636,7 +604,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reason_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 3, reason_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (localizedMessage_ != null) {
         output.writeMessage(4, getLocalizedMessage());
       }
       getUnknownFields().writeTo(output);
@@ -657,7 +625,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reason_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, reason_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (localizedMessage_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getLocalizedMessage());
       }
       size += getUnknownFields().getSerializedSize();
@@ -836,31 +804,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.rpc.BadRequest.FieldViolation.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getLocalizedMessageFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         field_ = "";
+
         description_ = "";
+
         reason_ = "";
-        localizedMessage_ = null;
-        if (localizedMessageBuilder_ != null) {
-          localizedMessageBuilder_.dispose();
+
+        if (localizedMessageBuilder_ == null) {
+          localizedMessage_ = null;
+        } else {
+          localizedMessage_ = null;
           localizedMessageBuilder_ = null;
         }
         return this;
@@ -890,35 +852,18 @@ public com.google.rpc.BadRequest.FieldViolation build() {
       public com.google.rpc.BadRequest.FieldViolation buildPartial() {
         com.google.rpc.BadRequest.FieldViolation result =
             new com.google.rpc.BadRequest.FieldViolation(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        result.field_ = field_;
+        result.description_ = description_;
+        result.reason_ = reason_;
+        if (localizedMessageBuilder_ == null) {
+          result.localizedMessage_ = localizedMessage_;
+        } else {
+          result.localizedMessage_ = localizedMessageBuilder_.build();
         }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.rpc.BadRequest.FieldViolation result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.field_ = field_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.description_ = description_;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.reason_ = reason_;
-        }
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000008) != 0)) {
-          result.localizedMessage_ =
-              localizedMessageBuilder_ == null
-                  ? localizedMessage_
-                  : localizedMessageBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        result.bitField0_ |= to_bitField0_;
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -968,17 +913,14 @@ public Builder mergeFrom(com.google.rpc.BadRequest.FieldViolation other) {
         if (other == com.google.rpc.BadRequest.FieldViolation.getDefaultInstance()) return this;
         if (!other.getField().isEmpty()) {
           field_ = other.field_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getDescription().isEmpty()) {
           description_ = other.description_;
-          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (!other.getReason().isEmpty()) {
           reason_ = other.reason_;
-          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (other.hasLocalizedMessage()) {
@@ -1013,26 +955,26 @@ public Builder mergeFrom(
               case 10:
                 {
                   field_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   description_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               case 26:
                 {
                   reason_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 26
               case 34:
                 {
                   input.readMessage(
                       getLocalizedMessageFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000008;
+
                   break;
                 } // case 34
               default:
@@ -1052,8 +994,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private java.lang.Object field_ = "";
 
       /**
@@ -1063,9 +1003,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 {
@@ -1073,25 +1011,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
@@ -1122,9 +1054,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 {
@@ -1132,25 +1062,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
@@ -1181,9 +1105,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 {
@@ -1191,25 +1113,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
@@ -1226,8 +1142,8 @@ public Builder setField(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         field_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1239,9 +1155,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 {
@@ -1249,25 +1163,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
@@ -1280,8 +1188,8 @@ public Builder setField(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearField() {
+
         field_ = getDefaultInstance().getField();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1293,9 +1201,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 {
@@ -1303,25 +1209,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
@@ -1339,8 +1239,8 @@ public Builder setFieldBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         field_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1409,8 +1309,8 @@ public Builder setDescription(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         description_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1427,8 +1327,8 @@ public Builder setDescription(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearDescription() {
+
         description_ = getDefaultInstance().getDescription();
-        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1450,8 +1350,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         description_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1535,8 +1435,8 @@ public Builder setReason(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         reason_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1558,8 +1458,8 @@ public Builder setReason(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearReason() {
+
         reason_ = getDefaultInstance().getReason();
-        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -1586,8 +1486,8 @@ public Builder setReasonBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         reason_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1612,7 +1512,7 @@ public Builder setReasonBytes(com.google.protobuf.ByteString value) {
        * @return Whether the localizedMessage field is set.
        */
       public boolean hasLocalizedMessage() {
-        return ((bitField0_ & 0x00000008) != 0);
+        return localizedMessageBuilder_ != null || localizedMessage_ != null;
       }
 
       /**
@@ -1653,11 +1553,11 @@ public Builder setLocalizedMessage(com.google.rpc.LocalizedMessage value) {
             throw new NullPointerException();
           }
           localizedMessage_ = value;
+          onChanged();
         } else {
           localizedMessageBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000008;
-        onChanged();
+
         return this;
       }
 
@@ -1674,11 +1574,11 @@ public Builder setLocalizedMessage(com.google.rpc.LocalizedMessage value) {
       public Builder setLocalizedMessage(com.google.rpc.LocalizedMessage.Builder builderForValue) {
         if (localizedMessageBuilder_ == null) {
           localizedMessage_ = builderForValue.build();
+          onChanged();
         } else {
           localizedMessageBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000008;
-        onChanged();
+
         return this;
       }
 
@@ -1694,20 +1594,19 @@ public Builder setLocalizedMessage(com.google.rpc.LocalizedMessage.Builder build
        */
       public Builder mergeLocalizedMessage(com.google.rpc.LocalizedMessage value) {
         if (localizedMessageBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) != 0)
-              && localizedMessage_ != null
-              && localizedMessage_ != com.google.rpc.LocalizedMessage.getDefaultInstance()) {
-            getLocalizedMessageBuilder().mergeFrom(value);
+          if (localizedMessage_ != null) {
+            localizedMessage_ =
+                com.google.rpc.LocalizedMessage.newBuilder(localizedMessage_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             localizedMessage_ = value;
           }
+          onChanged();
         } else {
           localizedMessageBuilder_.mergeFrom(value);
         }
-        if (localizedMessage_ != null) {
-          bitField0_ |= 0x00000008;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -1722,13 +1621,14 @@ public Builder mergeLocalizedMessage(com.google.rpc.LocalizedMessage value) {
        * .google.rpc.LocalizedMessage localized_message = 4;
        */
       public Builder clearLocalizedMessage() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        localizedMessage_ = null;
-        if (localizedMessageBuilder_ != null) {
-          localizedMessageBuilder_.dispose();
+        if (localizedMessageBuilder_ == null) {
+          localizedMessage_ = null;
+          onChanged();
+        } else {
+          localizedMessage_ = null;
           localizedMessageBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1743,7 +1643,7 @@ public Builder clearLocalizedMessage() {
        * .google.rpc.LocalizedMessage localized_message = 4;
        */
       public com.google.rpc.LocalizedMessage.Builder getLocalizedMessageBuilder() {
-        bitField0_ |= 0x00000008;
+
         onChanged();
         return getLocalizedMessageFieldBuilder().getBuilder();
       }
@@ -1860,8 +1760,6 @@ public com.google.rpc.BadRequest.FieldViolation getDefaultInstanceForType() {
   }
 
   public static final int FIELD_VIOLATIONS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List fieldViolations_;
 
   /**
@@ -2132,7 +2030,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (fieldViolationsBuilder_ == null) {
         fieldViolations_ = java.util.Collections.emptyList();
       } else {
@@ -2165,15 +2062,7 @@ public com.google.rpc.BadRequest build() {
     @java.lang.Override
     public com.google.rpc.BadRequest buildPartial() {
       com.google.rpc.BadRequest result = new com.google.rpc.BadRequest(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.rpc.BadRequest result) {
+      int from_bitField0_ = bitField0_;
       if (fieldViolationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           fieldViolations_ = java.util.Collections.unmodifiableList(fieldViolations_);
@@ -2183,10 +2072,8 @@ private void buildPartialRepeatedFields(com.google.rpc.BadRequest result) {
       } else {
         result.fieldViolations_ = fieldViolationsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.rpc.BadRequest result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/BadRequestOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/BadRequestOrBuilder.java
index 4903d71637..07e8b646e5 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/BadRequestOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/BadRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 public interface BadRequestOrBuilder
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 3adee10f9a..4a6a8dd281 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/code.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 /**
@@ -24,8 +23,6 @@
  *
  * 
  * 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.
@@ -40,7 +37,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * Not an error; returned on success.
-   *
    * HTTP Mapping: 200 OK
    * 

    *
@@ -52,7 +48,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * The operation was cancelled, typically by the caller.
-   *
    * HTTP Mapping: 499 Client Closed Request
    * 

    *
@@ -68,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
    * 

    *
@@ -83,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
    * 

    *
@@ -99,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
    * 

    *
@@ -111,13 +103,11 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * 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
    * 

    *
@@ -130,7 +120,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * The entity that a client attempted to create (e.g., file or directory)
    * already exists.
-   *
    * HTTP Mapping: 409 Conflict
    * 

    *
@@ -149,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
    * 

    *
@@ -162,7 +150,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * The request does not have valid authentication credentials for the
    * operation.
-   *
    * HTTP Mapping: 401 Unauthorized
    * 

    *
@@ -175,7 +162,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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
    * 

    *
@@ -190,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.
@@ -202,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
    * 

    *
@@ -215,10 +199,8 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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
    * 

    *
@@ -231,20 +213,17 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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
    * 

    *
@@ -257,7 +236,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * The operation is not implemented or is not supported/enabled in this
    * service.
-   *
    * HTTP Mapping: 501 Not Implemented
    * 

    *
@@ -271,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
    * 

    *
@@ -286,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
    * 

    *
@@ -301,7 +276,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * Unrecoverable data loss or corruption.
-   *
    * HTTP Mapping: 500 Internal Server Error
    * 

    *
@@ -316,7 +290,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * Not an error; returned on success.
-   *
    * HTTP Mapping: 200 OK
    * 

    *
@@ -329,7 +302,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * The operation was cancelled, typically by the caller.
-   *
    * HTTP Mapping: 499 Client Closed Request
    * 

    *
@@ -346,7 +318,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
    * 

    *
@@ -362,7 +333,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
    * 

    *
@@ -379,7 +349,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
    * 

    *
@@ -392,13 +361,11 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * 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
    * 

    *
@@ -412,7 +379,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * The entity that a client attempted to create (e.g., file or directory)
    * already exists.
-   *
    * HTTP Mapping: 409 Conflict
    * 

    *
@@ -432,7 +398,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
    * 

    *
@@ -446,7 +411,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * The request does not have valid authentication credentials for the
    * operation.
-   *
    * HTTP Mapping: 401 Unauthorized
    * 

    *
@@ -460,7 +424,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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
    * 

    *
@@ -476,7 +439,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.
@@ -488,7 +450,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
    * 

    *
@@ -502,10 +463,8 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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
    * 

    *
@@ -519,20 +478,17 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * 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
    * 

    *
@@ -546,7 +502,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    * 
    * The operation is not implemented or is not supported/enabled in this
    * service.
-   *
    * HTTP Mapping: 501 Not Implemented
    * 

    *
@@ -561,7 +516,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
    * 

    *
@@ -577,10 +531,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
    * 

    *
@@ -593,7 +545,6 @@ public enum Code implements com.google.protobuf.ProtocolMessageEnum {
    *
    * 
    * Unrecoverable data loss or corruption.
-   *
    * HTTP Mapping: 500 Internal Server Error
    * 

    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/CodeProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/CodeProto.java
index c7d1ab74d7..868c49e590 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/CodeProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/CodeProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/code.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 public final class CodeProto {
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 aff6e63754..bb9a019a0f 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 /**
@@ -40,7 +39,7 @@ private DebugInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) {
   }
 
   private DebugInfo() {
-    stackEntries_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    stackEntries_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     detail_ = "";
   }
 
@@ -50,6 +49,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,10 +67,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_;
 
   /**
    *
@@ -131,9 +132,7 @@ public com.google.protobuf.ByteString getStackEntriesBytes(int index) {
   }
 
   public static final int DETAIL_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object detail_ = "";
+  private volatile java.lang.Object detail_;
 
   /**
    *
@@ -393,9 +392,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     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;
     }
 
@@ -421,24 +421,17 @@ 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);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        stackEntries_ = stackEntries_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
+      result.stackEntries_ = stackEntries_;
+      result.detail_ = detail_;
       onBuilt();
       return result;
     }
 
-    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();
@@ -487,7 +480,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_);
@@ -496,7 +489,6 @@ public Builder mergeFrom(com.google.rpc.DebugInfo other) {
       }
       if (!other.getDetail().isEmpty()) {
         detail_ = other.detail_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -535,7 +527,7 @@ public Builder mergeFrom(
             case 18:
               {
                 detail_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -557,14 +549,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;
     }
 
     /**
@@ -579,8 +571,7 @@ private void ensureStackEntriesIsMutable() {
      * @return A list containing the stackEntries.
      */
     public com.google.protobuf.ProtocolStringList getStackEntriesList() {
-      stackEntries_.makeImmutable();
-      return stackEntries_;
+      return stackEntries_.getUnmodifiableView();
     }
 
     /**
@@ -649,7 +640,6 @@ public Builder setStackEntries(int index, java.lang.String value) {
       }
       ensureStackEntriesIsMutable();
       stackEntries_.set(index, value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -672,7 +662,6 @@ public Builder addStackEntries(java.lang.String value) {
       }
       ensureStackEntriesIsMutable();
       stackEntries_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -692,7 +681,6 @@ public Builder addStackEntries(java.lang.String value) {
     public Builder addAllStackEntries(java.lang.Iterable values) {
       ensureStackEntriesIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, stackEntries_);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -709,9 +697,8 @@ public Builder addAllStackEntries(java.lang.Iterable 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;
     }
@@ -735,7 +722,6 @@ public Builder addStackEntriesBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureStackEntriesIsMutable();
       stackEntries_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -804,8 +790,8 @@ public Builder setDetail(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       detail_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -822,8 +808,8 @@ public Builder setDetail(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDetail() {
+
       detail_ = getDefaultInstance().getDetail();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -845,8 +831,8 @@ public Builder setDetailBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       detail_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfoOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfoOrBuilder.java
index 79e79881f6..3fcd01c303 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfoOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfoOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 public interface DebugInfoOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ErrorDetailsProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ErrorDetailsProto.java
index d7dedf4743..348540fcfc 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ErrorDetailsProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ErrorDetailsProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 public final class ErrorDetailsProto {
@@ -220,6 +219,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "QuotaDimensions",
               "QuotaValue",
               "FutureQuotaValue",
+              "FutureQuotaValue",
             });
     internal_static_google_rpc_QuotaFailure_Violation_QuotaDimensionsEntry_descriptor =
         internal_static_google_rpc_QuotaFailure_Violation_descriptor.getNestedTypes().get(0);
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 8cb52fd181..a7408bb17b 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 /**
@@ -24,10 +23,8 @@
  *
  * 
  * 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": {
@@ -35,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": {
@@ -73,14 +67,18 @@ 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;
   }
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 3:
         return internalGetMetadata();
@@ -98,9 +96,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
   }
 
   public static final int REASON_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object reason_ = "";
+  private volatile java.lang.Object reason_;
 
   /**
    *
@@ -159,9 +155,7 @@ public com.google.protobuf.ByteString getReasonBytes() {
   }
 
   public static final int DOMAIN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object domain_ = "";
+  private volatile java.lang.Object domain_;
 
   /**
    *
@@ -234,7 +228,6 @@ private static final class MetadataDefaultEntryHolder {
             "");
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField metadata_;
 
   private com.google.protobuf.MapField internalGetMetadata() {
@@ -253,7 +246,6 @@ public int getMetadataCount() {
    *
    * 
    * Additional structured details about this error.
-   *
    * Keys must match a regular expression of `[a-z][a-zA-Z0-9-_]+` but should
    * ideally be lowerCamelCase. Also, they must be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
@@ -285,7 +277,6 @@ public java.util.Map getMetadata() {
    *
    * 
    * Additional structured details about this error.
-   *
    * Keys must match a regular expression of `[a-z][a-zA-Z0-9-_]+` but should
    * ideally be lowerCamelCase. Also, they must be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
@@ -307,7 +298,6 @@ public java.util.Map getMetadataMap() {
    *
    * 
    * Additional structured details about this error.
-   *
    * Keys must match a regular expression of `[a-z][a-zA-Z0-9-_]+` but should
    * ideally be lowerCamelCase. Also, they must be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
@@ -320,10 +310,8 @@ public java.util.Map getMetadataMap() {
    * map<string, string> metadata = 3;
    */
   @java.lang.Override
-  public /* nullable */ java.lang.String getMetadataOrDefault(
-      java.lang.String key,
-      /* nullable */
-      java.lang.String defaultValue) {
+  public java.lang.String getMetadataOrDefault(
+      java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -336,7 +324,6 @@ public java.util.Map getMetadataMap() {
    *
    * 
    * Additional structured details about this error.
-   *
    * Keys must match a regular expression of `[a-z][a-zA-Z0-9-_]+` but should
    * ideally be lowerCamelCase. Also, they must be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
@@ -549,10 +536,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * 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": {
@@ -560,12 +545,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": {
@@ -585,8 +567,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 3:
           return internalGetMetadata();
@@ -596,8 +577,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 3:
           return internalGetMutableMetadata();
@@ -625,9 +605,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       reason_ = "";
+
       domain_ = "";
+
       internalGetMutableMetadata().clear();
       return this;
     }
@@ -654,27 +635,15 @@ public com.google.rpc.ErrorInfo build() {
     @java.lang.Override
     public com.google.rpc.ErrorInfo buildPartial() {
       com.google.rpc.ErrorInfo result = new com.google.rpc.ErrorInfo(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      int from_bitField0_ = bitField0_;
+      result.reason_ = reason_;
+      result.domain_ = domain_;
+      result.metadata_ = internalGetMetadata();
+      result.metadata_.makeImmutable();
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.rpc.ErrorInfo result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.reason_ = reason_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.domain_ = domain_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.metadata_ = internalGetMetadata();
-        result.metadata_.makeImmutable();
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -722,16 +691,13 @@ public Builder mergeFrom(com.google.rpc.ErrorInfo other) {
       if (other == com.google.rpc.ErrorInfo.getDefaultInstance()) return this;
       if (!other.getReason().isEmpty()) {
         reason_ = other.reason_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDomain().isEmpty()) {
         domain_ = other.domain_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       internalGetMutableMetadata().mergeFrom(other.internalGetMetadata());
-      bitField0_ |= 0x00000004;
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -761,13 +727,13 @@ public Builder mergeFrom(
             case 10:
               {
                 reason_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 domain_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
@@ -779,7 +745,6 @@ public Builder mergeFrom(
                 internalGetMutableMetadata()
                     .getMutableMap()
                     .put(metadata__.getKey(), metadata__.getValue());
-                bitField0_ |= 0x00000004;
                 break;
               } // case 26
             default:
@@ -877,8 +842,8 @@ public Builder setReason(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       reason_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -899,8 +864,8 @@ public Builder setReason(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearReason() {
+
       reason_ = getDefaultInstance().getReason();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -926,8 +891,8 @@ public Builder setReasonBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       reason_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1011,8 +976,8 @@ public Builder setDomain(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       domain_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1034,8 +999,8 @@ public Builder setDomain(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDomain() {
+
       domain_ = getDefaultInstance().getDomain();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1062,8 +1027,8 @@ public Builder setDomainBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       domain_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1079,6 +1044,8 @@ private com.google.protobuf.MapField interna
 
     private com.google.protobuf.MapField
         internalGetMutableMetadata() {
+      onChanged();
+      ;
       if (metadata_ == null) {
         metadata_ =
             com.google.protobuf.MapField.newMapField(MetadataDefaultEntryHolder.defaultEntry);
@@ -1086,8 +1053,6 @@ private com.google.protobuf.MapField interna
       if (!metadata_.isMutable()) {
         metadata_ = metadata_.copy();
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
       return metadata_;
     }
 
@@ -1100,7 +1065,6 @@ public int getMetadataCount() {
      *
      * 
      * Additional structured details about this error.
-     *
      * Keys must match a regular expression of `[a-z][a-zA-Z0-9-_]+` but should
      * ideally be lowerCamelCase. Also, they must be limited to 64 characters in
      * length. When identifying the current value of an exceeded limit, the units
@@ -1132,7 +1096,6 @@ public java.util.Map getMetadata() {
      *
      * 
      * Additional structured details about this error.
-     *
      * Keys must match a regular expression of `[a-z][a-zA-Z0-9-_]+` but should
      * ideally be lowerCamelCase. Also, they must be limited to 64 characters in
      * length. When identifying the current value of an exceeded limit, the units
@@ -1154,7 +1117,6 @@ public java.util.Map getMetadataMap() {
      *
      * 
      * Additional structured details about this error.
-     *
      * Keys must match a regular expression of `[a-z][a-zA-Z0-9-_]+` but should
      * ideally be lowerCamelCase. Also, they must be limited to 64 characters in
      * length. When identifying the current value of an exceeded limit, the units
@@ -1167,10 +1129,8 @@ public java.util.Map getMetadataMap() {
      * map<string, string> metadata = 3;
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getMetadataOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getMetadataOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1183,7 +1143,6 @@ public java.util.Map getMetadataMap() {
      *
      * 
      * Additional structured details about this error.
-     *
      * Keys must match a regular expression of `[a-z][a-zA-Z0-9-_]+` but should
      * ideally be lowerCamelCase. Also, they must be limited to 64 characters in
      * length. When identifying the current value of an exceeded limit, the units
@@ -1208,7 +1167,6 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
     }
 
     public Builder clearMetadata() {
-      bitField0_ = (bitField0_ & ~0x00000004);
       internalGetMutableMetadata().getMutableMap().clear();
       return this;
     }
@@ -1218,7 +1176,6 @@ public Builder clearMetadata() {
      *
      * 
      * Additional structured details about this error.
-     *
      * Keys must match a regular expression of `[a-z][a-zA-Z0-9-_]+` but should
      * ideally be lowerCamelCase. Also, they must be limited to 64 characters in
      * length. When identifying the current value of an exceeded limit, the units
@@ -1241,7 +1198,6 @@ public Builder removeMetadata(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableMetadata() {
-      bitField0_ |= 0x00000004;
       return internalGetMutableMetadata().getMutableMap();
     }
 
@@ -1250,7 +1206,6 @@ public java.util.Map getMutableMetadata() {
      *
      * 
      * Additional structured details about this error.
-     *
      * Keys must match a regular expression of `[a-z][a-zA-Z0-9-_]+` but should
      * ideally be lowerCamelCase. Also, they must be limited to 64 characters in
      * length. When identifying the current value of an exceeded limit, the units
@@ -1269,8 +1224,8 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
+
       internalGetMutableMetadata().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000004;
       return this;
     }
 
@@ -1279,7 +1234,6 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
      *
      * 
      * Additional structured details about this error.
-     *
      * Keys must match a regular expression of `[a-z][a-zA-Z0-9-_]+` but should
      * ideally be lowerCamelCase. Also, they must be limited to 64 characters in
      * length. When identifying the current value of an exceeded limit, the units
@@ -1293,7 +1247,6 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllMetadata(java.util.Map values) {
       internalGetMutableMetadata().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000004;
       return this;
     }
 
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 43b5c86ed1..1592149e5e 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 public interface ErrorInfoOrBuilder
@@ -99,7 +98,6 @@ public interface ErrorInfoOrBuilder
    *
    * 
    * Additional structured details about this error.
-   *
    * Keys must match a regular expression of `[a-z][a-zA-Z0-9-_]+` but should
    * ideally be lowerCamelCase. Also, they must be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
@@ -118,7 +116,6 @@ public interface ErrorInfoOrBuilder
    *
    * 
    * Additional structured details about this error.
-   *
    * Keys must match a regular expression of `[a-z][a-zA-Z0-9-_]+` but should
    * ideally be lowerCamelCase. Also, they must be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
@@ -141,7 +138,6 @@ public interface ErrorInfoOrBuilder
    *
    * 
    * Additional structured details about this error.
-   *
    * Keys must match a regular expression of `[a-z][a-zA-Z0-9-_]+` but should
    * ideally be lowerCamelCase. Also, they must be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
@@ -160,7 +156,6 @@ public interface ErrorInfoOrBuilder
    *
    * 
    * Additional structured details about this error.
-   *
    * Keys must match a regular expression of `[a-z][a-zA-Z0-9-_]+` but should
    * ideally be lowerCamelCase. Also, they must be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
@@ -172,6 +167,7 @@ public interface ErrorInfoOrBuilder
    *
    * map<string, string> metadata = 3;
    */
+
   /* nullable */
   java.lang.String getMetadataOrDefault(
       java.lang.String key,
@@ -183,7 +179,6 @@ java.lang.String getMetadataOrDefault(
    *
    * 
    * Additional structured details about this error.
-   *
    * Keys must match a regular expression of `[a-z][a-zA-Z0-9-_]+` but should
    * ideally be lowerCamelCase. Also, they must be limited to 64 characters in
    * length. When identifying the current value of an exceeded limit, the units
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 5a48145f4b..91425c6f4d 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 /**
@@ -24,7 +23,6 @@
  *
  * 
  * 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.
@@ -53,6 +51,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;
   }
@@ -154,6 +157,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;
     }
@@ -168,9 +176,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int DESCRIPTION_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object description_ = "";
+    private volatile java.lang.Object description_;
 
     /**
      *
@@ -221,9 +227,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
     }
 
     public static final int URL_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object url_ = "";
+    private volatile java.lang.Object url_;
 
     /**
      *
@@ -478,9 +482,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         description_ = "";
+
         url_ = "";
+
         return this;
       }
 
@@ -506,23 +511,12 @@ public com.google.rpc.Help.Link build() {
       @java.lang.Override
       public com.google.rpc.Help.Link buildPartial() {
         com.google.rpc.Help.Link result = new com.google.rpc.Help.Link(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        result.description_ = description_;
+        result.url_ = url_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.rpc.Help.Link result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.description_ = description_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.url_ = url_;
-        }
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -572,12 +566,10 @@ public Builder mergeFrom(com.google.rpc.Help.Link other) {
         if (other == com.google.rpc.Help.Link.getDefaultInstance()) return this;
         if (!other.getDescription().isEmpty()) {
           description_ = other.description_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getUrl().isEmpty()) {
           url_ = other.url_;
-          bitField0_ |= 0x00000002;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -609,13 +601,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   description_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   url_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               default:
@@ -635,8 +627,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private java.lang.Object description_ = "";
 
       /**
@@ -701,8 +691,8 @@ public Builder setDescription(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         description_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -719,8 +709,8 @@ public Builder setDescription(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearDescription() {
+
         description_ = getDefaultInstance().getDescription();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -742,8 +732,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         description_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -812,8 +802,8 @@ public Builder setUrl(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         url_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -830,8 +820,8 @@ public Builder setUrl(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearUrl() {
+
         url_ = getDefaultInstance().getUrl();
-        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -853,8 +843,8 @@ public Builder setUrlBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         url_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -924,8 +914,6 @@ public com.google.rpc.Help.Link getDefaultInstanceForType() {
   }
 
   public static final int LINKS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List links_;
 
   /**
@@ -1163,7 +1151,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * 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.
@@ -1197,7 +1184,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (linksBuilder_ == null) {
         links_ = java.util.Collections.emptyList();
       } else {
@@ -1230,15 +1216,7 @@ public com.google.rpc.Help build() {
     @java.lang.Override
     public com.google.rpc.Help buildPartial() {
       com.google.rpc.Help result = new com.google.rpc.Help(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.rpc.Help result) {
+      int from_bitField0_ = bitField0_;
       if (linksBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           links_ = java.util.Collections.unmodifiableList(links_);
@@ -1248,10 +1226,8 @@ private void buildPartialRepeatedFields(com.google.rpc.Help result) {
       } else {
         result.links_ = linksBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.rpc.Help result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/HelpOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/HelpOrBuilder.java
index a8ad1e938e..b0c85c2de2 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/HelpOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/HelpOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 public interface HelpOrBuilder
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 75c9b5d413..259a74d83c 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 /**
@@ -51,6 +50,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;
   }
@@ -65,9 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int LOCALE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object locale_ = "";
+  private volatile java.lang.Object locale_;
 
   /**
    *
@@ -122,9 +124,7 @@ public com.google.protobuf.ByteString getLocaleBytes() {
   }
 
   public static final int MESSAGE_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object message_ = "";
+  private volatile java.lang.Object message_;
 
   /**
    *
@@ -379,9 +379,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       locale_ = "";
+
       message_ = "";
+
       return this;
     }
 
@@ -408,23 +409,12 @@ public com.google.rpc.LocalizedMessage build() {
     @java.lang.Override
     public com.google.rpc.LocalizedMessage buildPartial() {
       com.google.rpc.LocalizedMessage result = new com.google.rpc.LocalizedMessage(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.locale_ = locale_;
+      result.message_ = message_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.rpc.LocalizedMessage result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.locale_ = locale_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.message_ = message_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -472,12 +462,10 @@ public Builder mergeFrom(com.google.rpc.LocalizedMessage other) {
       if (other == com.google.rpc.LocalizedMessage.getDefaultInstance()) return this;
       if (!other.getLocale().isEmpty()) {
         locale_ = other.locale_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getMessage().isEmpty()) {
         message_ = other.message_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -509,13 +497,13 @@ public Builder mergeFrom(
             case 10:
               {
                 locale_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 message_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -535,8 +523,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object locale_ = "";
 
     /**
@@ -607,8 +593,8 @@ public Builder setLocale(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       locale_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -627,8 +613,8 @@ public Builder setLocale(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLocale() {
+
       locale_ = getDefaultInstance().getLocale();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -652,8 +638,8 @@ public Builder setLocaleBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       locale_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -722,8 +708,8 @@ public Builder setMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       message_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -740,8 +726,8 @@ public Builder setMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearMessage() {
+
       message_ = getDefaultInstance().getMessage();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -763,8 +749,8 @@ public Builder setMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       message_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessageOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessageOrBuilder.java
index 7a22911c65..9beed33f44 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessageOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessageOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 public interface LocalizedMessageOrBuilder
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 b33907e428..bb380509c3 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 /**
@@ -24,7 +23,6 @@
  *
  * 
  * 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.
@@ -53,6 +51,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;
@@ -139,7 +142,6 @@ public interface ViolationOrBuilder
      * 
      * 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".
      * 

      *
@@ -155,7 +157,6 @@ public interface ViolationOrBuilder
      * 
      * 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".
      * 

      *
@@ -198,6 +199,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;
@@ -214,9 +220,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int TYPE_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object type_ = "";
+    private volatile java.lang.Object type_;
 
     /**
      *
@@ -271,9 +275,7 @@ public com.google.protobuf.ByteString getTypeBytes() {
     }
 
     public static final int SUBJECT_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object subject_ = "";
+    private volatile java.lang.Object subject_;
 
     /**
      *
@@ -328,9 +330,7 @@ public com.google.protobuf.ByteString getSubjectBytes() {
     }
 
     public static final int DESCRIPTION_FIELD_NUMBER = 3;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object description_ = "";
+    private volatile java.lang.Object description_;
 
     /**
      *
@@ -338,7 +338,6 @@ public com.google.protobuf.ByteString getSubjectBytes() {
      * 
      * 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".
      * 

      *
@@ -365,7 +364,6 @@ public java.lang.String getDescription() {
      * 
      * 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".
      * 

      *
@@ -604,10 +602,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         type_ = "";
+
         subject_ = "";
+
         description_ = "";
+
         return this;
       }
 
@@ -635,26 +635,13 @@ public com.google.rpc.PreconditionFailure.Violation build() {
       public com.google.rpc.PreconditionFailure.Violation buildPartial() {
         com.google.rpc.PreconditionFailure.Violation result =
             new com.google.rpc.PreconditionFailure.Violation(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        result.type_ = type_;
+        result.subject_ = subject_;
+        result.description_ = description_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.rpc.PreconditionFailure.Violation result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.type_ = type_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.subject_ = subject_;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.description_ = description_;
-        }
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -704,17 +691,14 @@ public Builder mergeFrom(com.google.rpc.PreconditionFailure.Violation other) {
         if (other == com.google.rpc.PreconditionFailure.Violation.getDefaultInstance()) return this;
         if (!other.getType().isEmpty()) {
           type_ = other.type_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getSubject().isEmpty()) {
           subject_ = other.subject_;
-          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (!other.getDescription().isEmpty()) {
           description_ = other.description_;
-          bitField0_ |= 0x00000004;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -746,19 +730,19 @@ public Builder mergeFrom(
               case 10:
                 {
                   type_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   subject_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               case 26:
                 {
                   description_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 26
               default:
@@ -778,8 +762,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private java.lang.Object type_ = "";
 
       /**
@@ -850,8 +832,8 @@ public Builder setType(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         type_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -870,8 +852,8 @@ public Builder setType(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearType() {
+
         type_ = getDefaultInstance().getType();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -895,8 +877,8 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         type_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -971,8 +953,8 @@ public Builder setSubject(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         subject_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -991,8 +973,8 @@ public Builder setSubject(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearSubject() {
+
         subject_ = getDefaultInstance().getSubject();
-        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1016,8 +998,8 @@ public Builder setSubjectBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         subject_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1030,7 +1012,6 @@ public Builder setSubjectBytes(com.google.protobuf.ByteString value) {
        * 
        * 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".
        * 

        *
@@ -1056,7 +1037,6 @@ public java.lang.String getDescription() {
        * 
        * 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".
        * 

        *
@@ -1082,7 +1062,6 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
        * 
        * 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".
        * 

        *
@@ -1095,8 +1074,8 @@ public Builder setDescription(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         description_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1107,7 +1086,6 @@ public Builder setDescription(java.lang.String value) {
        * 
        * 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".
        * 

        *
@@ -1116,8 +1094,8 @@ public Builder setDescription(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearDescription() {
+
         description_ = getDefaultInstance().getDescription();
-        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -1128,7 +1106,6 @@ public Builder clearDescription() {
        * 
        * 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".
        * 

        *
@@ -1142,8 +1119,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         description_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1213,8 +1190,6 @@ public com.google.rpc.PreconditionFailure.Violation getDefaultInstanceForType()
   }
 
   public static final int VIOLATIONS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List violations_;
 
   /**
@@ -1453,7 +1428,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * 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.
@@ -1490,7 +1464,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (violationsBuilder_ == null) {
         violations_ = java.util.Collections.emptyList();
       } else {
@@ -1524,15 +1497,7 @@ public com.google.rpc.PreconditionFailure build() {
     @java.lang.Override
     public com.google.rpc.PreconditionFailure buildPartial() {
       com.google.rpc.PreconditionFailure result = new com.google.rpc.PreconditionFailure(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.rpc.PreconditionFailure result) {
+      int from_bitField0_ = bitField0_;
       if (violationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           violations_ = java.util.Collections.unmodifiableList(violations_);
@@ -1542,10 +1507,8 @@ private void buildPartialRepeatedFields(com.google.rpc.PreconditionFailure resul
       } else {
         result.violations_ = violationsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.rpc.PreconditionFailure result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailureOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailureOrBuilder.java
index 275e9320f9..78a7cc3e77 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailureOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailureOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 public interface PreconditionFailureOrBuilder
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 612c5e11f9..e20149be22 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 /**
@@ -24,14 +23,12 @@
  *
  * 
  * 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.
  * 

@@ -59,6 +56,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;
   }
@@ -115,7 +117,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".
      * 

@@ -134,7 +135,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".
      * 

@@ -154,7 +154,6 @@ public interface ViolationOrBuilder
      * that was called. In other words, a dependency of the called API Service
      * could be the cause of the `QuotaFailure`, and this field would have the
      * dependency API service name.
-     *
      * For example, if the called API is Kubernetes Engine API
      * (container.googleapis.com), and a quota violation occurs in the
      * Kubernetes Engine API itself, this field would be
@@ -179,7 +178,6 @@ public interface ViolationOrBuilder
      * that was called. In other words, a dependency of the called API Service
      * could be the cause of the `QuotaFailure`, and this field would have the
      * dependency API service name.
-     *
      * For example, if the called API is Kubernetes Engine API
      * (container.googleapis.com), and a quota violation occurs in the
      * Kubernetes Engine API itself, this field would be
@@ -203,7 +201,6 @@ public interface ViolationOrBuilder
      * measure usage, such as API requests or CPUs. When an activity occurs in a
      * service, such as Virtual Machine allocation, one or more quota metrics
      * may be affected.
-     *
      * For example, "compute.googleapis.com/cpus_per_vm_family",
      * "storage.googleapis.com/internet_egress_bandwidth".
      * 

@@ -222,7 +219,6 @@ public interface ViolationOrBuilder
      * measure usage, such as API requests or CPUs. When an activity occurs in a
      * service, such as Virtual Machine allocation, one or more quota metrics
      * may be affected.
-     *
      * For example, "compute.googleapis.com/cpus_per_vm_family",
      * "storage.googleapis.com/internet_egress_bandwidth".
      * 

@@ -239,7 +235,6 @@ public interface ViolationOrBuilder
      * 
      * The id of the violated quota. Also know as "limit name", this is the
      * unique identifier of a quota in the context of an API service.
-     *
      * For example, "CPUS-PER-VM-FAMILY-per-project-region".
      * 

      *
@@ -255,7 +250,6 @@ public interface ViolationOrBuilder
      * 
      * The id of the violated quota. Also know as "limit name", this is the
      * unique identifier of a quota in the context of an API service.
-     *
      * For example, "CPUS-PER-VM-FAMILY-per-project-region".
      * 

      *
@@ -272,17 +266,14 @@ public interface ViolationOrBuilder
      * The dimensions of the violated quota. Every non-global quota is enforced
      * on a set of dimensions. While quota metric defines what to count, the
      * dimensions specify for what aspects the counter should be increased.
-     *
      * For example, the quota "CPUs per region per VM family" enforces a limit
      * on the metric "compute.googleapis.com/cpus_per_vm_family" on dimensions
      * "region" and "vm_family". And if the violation occurred in region
      * "us-central1" and for VM family "n1", the quota_dimensions would be,
-     *
      * {
      *   "region": "us-central1",
      *   "vm_family": "n1",
      * }
-     *
      * When a quota is enforced globally, the quota_dimensions would always be
      * empty.
      * 

@@ -298,17 +289,14 @@ public interface ViolationOrBuilder
      * The dimensions of the violated quota. Every non-global quota is enforced
      * on a set of dimensions. While quota metric defines what to count, the
      * dimensions specify for what aspects the counter should be increased.
-     *
      * For example, the quota "CPUs per region per VM family" enforces a limit
      * on the metric "compute.googleapis.com/cpus_per_vm_family" on dimensions
      * "region" and "vm_family". And if the violation occurred in region
      * "us-central1" and for VM family "n1", the quota_dimensions would be,
-     *
      * {
      *   "region": "us-central1",
      *   "vm_family": "n1",
      * }
-     *
      * When a quota is enforced globally, the quota_dimensions would always be
      * empty.
      * 

@@ -328,17 +316,14 @@ public interface ViolationOrBuilder
      * The dimensions of the violated quota. Every non-global quota is enforced
      * on a set of dimensions. While quota metric defines what to count, the
      * dimensions specify for what aspects the counter should be increased.
-     *
      * For example, the quota "CPUs per region per VM family" enforces a limit
      * on the metric "compute.googleapis.com/cpus_per_vm_family" on dimensions
      * "region" and "vm_family". And if the violation occurred in region
      * "us-central1" and for VM family "n1", the quota_dimensions would be,
-     *
      * {
      *   "region": "us-central1",
      *   "vm_family": "n1",
      * }
-     *
      * When a quota is enforced globally, the quota_dimensions would always be
      * empty.
      * 

@@ -354,23 +339,21 @@ public interface ViolationOrBuilder
      * The dimensions of the violated quota. Every non-global quota is enforced
      * on a set of dimensions. While quota metric defines what to count, the
      * dimensions specify for what aspects the counter should be increased.
-     *
      * For example, the quota "CPUs per region per VM family" enforces a limit
      * on the metric "compute.googleapis.com/cpus_per_vm_family" on dimensions
      * "region" and "vm_family". And if the violation occurred in region
      * "us-central1" and for VM family "n1", the quota_dimensions would be,
-     *
      * {
      *   "region": "us-central1",
      *   "vm_family": "n1",
      * }
-     *
      * When a quota is enforced globally, the quota_dimensions would always be
      * empty.
      * 

      *
      * map<string, string> quota_dimensions = 6;
      */
+
     /* nullable */
     java.lang.String getQuotaDimensionsOrDefault(
         java.lang.String key,
@@ -384,17 +367,14 @@ java.lang.String getQuotaDimensionsOrDefault(
      * The dimensions of the violated quota. Every non-global quota is enforced
      * on a set of dimensions. While quota metric defines what to count, the
      * dimensions specify for what aspects the counter should be increased.
-     *
      * For example, the quota "CPUs per region per VM family" enforces a limit
      * on the metric "compute.googleapis.com/cpus_per_vm_family" on dimensions
      * "region" and "vm_family". And if the violation occurred in region
      * "us-central1" and for VM family "n1", the quota_dimensions would be,
-     *
      * {
      *   "region": "us-central1",
      *   "vm_family": "n1",
      * }
-     *
      * When a quota is enforced globally, the quota_dimensions would always be
      * empty.
      * 

@@ -408,7 +388,6 @@ java.lang.String getQuotaDimensionsOrDefault(
      *
      * 
      * The enforced quota value at the time of the `QuotaFailure`.
-     *
      * For example, if the enforced quota value at the time of the
      * `QuotaFailure` on the number of CPUs is "10", then the value of this
      * field would reflect this quantity.
@@ -428,7 +407,6 @@ java.lang.String getQuotaDimensionsOrDefault(
      * completion of the rollout, this value will be enforced in place of
      * quota_value. If no rollout is in progress at the time of the violation,
      * this field is not set.
-     *
      * For example, if at the time of the violation a rollout is in progress
      * changing the number of CPUs quota from 10 to 20, 20 would be the value of
      * this field.
@@ -448,7 +426,6 @@ java.lang.String getQuotaDimensionsOrDefault(
      * completion of the rollout, this value will be enforced in place of
      * quota_value. If no rollout is in progress at the time of the violation,
      * this field is not set.
-     *
      * For example, if at the time of the violation a rollout is in progress
      * changing the number of CPUs quota from 10 to 20, 20 would be the value of
      * this field.
@@ -496,6 +473,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;
@@ -503,8 +485,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @SuppressWarnings({"rawtypes"})
     @java.lang.Override
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 6:
           return internalGetQuotaDimensions();
@@ -525,9 +506,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
 
     private int bitField0_;
     public static final int SUBJECT_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object subject_ = "";
+    private volatile java.lang.Object subject_;
 
     /**
      *
@@ -582,9 +561,7 @@ public com.google.protobuf.ByteString getSubjectBytes() {
     }
 
     public static final int DESCRIPTION_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object description_ = "";
+    private volatile java.lang.Object description_;
 
     /**
      *
@@ -594,7 +571,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".
      * 

@@ -624,7 +600,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".
      * 

@@ -647,9 +622,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
     }
 
     public static final int API_SERVICE_FIELD_NUMBER = 3;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object apiService_ = "";
+    private volatile java.lang.Object apiService_;
 
     /**
      *
@@ -660,7 +633,6 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
      * that was called. In other words, a dependency of the called API Service
      * could be the cause of the `QuotaFailure`, and this field would have the
      * dependency API service name.
-     *
      * For example, if the called API is Kubernetes Engine API
      * (container.googleapis.com), and a quota violation occurs in the
      * Kubernetes Engine API itself, this field would be
@@ -696,7 +668,6 @@ public java.lang.String getApiService() {
      * that was called. In other words, a dependency of the called API Service
      * could be the cause of the `QuotaFailure`, and this field would have the
      * dependency API service name.
-     *
      * For example, if the called API is Kubernetes Engine API
      * (container.googleapis.com), and a quota violation occurs in the
      * Kubernetes Engine API itself, this field would be
@@ -724,9 +695,7 @@ public com.google.protobuf.ByteString getApiServiceBytes() {
     }
 
     public static final int QUOTA_METRIC_FIELD_NUMBER = 4;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object quotaMetric_ = "";
+    private volatile java.lang.Object quotaMetric_;
 
     /**
      *
@@ -736,7 +705,6 @@ public com.google.protobuf.ByteString getApiServiceBytes() {
      * measure usage, such as API requests or CPUs. When an activity occurs in a
      * service, such as Virtual Machine allocation, one or more quota metrics
      * may be affected.
-     *
      * For example, "compute.googleapis.com/cpus_per_vm_family",
      * "storage.googleapis.com/internet_egress_bandwidth".
      * 

@@ -766,7 +734,6 @@ public java.lang.String getQuotaMetric() {
      * measure usage, such as API requests or CPUs. When an activity occurs in a
      * service, such as Virtual Machine allocation, one or more quota metrics
      * may be affected.
-     *
      * For example, "compute.googleapis.com/cpus_per_vm_family",
      * "storage.googleapis.com/internet_egress_bandwidth".
      * 

@@ -789,9 +756,7 @@ public com.google.protobuf.ByteString getQuotaMetricBytes() {
     }
 
     public static final int QUOTA_ID_FIELD_NUMBER = 5;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object quotaId_ = "";
+    private volatile java.lang.Object quotaId_;
 
     /**
      *
@@ -799,7 +764,6 @@ public com.google.protobuf.ByteString getQuotaMetricBytes() {
      * 
      * The id of the violated quota. Also know as "limit name", this is the
      * unique identifier of a quota in the context of an API service.
-     *
      * For example, "CPUS-PER-VM-FAMILY-per-project-region".
      * 

      *
@@ -826,7 +790,6 @@ public java.lang.String getQuotaId() {
      * 
      * The id of the violated quota. Also know as "limit name", this is the
      * unique identifier of a quota in the context of an API service.
-     *
      * For example, "CPUS-PER-VM-FAMILY-per-project-region".
      * 

      *
@@ -860,7 +823,6 @@ private static final class QuotaDimensionsDefaultEntryHolder {
               "");
     }
 
-    @SuppressWarnings("serial")
     private com.google.protobuf.MapField quotaDimensions_;
 
     private com.google.protobuf.MapField
@@ -883,17 +845,14 @@ public int getQuotaDimensionsCount() {
      * The dimensions of the violated quota. Every non-global quota is enforced
      * on a set of dimensions. While quota metric defines what to count, the
      * dimensions specify for what aspects the counter should be increased.
-     *
      * For example, the quota "CPUs per region per VM family" enforces a limit
      * on the metric "compute.googleapis.com/cpus_per_vm_family" on dimensions
      * "region" and "vm_family". And if the violation occurred in region
      * "us-central1" and for VM family "n1", the quota_dimensions would be,
-     *
      * {
      *   "region": "us-central1",
      *   "vm_family": "n1",
      * }
-     *
      * When a quota is enforced globally, the quota_dimensions would always be
      * empty.
      * 

@@ -922,17 +881,14 @@ public java.util.Map getQuotaDimensions() {
      * The dimensions of the violated quota. Every non-global quota is enforced
      * on a set of dimensions. While quota metric defines what to count, the
      * dimensions specify for what aspects the counter should be increased.
-     *
      * For example, the quota "CPUs per region per VM family" enforces a limit
      * on the metric "compute.googleapis.com/cpus_per_vm_family" on dimensions
      * "region" and "vm_family". And if the violation occurred in region
      * "us-central1" and for VM family "n1", the quota_dimensions would be,
-     *
      * {
      *   "region": "us-central1",
      *   "vm_family": "n1",
      * }
-     *
      * When a quota is enforced globally, the quota_dimensions would always be
      * empty.
      * 

@@ -951,17 +907,14 @@ public java.util.Map getQuotaDimensionsMap()
      * The dimensions of the violated quota. Every non-global quota is enforced
      * on a set of dimensions. While quota metric defines what to count, the
      * dimensions specify for what aspects the counter should be increased.
-     *
      * For example, the quota "CPUs per region per VM family" enforces a limit
      * on the metric "compute.googleapis.com/cpus_per_vm_family" on dimensions
      * "region" and "vm_family". And if the violation occurred in region
      * "us-central1" and for VM family "n1", the quota_dimensions would be,
-     *
      * {
      *   "region": "us-central1",
      *   "vm_family": "n1",
      * }
-     *
      * When a quota is enforced globally, the quota_dimensions would always be
      * empty.
      * 

@@ -969,10 +922,8 @@ public java.util.Map getQuotaDimensionsMap()
      * map<string, string> quota_dimensions = 6;
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getQuotaDimensionsOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getQuotaDimensionsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -987,17 +938,14 @@ public java.util.Map getQuotaDimensionsMap()
      * The dimensions of the violated quota. Every non-global quota is enforced
      * on a set of dimensions. While quota metric defines what to count, the
      * dimensions specify for what aspects the counter should be increased.
-     *
      * For example, the quota "CPUs per region per VM family" enforces a limit
      * on the metric "compute.googleapis.com/cpus_per_vm_family" on dimensions
      * "region" and "vm_family". And if the violation occurred in region
      * "us-central1" and for VM family "n1", the quota_dimensions would be,
-     *
      * {
      *   "region": "us-central1",
      *   "vm_family": "n1",
      * }
-     *
      * When a quota is enforced globally, the quota_dimensions would always be
      * empty.
      * 

@@ -1017,14 +965,13 @@ public java.lang.String getQuotaDimensionsOrThrow(java.lang.String key) {
     }
 
     public static final int QUOTA_VALUE_FIELD_NUMBER = 7;
-    private long quotaValue_ = 0L;
+    private long quotaValue_;
 
     /**
      *
      *
      * 
      * The enforced quota value at the time of the `QuotaFailure`.
-     *
      * For example, if the enforced quota value at the time of the
      * `QuotaFailure` on the number of CPUs is "10", then the value of this
      * field would reflect this quantity.
@@ -1040,7 +987,7 @@ public long getQuotaValue() {
     }
 
     public static final int FUTURE_QUOTA_VALUE_FIELD_NUMBER = 8;
-    private long futureQuotaValue_ = 0L;
+    private long futureQuotaValue_;
 
     /**
      *
@@ -1050,7 +997,6 @@ public long getQuotaValue() {
      * completion of the rollout, this value will be enforced in place of
      * quota_value. If no rollout is in progress at the time of the violation,
      * this field is not set.
-     *
      * For example, if at the time of the violation a rollout is in progress
      * changing the number of CPUs quota from 10 to 20, 20 would be the value of
      * this field.
@@ -1073,7 +1019,6 @@ public boolean hasFutureQuotaValue() {
      * completion of the rollout, this value will be enforced in place of
      * quota_value. If no rollout is in progress at the time of the violation,
      * this field is not set.
-     *
      * For example, if at the time of the violation a rollout is in progress
      * changing the number of CPUs quota from 10 to 20, 20 would be the value of
      * this field.
@@ -1345,8 +1290,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-          int number) {
+      protected com.google.protobuf.MapField internalGetMapField(int number) {
         switch (number) {
           case 6:
             return internalGetQuotaDimensions();
@@ -1356,8 +1300,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
       }
 
       @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-          int number) {
+      protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
         switch (number) {
           case 6:
             return internalGetMutableQuotaDimensions();
@@ -1386,15 +1329,21 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         subject_ = "";
+
         description_ = "";
+
         apiService_ = "";
+
         quotaMetric_ = "";
+
         quotaId_ = "";
+
         internalGetMutableQuotaDimensions().clear();
         quotaValue_ = 0L;
+
         futureQuotaValue_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -1422,43 +1371,23 @@ public com.google.rpc.QuotaFailure.Violation build() {
       public com.google.rpc.QuotaFailure.Violation buildPartial() {
         com.google.rpc.QuotaFailure.Violation result =
             new com.google.rpc.QuotaFailure.Violation(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
-        onBuilt();
-        return result;
-      }
-
-      private void buildPartial0(com.google.rpc.QuotaFailure.Violation result) {
         int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.subject_ = subject_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.description_ = description_;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.apiService_ = apiService_;
-        }
-        if (((from_bitField0_ & 0x00000008) != 0)) {
-          result.quotaMetric_ = quotaMetric_;
-        }
-        if (((from_bitField0_ & 0x00000010) != 0)) {
-          result.quotaId_ = quotaId_;
-        }
-        if (((from_bitField0_ & 0x00000020) != 0)) {
-          result.quotaDimensions_ = internalGetQuotaDimensions();
-          result.quotaDimensions_.makeImmutable();
-        }
-        if (((from_bitField0_ & 0x00000040) != 0)) {
-          result.quotaValue_ = quotaValue_;
-        }
         int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000080) != 0)) {
+        result.subject_ = subject_;
+        result.description_ = description_;
+        result.apiService_ = apiService_;
+        result.quotaMetric_ = quotaMetric_;
+        result.quotaId_ = quotaId_;
+        result.quotaDimensions_ = internalGetQuotaDimensions();
+        result.quotaDimensions_.makeImmutable();
+        result.quotaValue_ = quotaValue_;
+        if (((from_bitField0_ & 0x00000002) != 0)) {
           result.futureQuotaValue_ = futureQuotaValue_;
           to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ |= to_bitField0_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
       }
 
       @java.lang.Override
@@ -1510,31 +1439,25 @@ public Builder mergeFrom(com.google.rpc.QuotaFailure.Violation other) {
         if (other == com.google.rpc.QuotaFailure.Violation.getDefaultInstance()) return this;
         if (!other.getSubject().isEmpty()) {
           subject_ = other.subject_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getDescription().isEmpty()) {
           description_ = other.description_;
-          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (!other.getApiService().isEmpty()) {
           apiService_ = other.apiService_;
-          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (!other.getQuotaMetric().isEmpty()) {
           quotaMetric_ = other.quotaMetric_;
-          bitField0_ |= 0x00000008;
           onChanged();
         }
         if (!other.getQuotaId().isEmpty()) {
           quotaId_ = other.quotaId_;
-          bitField0_ |= 0x00000010;
           onChanged();
         }
         internalGetMutableQuotaDimensions().mergeFrom(other.internalGetQuotaDimensions());
-        bitField0_ |= 0x00000020;
         if (other.getQuotaValue() != 0L) {
           setQuotaValue(other.getQuotaValue());
         }
@@ -1570,31 +1493,31 @@ public Builder mergeFrom(
               case 10:
                 {
                   subject_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   description_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               case 26:
                 {
                   apiService_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 26
               case 34:
                 {
                   quotaMetric_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000008;
+
                   break;
                 } // case 34
               case 42:
                 {
                   quotaId_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000010;
+
                   break;
                 } // case 42
               case 50:
@@ -1607,19 +1530,18 @@ public Builder mergeFrom(
                   internalGetMutableQuotaDimensions()
                       .getMutableMap()
                       .put(quotaDimensions__.getKey(), quotaDimensions__.getValue());
-                  bitField0_ |= 0x00000020;
                   break;
                 } // case 50
               case 56:
                 {
                   quotaValue_ = input.readInt64();
-                  bitField0_ |= 0x00000040;
+
                   break;
                 } // case 56
               case 64:
                 {
                   futureQuotaValue_ = input.readInt64();
-                  bitField0_ |= 0x00000080;
+                  bitField0_ |= 0x00000002;
                   break;
                 } // case 64
               default:
@@ -1711,8 +1633,8 @@ public Builder setSubject(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         subject_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1731,8 +1653,8 @@ public Builder setSubject(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearSubject() {
+
         subject_ = getDefaultInstance().getSubject();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1756,8 +1678,8 @@ public Builder setSubjectBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         subject_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1772,7 +1694,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".
        * 

@@ -1801,7 +1722,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".
        * 

@@ -1830,7 +1750,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".
        * 

@@ -1844,8 +1763,8 @@ public Builder setDescription(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         description_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1858,7 +1777,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".
        * 

@@ -1868,8 +1786,8 @@ public Builder setDescription(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearDescription() {
+
         description_ = getDefaultInstance().getDescription();
-        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1882,7 +1800,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".
        * 

@@ -1897,8 +1814,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         description_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1914,7 +1831,6 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
        * that was called. In other words, a dependency of the called API Service
        * could be the cause of the `QuotaFailure`, and this field would have the
        * dependency API service name.
-       *
        * For example, if the called API is Kubernetes Engine API
        * (container.googleapis.com), and a quota violation occurs in the
        * Kubernetes Engine API itself, this field would be
@@ -1949,7 +1865,6 @@ public java.lang.String getApiService() {
        * that was called. In other words, a dependency of the called API Service
        * could be the cause of the `QuotaFailure`, and this field would have the
        * dependency API service name.
-       *
        * For example, if the called API is Kubernetes Engine API
        * (container.googleapis.com), and a quota violation occurs in the
        * Kubernetes Engine API itself, this field would be
@@ -1984,7 +1899,6 @@ public com.google.protobuf.ByteString getApiServiceBytes() {
        * that was called. In other words, a dependency of the called API Service
        * could be the cause of the `QuotaFailure`, and this field would have the
        * dependency API service name.
-       *
        * For example, if the called API is Kubernetes Engine API
        * (container.googleapis.com), and a quota violation occurs in the
        * Kubernetes Engine API itself, this field would be
@@ -2003,8 +1917,8 @@ public Builder setApiService(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         apiService_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -2018,7 +1932,6 @@ public Builder setApiService(java.lang.String value) {
        * that was called. In other words, a dependency of the called API Service
        * could be the cause of the `QuotaFailure`, and this field would have the
        * dependency API service name.
-       *
        * For example, if the called API is Kubernetes Engine API
        * (container.googleapis.com), and a quota violation occurs in the
        * Kubernetes Engine API itself, this field would be
@@ -2033,8 +1946,8 @@ public Builder setApiService(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearApiService() {
+
         apiService_ = getDefaultInstance().getApiService();
-        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -2048,7 +1961,6 @@ public Builder clearApiService() {
        * that was called. In other words, a dependency of the called API Service
        * could be the cause of the `QuotaFailure`, and this field would have the
        * dependency API service name.
-       *
        * For example, if the called API is Kubernetes Engine API
        * (container.googleapis.com), and a quota violation occurs in the
        * Kubernetes Engine API itself, this field would be
@@ -2068,8 +1980,8 @@ public Builder setApiServiceBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         apiService_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -2084,7 +1996,6 @@ public Builder setApiServiceBytes(com.google.protobuf.ByteString value) {
        * measure usage, such as API requests or CPUs. When an activity occurs in a
        * service, such as Virtual Machine allocation, one or more quota metrics
        * may be affected.
-       *
        * For example, "compute.googleapis.com/cpus_per_vm_family",
        * "storage.googleapis.com/internet_egress_bandwidth".
        * 

@@ -2113,7 +2024,6 @@ public java.lang.String getQuotaMetric() {
        * measure usage, such as API requests or CPUs. When an activity occurs in a
        * service, such as Virtual Machine allocation, one or more quota metrics
        * may be affected.
-       *
        * For example, "compute.googleapis.com/cpus_per_vm_family",
        * "storage.googleapis.com/internet_egress_bandwidth".
        * 

@@ -2142,7 +2052,6 @@ public com.google.protobuf.ByteString getQuotaMetricBytes() {
        * measure usage, such as API requests or CPUs. When an activity occurs in a
        * service, such as Virtual Machine allocation, one or more quota metrics
        * may be affected.
-       *
        * For example, "compute.googleapis.com/cpus_per_vm_family",
        * "storage.googleapis.com/internet_egress_bandwidth".
        * 

@@ -2156,8 +2065,8 @@ public Builder setQuotaMetric(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         quotaMetric_ = value;
-        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -2170,7 +2079,6 @@ public Builder setQuotaMetric(java.lang.String value) {
        * measure usage, such as API requests or CPUs. When an activity occurs in a
        * service, such as Virtual Machine allocation, one or more quota metrics
        * may be affected.
-       *
        * For example, "compute.googleapis.com/cpus_per_vm_family",
        * "storage.googleapis.com/internet_egress_bandwidth".
        * 

@@ -2180,8 +2088,8 @@ public Builder setQuotaMetric(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearQuotaMetric() {
+
         quotaMetric_ = getDefaultInstance().getQuotaMetric();
-        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -2194,7 +2102,6 @@ public Builder clearQuotaMetric() {
        * measure usage, such as API requests or CPUs. When an activity occurs in a
        * service, such as Virtual Machine allocation, one or more quota metrics
        * may be affected.
-       *
        * For example, "compute.googleapis.com/cpus_per_vm_family",
        * "storage.googleapis.com/internet_egress_bandwidth".
        * 

@@ -2209,8 +2116,8 @@ public Builder setQuotaMetricBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         quotaMetric_ = value;
-        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -2223,7 +2130,6 @@ public Builder setQuotaMetricBytes(com.google.protobuf.ByteString value) {
        * 
        * The id of the violated quota. Also know as "limit name", this is the
        * unique identifier of a quota in the context of an API service.
-       *
        * For example, "CPUS-PER-VM-FAMILY-per-project-region".
        * 

        *
@@ -2249,7 +2155,6 @@ public java.lang.String getQuotaId() {
        * 
        * The id of the violated quota. Also know as "limit name", this is the
        * unique identifier of a quota in the context of an API service.
-       *
        * For example, "CPUS-PER-VM-FAMILY-per-project-region".
        * 

        *
@@ -2275,7 +2180,6 @@ public com.google.protobuf.ByteString getQuotaIdBytes() {
        * 
        * The id of the violated quota. Also know as "limit name", this is the
        * unique identifier of a quota in the context of an API service.
-       *
        * For example, "CPUS-PER-VM-FAMILY-per-project-region".
        * 

        *
@@ -2288,8 +2192,8 @@ public Builder setQuotaId(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         quotaId_ = value;
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -2300,7 +2204,6 @@ public Builder setQuotaId(java.lang.String value) {
        * 
        * The id of the violated quota. Also know as "limit name", this is the
        * unique identifier of a quota in the context of an API service.
-       *
        * For example, "CPUS-PER-VM-FAMILY-per-project-region".
        * 

        *
@@ -2309,8 +2212,8 @@ public Builder setQuotaId(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearQuotaId() {
+
         quotaId_ = getDefaultInstance().getQuotaId();
-        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
       }
@@ -2321,7 +2224,6 @@ public Builder clearQuotaId() {
        * 
        * The id of the violated quota. Also know as "limit name", this is the
        * unique identifier of a quota in the context of an API service.
-       *
        * For example, "CPUS-PER-VM-FAMILY-per-project-region".
        * 

        *
@@ -2335,8 +2237,8 @@ public Builder setQuotaIdBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         quotaId_ = value;
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -2354,6 +2256,8 @@ public Builder setQuotaIdBytes(com.google.protobuf.ByteString value) {
 
       private com.google.protobuf.MapField
           internalGetMutableQuotaDimensions() {
+        onChanged();
+        ;
         if (quotaDimensions_ == null) {
           quotaDimensions_ =
               com.google.protobuf.MapField.newMapField(
@@ -2362,8 +2266,6 @@ public Builder setQuotaIdBytes(com.google.protobuf.ByteString value) {
         if (!quotaDimensions_.isMutable()) {
           quotaDimensions_ = quotaDimensions_.copy();
         }
-        bitField0_ |= 0x00000020;
-        onChanged();
         return quotaDimensions_;
       }
 
@@ -2378,17 +2280,14 @@ public int getQuotaDimensionsCount() {
        * The dimensions of the violated quota. Every non-global quota is enforced
        * on a set of dimensions. While quota metric defines what to count, the
        * dimensions specify for what aspects the counter should be increased.
-       *
        * For example, the quota "CPUs per region per VM family" enforces a limit
        * on the metric "compute.googleapis.com/cpus_per_vm_family" on dimensions
        * "region" and "vm_family". And if the violation occurred in region
        * "us-central1" and for VM family "n1", the quota_dimensions would be,
-       *
        * {
        *   "region": "us-central1",
        *   "vm_family": "n1",
        * }
-       *
        * When a quota is enforced globally, the quota_dimensions would always be
        * empty.
        * 

@@ -2417,17 +2316,14 @@ public java.util.Map getQuotaDimensions() {
        * The dimensions of the violated quota. Every non-global quota is enforced
        * on a set of dimensions. While quota metric defines what to count, the
        * dimensions specify for what aspects the counter should be increased.
-       *
        * For example, the quota "CPUs per region per VM family" enforces a limit
        * on the metric "compute.googleapis.com/cpus_per_vm_family" on dimensions
        * "region" and "vm_family". And if the violation occurred in region
        * "us-central1" and for VM family "n1", the quota_dimensions would be,
-       *
        * {
        *   "region": "us-central1",
        *   "vm_family": "n1",
        * }
-       *
        * When a quota is enforced globally, the quota_dimensions would always be
        * empty.
        * 

@@ -2446,17 +2342,14 @@ public java.util.Map getQuotaDimensionsMap()
        * The dimensions of the violated quota. Every non-global quota is enforced
        * on a set of dimensions. While quota metric defines what to count, the
        * dimensions specify for what aspects the counter should be increased.
-       *
        * For example, the quota "CPUs per region per VM family" enforces a limit
        * on the metric "compute.googleapis.com/cpus_per_vm_family" on dimensions
        * "region" and "vm_family". And if the violation occurred in region
        * "us-central1" and for VM family "n1", the quota_dimensions would be,
-       *
        * {
        *   "region": "us-central1",
        *   "vm_family": "n1",
        * }
-       *
        * When a quota is enforced globally, the quota_dimensions would always be
        * empty.
        * 

@@ -2464,10 +2357,8 @@ public java.util.Map getQuotaDimensionsMap()
        * map<string, string> quota_dimensions = 6;
        */
       @java.lang.Override
-      public /* nullable */ java.lang.String getQuotaDimensionsOrDefault(
-          java.lang.String key,
-          /* nullable */
-          java.lang.String defaultValue) {
+      public java.lang.String getQuotaDimensionsOrDefault(
+          java.lang.String key, java.lang.String defaultValue) {
         if (key == null) {
           throw new NullPointerException("map key");
         }
@@ -2483,17 +2374,14 @@ public java.util.Map getQuotaDimensionsMap()
        * The dimensions of the violated quota. Every non-global quota is enforced
        * on a set of dimensions. While quota metric defines what to count, the
        * dimensions specify for what aspects the counter should be increased.
-       *
        * For example, the quota "CPUs per region per VM family" enforces a limit
        * on the metric "compute.googleapis.com/cpus_per_vm_family" on dimensions
        * "region" and "vm_family". And if the violation occurred in region
        * "us-central1" and for VM family "n1", the quota_dimensions would be,
-       *
        * {
        *   "region": "us-central1",
        *   "vm_family": "n1",
        * }
-       *
        * When a quota is enforced globally, the quota_dimensions would always be
        * empty.
        * 

@@ -2514,7 +2402,6 @@ public java.lang.String getQuotaDimensionsOrThrow(java.lang.String key) {
       }
 
       public Builder clearQuotaDimensions() {
-        bitField0_ = (bitField0_ & ~0x00000020);
         internalGetMutableQuotaDimensions().getMutableMap().clear();
         return this;
       }
@@ -2526,17 +2413,14 @@ public Builder clearQuotaDimensions() {
        * The dimensions of the violated quota. Every non-global quota is enforced
        * on a set of dimensions. While quota metric defines what to count, the
        * dimensions specify for what aspects the counter should be increased.
-       *
        * For example, the quota "CPUs per region per VM family" enforces a limit
        * on the metric "compute.googleapis.com/cpus_per_vm_family" on dimensions
        * "region" and "vm_family". And if the violation occurred in region
        * "us-central1" and for VM family "n1", the quota_dimensions would be,
-       *
        * {
        *   "region": "us-central1",
        *   "vm_family": "n1",
        * }
-       *
        * When a quota is enforced globally, the quota_dimensions would always be
        * empty.
        * 

@@ -2554,7 +2438,6 @@ public Builder removeQuotaDimensions(java.lang.String key) {
       /** Use alternate mutation accessors instead. */
       @java.lang.Deprecated
       public java.util.Map getMutableQuotaDimensions() {
-        bitField0_ |= 0x00000020;
         return internalGetMutableQuotaDimensions().getMutableMap();
       }
 
@@ -2565,17 +2448,14 @@ public java.util.Map getMutableQuotaDimensio
        * The dimensions of the violated quota. Every non-global quota is enforced
        * on a set of dimensions. While quota metric defines what to count, the
        * dimensions specify for what aspects the counter should be increased.
-       *
        * For example, the quota "CPUs per region per VM family" enforces a limit
        * on the metric "compute.googleapis.com/cpus_per_vm_family" on dimensions
        * "region" and "vm_family". And if the violation occurred in region
        * "us-central1" and for VM family "n1", the quota_dimensions would be,
-       *
        * {
        *   "region": "us-central1",
        *   "vm_family": "n1",
        * }
-       *
        * When a quota is enforced globally, the quota_dimensions would always be
        * empty.
        * 

@@ -2589,8 +2469,8 @@ public Builder putQuotaDimensions(java.lang.String key, java.lang.String value)
         if (value == null) {
           throw new NullPointerException("map value");
         }
+
         internalGetMutableQuotaDimensions().getMutableMap().put(key, value);
-        bitField0_ |= 0x00000020;
         return this;
       }
 
@@ -2601,17 +2481,14 @@ public Builder putQuotaDimensions(java.lang.String key, java.lang.String value)
        * The dimensions of the violated quota. Every non-global quota is enforced
        * on a set of dimensions. While quota metric defines what to count, the
        * dimensions specify for what aspects the counter should be increased.
-       *
        * For example, the quota "CPUs per region per VM family" enforces a limit
        * on the metric "compute.googleapis.com/cpus_per_vm_family" on dimensions
        * "region" and "vm_family". And if the violation occurred in region
        * "us-central1" and for VM family "n1", the quota_dimensions would be,
-       *
        * {
        *   "region": "us-central1",
        *   "vm_family": "n1",
        * }
-       *
        * When a quota is enforced globally, the quota_dimensions would always be
        * empty.
        * 

@@ -2621,7 +2498,6 @@ public Builder putQuotaDimensions(java.lang.String key, java.lang.String value)
       public Builder putAllQuotaDimensions(
           java.util.Map values) {
         internalGetMutableQuotaDimensions().getMutableMap().putAll(values);
-        bitField0_ |= 0x00000020;
         return this;
       }
 
@@ -2632,7 +2508,6 @@ public Builder putAllQuotaDimensions(
        *
        * 
        * The enforced quota value at the time of the `QuotaFailure`.
-       *
        * For example, if the enforced quota value at the time of the
        * `QuotaFailure` on the number of CPUs is "10", then the value of this
        * field would reflect this quantity.
@@ -2652,7 +2527,6 @@ public long getQuotaValue() {
        *
        * 
        * The enforced quota value at the time of the `QuotaFailure`.
-       *
        * For example, if the enforced quota value at the time of the
        * `QuotaFailure` on the number of CPUs is "10", then the value of this
        * field would reflect this quantity.
@@ -2666,7 +2540,6 @@ public long getQuotaValue() {
       public Builder setQuotaValue(long value) {
 
         quotaValue_ = value;
-        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -2676,7 +2549,6 @@ public Builder setQuotaValue(long value) {
        *
        * 
        * The enforced quota value at the time of the `QuotaFailure`.
-       *
        * For example, if the enforced quota value at the time of the
        * `QuotaFailure` on the number of CPUs is "10", then the value of this
        * field would reflect this quantity.
@@ -2687,7 +2559,7 @@ public Builder setQuotaValue(long value) {
        * @return This builder for chaining.
        */
       public Builder clearQuotaValue() {
-        bitField0_ = (bitField0_ & ~0x00000040);
+
         quotaValue_ = 0L;
         onChanged();
         return this;
@@ -2703,7 +2575,6 @@ public Builder clearQuotaValue() {
        * completion of the rollout, this value will be enforced in place of
        * quota_value. If no rollout is in progress at the time of the violation,
        * this field is not set.
-       *
        * For example, if at the time of the violation a rollout is in progress
        * changing the number of CPUs quota from 10 to 20, 20 would be the value of
        * this field.
@@ -2715,7 +2586,7 @@ public Builder clearQuotaValue() {
        */
       @java.lang.Override
       public boolean hasFutureQuotaValue() {
-        return ((bitField0_ & 0x00000080) != 0);
+        return ((bitField0_ & 0x00000002) != 0);
       }
 
       /**
@@ -2726,7 +2597,6 @@ public boolean hasFutureQuotaValue() {
        * completion of the rollout, this value will be enforced in place of
        * quota_value. If no rollout is in progress at the time of the violation,
        * this field is not set.
-       *
        * For example, if at the time of the violation a rollout is in progress
        * changing the number of CPUs quota from 10 to 20, 20 would be the value of
        * this field.
@@ -2749,7 +2619,6 @@ public long getFutureQuotaValue() {
        * completion of the rollout, this value will be enforced in place of
        * quota_value. If no rollout is in progress at the time of the violation,
        * this field is not set.
-       *
        * For example, if at the time of the violation a rollout is in progress
        * changing the number of CPUs quota from 10 to 20, 20 would be the value of
        * this field.
@@ -2761,9 +2630,8 @@ public long getFutureQuotaValue() {
        * @return This builder for chaining.
        */
       public Builder setFutureQuotaValue(long value) {
-
+        bitField0_ |= 0x00000002;
         futureQuotaValue_ = value;
-        bitField0_ |= 0x00000080;
         onChanged();
         return this;
       }
@@ -2776,7 +2644,6 @@ public Builder setFutureQuotaValue(long value) {
        * completion of the rollout, this value will be enforced in place of
        * quota_value. If no rollout is in progress at the time of the violation,
        * this field is not set.
-       *
        * For example, if at the time of the violation a rollout is in progress
        * changing the number of CPUs quota from 10 to 20, 20 would be the value of
        * this field.
@@ -2787,7 +2654,7 @@ public Builder setFutureQuotaValue(long value) {
        * @return This builder for chaining.
        */
       public Builder clearFutureQuotaValue() {
-        bitField0_ = (bitField0_ & ~0x00000080);
+        bitField0_ = (bitField0_ & ~0x00000002);
         futureQuotaValue_ = 0L;
         onChanged();
         return this;
@@ -2858,8 +2725,6 @@ public com.google.rpc.QuotaFailure.Violation getDefaultInstanceForType() {
   }
 
   public static final int VIOLATIONS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List violations_;
 
   /**
@@ -3098,14 +2963,12 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * 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.
    * 

@@ -3139,7 +3002,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (violationsBuilder_ == null) {
         violations_ = java.util.Collections.emptyList();
       } else {
@@ -3172,15 +3034,7 @@ public com.google.rpc.QuotaFailure build() {
     @java.lang.Override
     public com.google.rpc.QuotaFailure buildPartial() {
       com.google.rpc.QuotaFailure result = new com.google.rpc.QuotaFailure(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.rpc.QuotaFailure result) {
+      int from_bitField0_ = bitField0_;
       if (violationsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           violations_ = java.util.Collections.unmodifiableList(violations_);
@@ -3190,10 +3044,8 @@ private void buildPartialRepeatedFields(com.google.rpc.QuotaFailure result) {
       } else {
         result.violations_ = violationsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.rpc.QuotaFailure result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailureOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailureOrBuilder.java
index 405a68362a..bc065e94a0 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailureOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailureOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 public interface QuotaFailureOrBuilder
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 13dad497f5..1e36facb2f 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 /**
@@ -51,6 +50,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;
   }
@@ -65,9 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int REQUEST_ID_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object requestId_ = "";
+  private volatile java.lang.Object requestId_;
 
   /**
    *
@@ -120,9 +122,7 @@ public com.google.protobuf.ByteString getRequestIdBytes() {
   }
 
   public static final int SERVING_DATA_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object servingData_ = "";
+  private volatile java.lang.Object servingData_;
 
   /**
    *
@@ -378,9 +378,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       requestId_ = "";
+
       servingData_ = "";
+
       return this;
     }
 
@@ -406,23 +407,12 @@ public com.google.rpc.RequestInfo build() {
     @java.lang.Override
     public com.google.rpc.RequestInfo buildPartial() {
       com.google.rpc.RequestInfo result = new com.google.rpc.RequestInfo(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.requestId_ = requestId_;
+      result.servingData_ = servingData_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.rpc.RequestInfo result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.requestId_ = requestId_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.servingData_ = servingData_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -470,12 +460,10 @@ public Builder mergeFrom(com.google.rpc.RequestInfo other) {
       if (other == com.google.rpc.RequestInfo.getDefaultInstance()) return this;
       if (!other.getRequestId().isEmpty()) {
         requestId_ = other.requestId_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getServingData().isEmpty()) {
         servingData_ = other.servingData_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -507,13 +495,13 @@ public Builder mergeFrom(
             case 10:
               {
                 requestId_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 servingData_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -533,8 +521,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object requestId_ = "";
 
     /**
@@ -602,8 +588,8 @@ public Builder setRequestId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       requestId_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -621,8 +607,8 @@ public Builder setRequestId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearRequestId() {
+
       requestId_ = getDefaultInstance().getRequestId();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -645,8 +631,8 @@ public Builder setRequestIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       requestId_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -718,8 +704,8 @@ public Builder setServingData(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       servingData_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -737,8 +723,8 @@ public Builder setServingData(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearServingData() {
+
       servingData_ = getDefaultInstance().getServingData();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -761,8 +747,8 @@ public Builder setServingDataBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       servingData_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfoOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfoOrBuilder.java
index 2d8ce688b8..97340c7985 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfoOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfoOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 public interface RequestInfoOrBuilder
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 ebd5c1816b..b8a66a9c2b 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 /**
@@ -52,6 +51,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;
   }
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RESOURCE_TYPE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object resourceType_ = "";
+  private volatile java.lang.Object resourceType_;
 
   /**
    *
@@ -123,9 +125,7 @@ public com.google.protobuf.ByteString getResourceTypeBytes() {
   }
 
   public static final int RESOURCE_NAME_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object resourceName_ = "";
+  private volatile java.lang.Object resourceName_;
 
   /**
    *
@@ -182,9 +182,7 @@ public com.google.protobuf.ByteString getResourceNameBytes() {
   }
 
   public static final int OWNER_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object owner_ = "";
+  private volatile java.lang.Object owner_;
 
   /**
    *
@@ -239,9 +237,7 @@ public com.google.protobuf.ByteString getOwnerBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object description_ = "";
+  private volatile java.lang.Object description_;
 
   /**
    *
@@ -516,11 +512,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       resourceType_ = "";
+
       resourceName_ = "";
+
       owner_ = "";
+
       description_ = "";
+
       return this;
     }
 
@@ -546,29 +545,14 @@ public com.google.rpc.ResourceInfo build() {
     @java.lang.Override
     public com.google.rpc.ResourceInfo buildPartial() {
       com.google.rpc.ResourceInfo result = new com.google.rpc.ResourceInfo(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.resourceType_ = resourceType_;
+      result.resourceName_ = resourceName_;
+      result.owner_ = owner_;
+      result.description_ = description_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.rpc.ResourceInfo result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.resourceType_ = resourceType_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.resourceName_ = resourceName_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.owner_ = owner_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.description_ = description_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -616,22 +600,18 @@ public Builder mergeFrom(com.google.rpc.ResourceInfo other) {
       if (other == com.google.rpc.ResourceInfo.getDefaultInstance()) return this;
       if (!other.getResourceType().isEmpty()) {
         resourceType_ = other.resourceType_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getResourceName().isEmpty()) {
         resourceName_ = other.resourceName_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getOwner().isEmpty()) {
         owner_ = other.owner_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -663,25 +643,25 @@ public Builder mergeFrom(
             case 10:
               {
                 resourceType_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 resourceName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 owner_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 description_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             default:
@@ -701,8 +681,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object resourceType_ = "";
 
     /**
@@ -773,8 +751,8 @@ public Builder setResourceType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       resourceType_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -793,8 +771,8 @@ public Builder setResourceType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResourceType() {
+
       resourceType_ = getDefaultInstance().getResourceType();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -818,8 +796,8 @@ public Builder setResourceTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       resourceType_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -897,8 +875,8 @@ public Builder setResourceName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       resourceName_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -918,8 +896,8 @@ public Builder setResourceName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResourceName() {
+
       resourceName_ = getDefaultInstance().getResourceName();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -944,8 +922,8 @@ public Builder setResourceNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       resourceName_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1020,8 +998,8 @@ public Builder setOwner(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       owner_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1040,8 +1018,8 @@ public Builder setOwner(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearOwner() {
+
       owner_ = getDefaultInstance().getOwner();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1065,8 +1043,8 @@ public Builder setOwnerBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       owner_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1141,8 +1119,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       description_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1161,8 +1139,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
+
       description_ = getDefaultInstance().getDescription();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1186,8 +1164,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       description_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfoOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfoOrBuilder.java
index 42ad97f81e..dd9f07fb56 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfoOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfoOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 public interface ResourceInfoOrBuilder
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 5b5a88a8c0..6e1a33159e 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 /**
@@ -26,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
@@ -59,6 +56,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;
   }
@@ -71,7 +73,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.rpc.RetryInfo.class, com.google.rpc.RetryInfo.Builder.class);
   }
 
-  private int bitField0_;
   public static final int RETRY_DELAY_FIELD_NUMBER = 1;
   private com.google.protobuf.Duration retryDelay_;
 
@@ -88,7 +89,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasRetryDelay() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return retryDelay_ != null;
   }
 
   /**
@@ -118,7 +119,7 @@ public com.google.protobuf.Duration getRetryDelay() {
    */
   @java.lang.Override
   public com.google.protobuf.DurationOrBuilder getRetryDelayOrBuilder() {
-    return retryDelay_ == null ? com.google.protobuf.Duration.getDefaultInstance() : retryDelay_;
+    return getRetryDelay();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -135,7 +136,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (retryDelay_ != null) {
       output.writeMessage(1, getRetryDelay());
     }
     getUnknownFields().writeTo(output);
@@ -147,7 +148,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (retryDelay_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getRetryDelay());
     }
     size += getUnknownFields().getSerializedSize();
@@ -291,10 +292,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
@@ -323,28 +322,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.rpc.RetryInfo.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getRetryDelayFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      retryDelay_ = null;
-      if (retryDelayBuilder_ != null) {
-        retryDelayBuilder_.dispose();
+      if (retryDelayBuilder_ == null) {
+        retryDelay_ = null;
+      } else {
+        retryDelay_ = null;
         retryDelayBuilder_ = null;
       }
       return this;
@@ -372,23 +362,15 @@ public com.google.rpc.RetryInfo build() {
     @java.lang.Override
     public com.google.rpc.RetryInfo buildPartial() {
       com.google.rpc.RetryInfo result = new com.google.rpc.RetryInfo(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (retryDelayBuilder_ == null) {
+        result.retryDelay_ = retryDelay_;
+      } else {
+        result.retryDelay_ = retryDelayBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.rpc.RetryInfo result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.retryDelay_ = retryDelayBuilder_ == null ? retryDelay_ : retryDelayBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -466,7 +448,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getRetryDelayFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -486,8 +468,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.protobuf.Duration retryDelay_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.protobuf.Duration,
@@ -507,7 +487,7 @@ public Builder mergeFrom(
      * @return Whether the retryDelay field is set.
      */
     public boolean hasRetryDelay() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return retryDelayBuilder_ != null || retryDelay_ != null;
     }
 
     /**
@@ -546,11 +526,11 @@ public Builder setRetryDelay(com.google.protobuf.Duration value) {
           throw new NullPointerException();
         }
         retryDelay_ = value;
+        onChanged();
       } else {
         retryDelayBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -566,11 +546,11 @@ public Builder setRetryDelay(com.google.protobuf.Duration value) {
     public Builder setRetryDelay(com.google.protobuf.Duration.Builder builderForValue) {
       if (retryDelayBuilder_ == null) {
         retryDelay_ = builderForValue.build();
+        onChanged();
       } else {
         retryDelayBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -585,20 +565,17 @@ public Builder setRetryDelay(com.google.protobuf.Duration.Builder builderForValu
      */
     public Builder mergeRetryDelay(com.google.protobuf.Duration value) {
       if (retryDelayBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && retryDelay_ != null
-            && retryDelay_ != com.google.protobuf.Duration.getDefaultInstance()) {
-          getRetryDelayBuilder().mergeFrom(value);
+        if (retryDelay_ != null) {
+          retryDelay_ =
+              com.google.protobuf.Duration.newBuilder(retryDelay_).mergeFrom(value).buildPartial();
         } else {
           retryDelay_ = value;
         }
+        onChanged();
       } else {
         retryDelayBuilder_.mergeFrom(value);
       }
-      if (retryDelay_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -612,13 +589,14 @@ public Builder mergeRetryDelay(com.google.protobuf.Duration value) {
      * .google.protobuf.Duration retry_delay = 1;
      */
     public Builder clearRetryDelay() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      retryDelay_ = null;
-      if (retryDelayBuilder_ != null) {
-        retryDelayBuilder_.dispose();
+      if (retryDelayBuilder_ == null) {
+        retryDelay_ = null;
+        onChanged();
+      } else {
+        retryDelay_ = null;
         retryDelayBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -632,7 +610,7 @@ public Builder clearRetryDelay() {
      * .google.protobuf.Duration retry_delay = 1;
      */
     public com.google.protobuf.Duration.Builder getRetryDelayBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getRetryDelayFieldBuilder().getBuilder();
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfoOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfoOrBuilder.java
index e2f6cc2b82..e29c7bdcc3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfoOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfoOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/error_details.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 public interface RetryInfoOrBuilder
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 2546fa0bda..b7e4bff43e 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/status.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 /**
@@ -27,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).
  * 

@@ -56,6 +54,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;
   }
@@ -69,7 +72,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CODE_FIELD_NUMBER = 1;
-  private int code_ = 0;
+  private int code_;
 
   /**
    *
@@ -89,9 +92,7 @@ public int getCode() {
   }
 
   public static final int MESSAGE_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object message_ = "";
+  private volatile java.lang.Object message_;
 
   /**
    *
@@ -148,8 +149,6 @@ public com.google.protobuf.ByteString getMessageBytes() {
   }
 
   public static final int DETAILS_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
   private java.util.List details_;
 
   /**
@@ -413,7 +412,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).
    * 

@@ -446,16 +444,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       code_ = 0;
+
       message_ = "";
+
       if (detailsBuilder_ == null) {
         details_ = java.util.Collections.emptyList();
       } else {
         details_ = null;
         detailsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -481,34 +480,20 @@ public com.google.rpc.Status build() {
     @java.lang.Override
     public com.google.rpc.Status buildPartial() {
       com.google.rpc.Status result = new com.google.rpc.Status(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.rpc.Status result) {
+      int from_bitField0_ = bitField0_;
+      result.code_ = code_;
+      result.message_ = message_;
       if (detailsBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           details_ = java.util.Collections.unmodifiableList(details_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.details_ = details_;
       } else {
         result.details_ = detailsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.rpc.Status result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.code_ = code_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.message_ = message_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -561,14 +546,13 @@ public Builder mergeFrom(com.google.rpc.Status other) {
       }
       if (!other.getMessage().isEmpty()) {
         message_ = other.message_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (detailsBuilder_ == null) {
         if (!other.details_.isEmpty()) {
           if (details_.isEmpty()) {
             details_ = other.details_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureDetailsIsMutable();
             details_.addAll(other.details_);
@@ -581,7 +565,7 @@ public Builder mergeFrom(com.google.rpc.Status other) {
             detailsBuilder_.dispose();
             detailsBuilder_ = null;
             details_ = other.details_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
             detailsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getDetailsFieldBuilder()
@@ -620,13 +604,13 @@ public Builder mergeFrom(
             case 8:
               {
                 code_ = input.readInt32();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 18:
               {
                 message_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
@@ -695,7 +679,6 @@ public int getCode() {
     public Builder setCode(int value) {
 
       code_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -713,7 +696,7 @@ public Builder setCode(int value) {
      * @return This builder for chaining.
      */
     public Builder clearCode() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       code_ = 0;
       onChanged();
       return this;
@@ -792,8 +775,8 @@ public Builder setMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       message_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -813,8 +796,8 @@ public Builder setMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearMessage() {
+
       message_ = getDefaultInstance().getMessage();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -839,8 +822,8 @@ public Builder setMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       message_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -848,9 +831,9 @@ public Builder setMessageBytes(com.google.protobuf.ByteString value) {
     private java.util.List details_ = java.util.Collections.emptyList();
 
     private void ensureDetailsIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         details_ = new java.util.ArrayList(details_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1083,7 +1066,7 @@ public Builder addAllDetails(java.lang.Iterable getDetailsBuilderList() {
                 com.google.protobuf.Any,
                 com.google.protobuf.Any.Builder,
                 com.google.protobuf.AnyOrBuilder>(
-                details_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
+                details_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         details_ = null;
       }
       return detailsBuilder_;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/StatusOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/StatusOrBuilder.java
index 186a160bdb..6288b60bdb 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/StatusOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/StatusOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/status.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 public interface StatusOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/StatusProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/StatusProto.java
index 561abd7507..ce06d15ca8 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/StatusProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/StatusProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/status.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc;
 
 public final class StatusProto {
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 d1fb22d608..c4131cae01 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/context/attribute_context.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc.context;
 
 /**
@@ -24,19 +23,15 @@
  *
  * 
  * 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.
@@ -65,6 +60,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;
@@ -170,6 +170,7 @@ public interface PeerOrBuilder
      *
      * map<string, string> labels = 6;
      */
+
     /* nullable */
     java.lang.String getLabelsOrDefault(
         java.lang.String key,
@@ -283,6 +284,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;
@@ -290,8 +296,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @SuppressWarnings({"rawtypes"})
     @java.lang.Override
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 6:
           return internalGetLabels();
@@ -311,9 +316,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     public static final int IP_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object ip_ = "";
+    private volatile java.lang.Object ip_;
 
     /**
      *
@@ -364,7 +367,7 @@ public com.google.protobuf.ByteString getIpBytes() {
     }
 
     public static final int PORT_FIELD_NUMBER = 2;
-    private long port_ = 0L;
+    private long port_;
 
     /**
      *
@@ -395,7 +398,6 @@ private static final class LabelsDefaultEntryHolder {
               "");
     }
 
-    @SuppressWarnings("serial")
     private com.google.protobuf.MapField labels_;
 
     private com.google.protobuf.MapField internalGetLabels() {
@@ -457,10 +459,8 @@ public java.util.Map getLabelsMap() {
      * map<string, string> labels = 6;
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getLabelsOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getLabelsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -490,9 +490,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
     }
 
     public static final int PRINCIPAL_FIELD_NUMBER = 7;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object principal_ = "";
+    private volatile java.lang.Object principal_;
 
     /**
      *
@@ -547,9 +545,7 @@ public com.google.protobuf.ByteString getPrincipalBytes() {
     }
 
     public static final int REGION_CODE_FIELD_NUMBER = 8;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object regionCode_ = "";
+    private volatile java.lang.Object regionCode_;
 
     /**
      *
@@ -831,8 +827,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-          int number) {
+      protected com.google.protobuf.MapField internalGetMapField(int number) {
         switch (number) {
           case 6:
             return internalGetLabels();
@@ -842,8 +837,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
       }
 
       @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-          int number) {
+      protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
         switch (number) {
           case 6:
             return internalGetMutableLabels();
@@ -872,12 +866,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         ip_ = "";
+
         port_ = 0L;
+
         internalGetMutableLabels().clear();
         principal_ = "";
+
         regionCode_ = "";
+
         return this;
       }
 
@@ -905,33 +902,17 @@ public com.google.rpc.context.AttributeContext.Peer build() {
       public com.google.rpc.context.AttributeContext.Peer buildPartial() {
         com.google.rpc.context.AttributeContext.Peer result =
             new com.google.rpc.context.AttributeContext.Peer(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        int from_bitField0_ = bitField0_;
+        result.ip_ = ip_;
+        result.port_ = port_;
+        result.labels_ = internalGetLabels();
+        result.labels_.makeImmutable();
+        result.principal_ = principal_;
+        result.regionCode_ = regionCode_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.rpc.context.AttributeContext.Peer result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.ip_ = ip_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.port_ = port_;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.labels_ = internalGetLabels();
-          result.labels_.makeImmutable();
-        }
-        if (((from_bitField0_ & 0x00000008) != 0)) {
-          result.principal_ = principal_;
-        }
-        if (((from_bitField0_ & 0x00000010) != 0)) {
-          result.regionCode_ = regionCode_;
-        }
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -981,22 +962,18 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Peer other) {
         if (other == com.google.rpc.context.AttributeContext.Peer.getDefaultInstance()) return this;
         if (!other.getIp().isEmpty()) {
           ip_ = other.ip_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.getPort() != 0L) {
           setPort(other.getPort());
         }
         internalGetMutableLabels().mergeFrom(other.internalGetLabels());
-        bitField0_ |= 0x00000004;
         if (!other.getPrincipal().isEmpty()) {
           principal_ = other.principal_;
-          bitField0_ |= 0x00000008;
           onChanged();
         }
         if (!other.getRegionCode().isEmpty()) {
           regionCode_ = other.regionCode_;
-          bitField0_ |= 0x00000010;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -1028,13 +1005,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   ip_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 16:
                 {
                   port_ = input.readInt64();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 16
               case 50:
@@ -1046,19 +1023,18 @@ public Builder mergeFrom(
                   internalGetMutableLabels()
                       .getMutableMap()
                       .put(labels__.getKey(), labels__.getValue());
-                  bitField0_ |= 0x00000004;
                   break;
                 } // case 50
               case 58:
                 {
                   principal_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000008;
+
                   break;
                 } // case 58
               case 66:
                 {
                   regionCode_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000010;
+
                   break;
                 } // case 66
               default:
@@ -1144,8 +1120,8 @@ public Builder setIp(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         ip_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1162,8 +1138,8 @@ public Builder setIp(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearIp() {
+
         ip_ = getDefaultInstance().getIp();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1185,8 +1161,8 @@ public Builder setIpBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         ip_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1224,7 +1200,6 @@ public long getPort() {
       public Builder setPort(long value) {
 
         port_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1241,7 +1216,7 @@ public Builder setPort(long value) {
        * @return This builder for chaining.
        */
       public Builder clearPort() {
-        bitField0_ = (bitField0_ & ~0x00000002);
+
         port_ = 0L;
         onChanged();
         return this;
@@ -1258,14 +1233,14 @@ private com.google.protobuf.MapField interna
 
       private com.google.protobuf.MapField
           internalGetMutableLabels() {
+        onChanged();
+        ;
         if (labels_ == null) {
           labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
         }
         if (!labels_.isMutable()) {
           labels_ = labels_.copy();
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
         return labels_;
       }
 
@@ -1321,10 +1296,8 @@ public java.util.Map getLabelsMap() {
        * map<string, string> labels = 6;
        */
       @java.lang.Override
-      public /* nullable */ java.lang.String getLabelsOrDefault(
-          java.lang.String key,
-          /* nullable */
-          java.lang.String defaultValue) {
+      public java.lang.String getLabelsOrDefault(
+          java.lang.String key, java.lang.String defaultValue) {
         if (key == null) {
           throw new NullPointerException("map key");
         }
@@ -1354,7 +1327,6 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
       }
 
       public Builder clearLabels() {
-        bitField0_ = (bitField0_ & ~0x00000004);
         internalGetMutableLabels().getMutableMap().clear();
         return this;
       }
@@ -1379,7 +1351,6 @@ public Builder removeLabels(java.lang.String key) {
       /** Use alternate mutation accessors instead. */
       @java.lang.Deprecated
       public java.util.Map getMutableLabels() {
-        bitField0_ |= 0x00000004;
         return internalGetMutableLabels().getMutableMap();
       }
 
@@ -1399,8 +1370,8 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
         if (value == null) {
           throw new NullPointerException("map value");
         }
+
         internalGetMutableLabels().getMutableMap().put(key, value);
-        bitField0_ |= 0x00000004;
         return this;
       }
 
@@ -1415,7 +1386,6 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
        */
       public Builder putAllLabels(java.util.Map values) {
         internalGetMutableLabels().getMutableMap().putAll(values);
-        bitField0_ |= 0x00000004;
         return this;
       }
 
@@ -1489,8 +1459,8 @@ public Builder setPrincipal(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         principal_ = value;
-        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1509,8 +1479,8 @@ public Builder setPrincipal(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearPrincipal() {
+
         principal_ = getDefaultInstance().getPrincipal();
-        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -1534,8 +1504,8 @@ public Builder setPrincipalBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         principal_ = value;
-        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -1610,8 +1580,8 @@ public Builder setRegionCode(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         regionCode_ = value;
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1630,8 +1600,8 @@ public Builder setRegionCode(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearRegionCode() {
+
         regionCode_ = getDefaultInstance().getRegionCode();
-        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
       }
@@ -1655,8 +1625,8 @@ public Builder setRegionCodeBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         regionCode_ = value;
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -1882,6 +1852,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;
@@ -1898,9 +1873,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int SERVICE_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object service_ = "";
+    private volatile java.lang.Object service_;
 
     /**
      *
@@ -1955,9 +1928,7 @@ public com.google.protobuf.ByteString getServiceBytes() {
     }
 
     public static final int OPERATION_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object operation_ = "";
+    private volatile java.lang.Object operation_;
 
     /**
      *
@@ -2012,9 +1983,7 @@ public com.google.protobuf.ByteString getOperationBytes() {
     }
 
     public static final int PROTOCOL_FIELD_NUMBER = 3;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object protocol_ = "";
+    private volatile java.lang.Object protocol_;
 
     /**
      *
@@ -2067,9 +2036,7 @@ public com.google.protobuf.ByteString getProtocolBytes() {
     }
 
     public static final int VERSION_FIELD_NUMBER = 4;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object version_ = "";
+    private volatile java.lang.Object version_;
 
     /**
      *
@@ -2350,11 +2317,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         service_ = "";
+
         operation_ = "";
+
         protocol_ = "";
+
         version_ = "";
+
         return this;
       }
 
@@ -2382,29 +2352,14 @@ public com.google.rpc.context.AttributeContext.Api build() {
       public com.google.rpc.context.AttributeContext.Api buildPartial() {
         com.google.rpc.context.AttributeContext.Api result =
             new com.google.rpc.context.AttributeContext.Api(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        result.service_ = service_;
+        result.operation_ = operation_;
+        result.protocol_ = protocol_;
+        result.version_ = version_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.rpc.context.AttributeContext.Api result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.service_ = service_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.operation_ = operation_;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.protocol_ = protocol_;
-        }
-        if (((from_bitField0_ & 0x00000008) != 0)) {
-          result.version_ = version_;
-        }
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -2454,22 +2409,18 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Api other) {
         if (other == com.google.rpc.context.AttributeContext.Api.getDefaultInstance()) return this;
         if (!other.getService().isEmpty()) {
           service_ = other.service_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getOperation().isEmpty()) {
           operation_ = other.operation_;
-          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (!other.getProtocol().isEmpty()) {
           protocol_ = other.protocol_;
-          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (!other.getVersion().isEmpty()) {
           version_ = other.version_;
-          bitField0_ |= 0x00000008;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -2501,25 +2452,25 @@ public Builder mergeFrom(
               case 10:
                 {
                   service_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   operation_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               case 26:
                 {
                   protocol_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 26
               case 34:
                 {
                   version_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000008;
+
                   break;
                 } // case 34
               default:
@@ -2539,8 +2490,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private java.lang.Object service_ = "";
 
       /**
@@ -2611,8 +2560,8 @@ public Builder setService(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         service_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2631,8 +2580,8 @@ public Builder setService(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearService() {
+
         service_ = getDefaultInstance().getService();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -2656,8 +2605,8 @@ public Builder setServiceBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         service_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2732,8 +2681,8 @@ public Builder setOperation(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         operation_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2752,8 +2701,8 @@ public Builder setOperation(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearOperation() {
+
         operation_ = getDefaultInstance().getOperation();
-        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -2777,8 +2726,8 @@ public Builder setOperationBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         operation_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2850,8 +2799,8 @@ public Builder setProtocol(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         protocol_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -2869,8 +2818,8 @@ public Builder setProtocol(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearProtocol() {
+
         protocol_ = getDefaultInstance().getProtocol();
-        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -2893,8 +2842,8 @@ public Builder setProtocolBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         protocol_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -2966,8 +2915,8 @@ public Builder setVersion(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         version_ = value;
-        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -2985,8 +2934,8 @@ public Builder setVersion(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearVersion() {
+
         version_ = getDefaultInstance().getVersion();
-        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -3009,8 +2958,8 @@ public Builder setVersionBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         version_ = value;
-        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3126,14 +3075,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.
      * 

@@ -3152,14 +3099,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.
      * 

@@ -3178,14 +3123,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.
      * 

@@ -3205,14 +3148,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.
      * 

@@ -3264,7 +3205,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'],
@@ -3272,7 +3212,6 @@ public interface AuthOrBuilder
      *     'email': 'jsmith@example.com',
      *     'iat': 1353601026,
      *     'exp': 1353604926}
-     *
      * SAML assertions are similarly specified, but with an identity provider
      * dependent structure.
      * 

@@ -3291,7 +3230,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'],
@@ -3299,7 +3237,6 @@ public interface AuthOrBuilder
      *     'email': 'jsmith@example.com',
      *     'iat': 1353601026,
      *     'exp': 1353604926}
-     *
      * SAML assertions are similarly specified, but with an identity provider
      * dependent structure.
      * 

@@ -3318,7 +3255,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'],
@@ -3326,7 +3262,6 @@ public interface AuthOrBuilder
      *     'email': 'jsmith@example.com',
      *     'iat': 1353601026,
      *     'exp': 1353604926}
-     *
      * SAML assertions are similarly specified, but with an identity provider
      * dependent structure.
      * 

@@ -3343,7 +3278,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"
      * 

@@ -3362,7 +3296,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"
      * 

@@ -3381,7 +3314,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"
      * 

@@ -3401,7 +3333,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"
      * 

@@ -3438,9 +3369,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
@@ -3449,6 +3380,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;
@@ -3464,11 +3400,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
               com.google.rpc.context.AttributeContext.Auth.Builder.class);
     }
 
-    private int bitField0_;
     public static final int PRINCIPAL_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object principal_ = "";
+    private volatile java.lang.Object principal_;
 
     /**
      *
@@ -3527,10 +3460,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_;
 
     /**
      *
@@ -3540,14 +3470,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.
      * 

@@ -3568,14 +3496,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.
      * 

@@ -3596,14 +3522,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.
      * 

@@ -3625,14 +3549,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.
      * 

@@ -3647,9 +3569,7 @@ public com.google.protobuf.ByteString getAudiencesBytes(int index) {
     }
 
     public static final int PRESENTER_FIELD_NUMBER = 3;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object presenter_ = "";
+    private volatile java.lang.Object presenter_;
 
     /**
      *
@@ -3716,7 +3636,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'],
@@ -3724,7 +3643,6 @@ public com.google.protobuf.ByteString getPresenterBytes() {
      *     'email': 'jsmith@example.com',
      *     'iat': 1353601026,
      *     'exp': 1353604926}
-     *
      * SAML assertions are similarly specified, but with an identity provider
      * dependent structure.
      * 

@@ -3735,7 +3653,7 @@ public com.google.protobuf.ByteString getPresenterBytes() {
      */
     @java.lang.Override
     public boolean hasClaims() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return claims_ != null;
     }
 
     /**
@@ -3746,7 +3664,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'],
@@ -3754,7 +3671,6 @@ public boolean hasClaims() {
      *     'email': 'jsmith@example.com',
      *     'iat': 1353601026,
      *     'exp': 1353604926}
-     *
      * SAML assertions are similarly specified, but with an identity provider
      * dependent structure.
      * 

@@ -3776,7 +3692,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'],
@@ -3784,7 +3699,6 @@ public com.google.protobuf.Struct getClaims() {
      *     'email': 'jsmith@example.com',
      *     'iat': 1353601026,
      *     'exp': 1353604926}
-     *
      * SAML assertions are similarly specified, but with an identity provider
      * dependent structure.
      * 

@@ -3793,14 +3707,11 @@ public com.google.protobuf.Struct getClaims() {
      */
     @java.lang.Override
     public com.google.protobuf.StructOrBuilder getClaimsOrBuilder() {
-      return claims_ == null ? com.google.protobuf.Struct.getDefaultInstance() : claims_;
+      return getClaims();
     }
 
     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_;
 
     /**
      *
@@ -3810,7 +3721,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"
      * 

@@ -3831,7 +3741,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"
      * 

@@ -3852,7 +3761,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"
      * 

@@ -3874,7 +3782,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"
      * 

@@ -3911,7 +3818,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(presenter_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 3, presenter_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (claims_ != null) {
         output.writeMessage(4, getClaims());
       }
       for (int i = 0; i < accessLevels_.size(); i++) {
@@ -3940,7 +3847,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(presenter_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, presenter_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (claims_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getClaims());
       }
       {
@@ -4136,34 +4043,29 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.rpc.context.AttributeContext.Auth.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getClaimsFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         principal_ = "";
-        audiences_ = com.google.protobuf.LazyStringArrayList.emptyList();
+
+        audiences_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000001);
         presenter_ = "";
-        claims_ = null;
-        if (claimsBuilder_ != null) {
-          claimsBuilder_.dispose();
+
+        if (claimsBuilder_ == null) {
+          claims_ = null;
+        } else {
+          claims_ = null;
           claimsBuilder_ = null;
         }
-        accessLevels_ = com.google.protobuf.LazyStringArrayList.emptyList();
+        accessLevels_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -4191,35 +4093,26 @@ 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);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
-        onBuilt();
-        return result;
-      }
-
-      private void buildPartial0(com.google.rpc.context.AttributeContext.Auth result) {
         int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.principal_ = principal_;
+        result.principal_ = principal_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          audiences_ = audiences_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          audiences_.makeImmutable();
-          result.audiences_ = audiences_;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.presenter_ = presenter_;
-        }
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000008) != 0)) {
-          result.claims_ = claimsBuilder_ == null ? claims_ : claimsBuilder_.build();
-          to_bitField0_ |= 0x00000001;
+        result.audiences_ = audiences_;
+        result.presenter_ = presenter_;
+        if (claimsBuilder_ == null) {
+          result.claims_ = claims_;
+        } else {
+          result.claims_ = claimsBuilder_.build();
         }
-        if (((from_bitField0_ & 0x00000010) != 0)) {
-          accessLevels_.makeImmutable();
-          result.accessLevels_ = accessLevels_;
+        if (((bitField0_ & 0x00000002) != 0)) {
+          accessLevels_ = accessLevels_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.bitField0_ |= to_bitField0_;
+        result.accessLevels_ = accessLevels_;
+        onBuilt();
+        return result;
       }
 
       @java.lang.Override
@@ -4271,13 +4164,12 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Auth other) {
         if (other == com.google.rpc.context.AttributeContext.Auth.getDefaultInstance()) return this;
         if (!other.getPrincipal().isEmpty()) {
           principal_ = other.principal_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.audiences_.isEmpty()) {
           if (audiences_.isEmpty()) {
             audiences_ = other.audiences_;
-            bitField0_ |= 0x00000002;
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureAudiencesIsMutable();
             audiences_.addAll(other.audiences_);
@@ -4286,7 +4178,6 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Auth other) {
         }
         if (!other.getPresenter().isEmpty()) {
           presenter_ = other.presenter_;
-          bitField0_ |= 0x00000004;
           onChanged();
         }
         if (other.hasClaims()) {
@@ -4295,7 +4186,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_ & ~0x00000002);
           } else {
             ensureAccessLevelsIsMutable();
             accessLevels_.addAll(other.accessLevels_);
@@ -4331,7 +4222,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   principal_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
@@ -4344,13 +4235,13 @@ public Builder mergeFrom(
               case 26:
                 {
                   presenter_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 26
               case 34:
                 {
                   input.readMessage(getClaimsFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000008;
+
                   break;
                 } // case 34
               case 42:
@@ -4455,8 +4346,8 @@ public Builder setPrincipal(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         principal_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4477,8 +4368,8 @@ public Builder setPrincipal(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearPrincipal() {
+
         principal_ = getDefaultInstance().getPrincipal();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -4504,20 +4395,20 @@ public Builder setPrincipalBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         principal_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         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_ & 0x00000001) != 0)) {
           audiences_ = new com.google.protobuf.LazyStringArrayList(audiences_);
+          bitField0_ |= 0x00000001;
         }
-        bitField0_ |= 0x00000002;
       }
 
       /**
@@ -4528,14 +4419,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.
        * 

@@ -4545,8 +4434,7 @@ private void ensureAudiencesIsMutable() {
        * @return A list containing the audiences.
        */
       public com.google.protobuf.ProtocolStringList getAudiencesList() {
-        audiences_.makeImmutable();
-        return audiences_;
+        return audiences_.getUnmodifiableView();
       }
 
       /**
@@ -4557,14 +4445,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.
        * 

@@ -4585,14 +4471,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.
        * 

@@ -4614,14 +4498,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.
        * 

@@ -4643,14 +4525,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.
        * 

@@ -4667,7 +4547,6 @@ public Builder setAudiences(int index, java.lang.String value) {
         }
         ensureAudiencesIsMutable();
         audiences_.set(index, value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4680,14 +4559,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.
        * 

@@ -4703,7 +4580,6 @@ public Builder addAudiences(java.lang.String value) {
         }
         ensureAudiencesIsMutable();
         audiences_.add(value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4716,14 +4592,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.
        * 

@@ -4736,7 +4610,6 @@ public Builder addAudiences(java.lang.String value) {
       public Builder addAllAudiences(java.lang.Iterable values) {
         ensureAudiencesIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, audiences_);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4749,14 +4622,12 @@ public Builder addAllAudiences(java.lang.Iterable 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.
        * 

@@ -4766,9 +4637,8 @@ public Builder addAllAudiences(java.lang.Iterable values) {
        * @return This builder for chaining.
        */
       public Builder clearAudiences() {
-        audiences_ = com.google.protobuf.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        ;
+        audiences_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -4781,14 +4651,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.
        * 

@@ -4805,7 +4673,6 @@ public Builder addAudiencesBytes(com.google.protobuf.ByteString value) {
         checkByteStringIsUtf8(value);
         ensureAudiencesIsMutable();
         audiences_.add(value);
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4883,8 +4750,8 @@ public Builder setPresenter(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         presenter_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -4904,8 +4771,8 @@ public Builder setPresenter(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearPresenter() {
+
         presenter_ = getDefaultInstance().getPresenter();
-        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -4930,8 +4797,8 @@ public Builder setPresenterBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         presenter_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -4951,7 +4818,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'],
@@ -4959,7 +4825,6 @@ public Builder setPresenterBytes(com.google.protobuf.ByteString value) {
        *     'email': 'jsmith@example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * 

@@ -4969,7 +4834,7 @@ public Builder setPresenterBytes(com.google.protobuf.ByteString value) {
        * @return Whether the claims field is set.
        */
       public boolean hasClaims() {
-        return ((bitField0_ & 0x00000008) != 0);
+        return claimsBuilder_ != null || claims_ != null;
       }
 
       /**
@@ -4980,7 +4845,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'],
@@ -4988,7 +4852,6 @@ public boolean hasClaims() {
        *     'email': 'jsmith@example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * 

@@ -5013,7 +4876,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'],
@@ -5021,7 +4883,6 @@ public com.google.protobuf.Struct getClaims() {
        *     'email': 'jsmith@example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * 

@@ -5034,11 +4895,11 @@ public Builder setClaims(com.google.protobuf.Struct value) {
             throw new NullPointerException();
           }
           claims_ = value;
+          onChanged();
         } else {
           claimsBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000008;
-        onChanged();
+
         return this;
       }
 
@@ -5050,7 +4911,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'],
@@ -5058,7 +4918,6 @@ public Builder setClaims(com.google.protobuf.Struct value) {
        *     'email': 'jsmith@example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * 

@@ -5068,11 +4927,11 @@ public Builder setClaims(com.google.protobuf.Struct value) {
       public Builder setClaims(com.google.protobuf.Struct.Builder builderForValue) {
         if (claimsBuilder_ == null) {
           claims_ = builderForValue.build();
+          onChanged();
         } else {
           claimsBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000008;
-        onChanged();
+
         return this;
       }
 
@@ -5084,7 +4943,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'],
@@ -5092,7 +4950,6 @@ public Builder setClaims(com.google.protobuf.Struct.Builder builderForValue) {
        *     'email': 'jsmith@example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * 

@@ -5101,20 +4958,17 @@ public Builder setClaims(com.google.protobuf.Struct.Builder builderForValue) {
        */
       public Builder mergeClaims(com.google.protobuf.Struct value) {
         if (claimsBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) != 0)
-              && claims_ != null
-              && claims_ != com.google.protobuf.Struct.getDefaultInstance()) {
-            getClaimsBuilder().mergeFrom(value);
+          if (claims_ != null) {
+            claims_ =
+                com.google.protobuf.Struct.newBuilder(claims_).mergeFrom(value).buildPartial();
           } else {
             claims_ = value;
           }
+          onChanged();
         } else {
           claimsBuilder_.mergeFrom(value);
         }
-        if (claims_ != null) {
-          bitField0_ |= 0x00000008;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -5126,7 +4980,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'],
@@ -5134,7 +4987,6 @@ public Builder mergeClaims(com.google.protobuf.Struct value) {
        *     'email': 'jsmith@example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * 

@@ -5142,13 +4994,14 @@ public Builder mergeClaims(com.google.protobuf.Struct value) {
        * .google.protobuf.Struct claims = 4;
        */
       public Builder clearClaims() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        claims_ = null;
-        if (claimsBuilder_ != null) {
-          claimsBuilder_.dispose();
+        if (claimsBuilder_ == null) {
+          claims_ = null;
+          onChanged();
+        } else {
+          claims_ = null;
           claimsBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -5160,7 +5013,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'],
@@ -5168,7 +5020,6 @@ public Builder clearClaims() {
        *     'email': 'jsmith@example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * 

@@ -5176,7 +5027,7 @@ public Builder clearClaims() {
        * .google.protobuf.Struct claims = 4;
        */
       public com.google.protobuf.Struct.Builder getClaimsBuilder() {
-        bitField0_ |= 0x00000008;
+
         onChanged();
         return getClaimsFieldBuilder().getBuilder();
       }
@@ -5189,7 +5040,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'],
@@ -5197,7 +5047,6 @@ public com.google.protobuf.Struct.Builder getClaimsBuilder() {
        *     'email': 'jsmith@example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * 

@@ -5220,7 +5069,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'],
@@ -5228,7 +5076,6 @@ public com.google.protobuf.StructOrBuilder getClaimsOrBuilder() {
        *     'email': 'jsmith@example.com',
        *     'iat': 1353601026,
        *     'exp': 1353604926}
-       *
        * SAML assertions are similarly specified, but with an identity provider
        * dependent structure.
        * 

@@ -5252,14 +5099,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_ & 0x00000002) != 0)) {
           accessLevels_ = new com.google.protobuf.LazyStringArrayList(accessLevels_);
+          bitField0_ |= 0x00000002;
         }
-        bitField0_ |= 0x00000010;
       }
 
       /**
@@ -5270,7 +5117,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"
        * 

@@ -5280,8 +5126,7 @@ private void ensureAccessLevelsIsMutable() {
        * @return A list containing the accessLevels.
        */
       public com.google.protobuf.ProtocolStringList getAccessLevelsList() {
-        accessLevels_.makeImmutable();
-        return accessLevels_;
+        return accessLevels_.getUnmodifiableView();
       }
 
       /**
@@ -5292,7 +5137,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"
        * 

@@ -5313,7 +5157,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"
        * 

@@ -5335,7 +5178,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"
        * 

@@ -5357,7 +5199,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"
        * 

@@ -5374,7 +5215,6 @@ public Builder setAccessLevels(int index, java.lang.String value) {
         }
         ensureAccessLevelsIsMutable();
         accessLevels_.set(index, value);
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -5387,7 +5227,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"
        * 

@@ -5403,7 +5242,6 @@ public Builder addAccessLevels(java.lang.String value) {
         }
         ensureAccessLevelsIsMutable();
         accessLevels_.add(value);
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -5416,7 +5254,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"
        * 

@@ -5429,7 +5266,6 @@ public Builder addAccessLevels(java.lang.String value) {
       public Builder addAllAccessLevels(java.lang.Iterable values) {
         ensureAccessLevelsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(values, accessLevels_);
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -5442,7 +5278,6 @@ public Builder addAllAccessLevels(java.lang.Iterable 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"
        * 

@@ -5452,9 +5287,8 @@ public Builder addAllAccessLevels(java.lang.Iterable values) {
        * @return This builder for chaining.
        */
       public Builder clearAccessLevels() {
-        accessLevels_ = com.google.protobuf.LazyStringArrayList.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000010);
-        ;
+        accessLevels_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -5467,7 +5301,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"
        * 

@@ -5484,7 +5317,6 @@ public Builder addAccessLevelsBytes(com.google.protobuf.ByteString value) {
         checkByteStringIsUtf8(value);
         ensureAccessLevelsIsMutable();
         accessLevels_.add(value);
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -5668,6 +5500,7 @@ public interface RequestOrBuilder
      *
      * map<string, string> headers = 3;
      */
+
     /* nullable */
     java.lang.String getHeadersOrDefault(
         java.lang.String key,
@@ -5986,6 +5819,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;
@@ -5993,8 +5831,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @SuppressWarnings({"rawtypes"})
     @java.lang.Override
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 3:
           return internalGetHeaders();
@@ -6013,11 +5850,8 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
               com.google.rpc.context.AttributeContext.Request.Builder.class);
     }
 
-    private int bitField0_;
     public static final int ID_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object id_ = "";
+    private volatile java.lang.Object id_;
 
     /**
      *
@@ -6072,9 +5906,7 @@ public com.google.protobuf.ByteString getIdBytes() {
     }
 
     public static final int METHOD_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object method_ = "";
+    private volatile java.lang.Object method_;
 
     /**
      *
@@ -6137,7 +5969,6 @@ private static final class HeadersDefaultEntryHolder {
               "");
     }
 
-    @SuppressWarnings("serial")
     private com.google.protobuf.MapField headers_;
 
     private com.google.protobuf.MapField internalGetHeaders() {
@@ -6205,10 +6036,8 @@ public java.util.Map getHeadersMap() {
      * map<string, string> headers = 3;
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getHeadersOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getHeadersOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -6240,9 +6069,7 @@ public java.lang.String getHeadersOrThrow(java.lang.String key) {
     }
 
     public static final int PATH_FIELD_NUMBER = 4;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object path_ = "";
+    private volatile java.lang.Object path_;
 
     /**
      *
@@ -6293,9 +6120,7 @@ public com.google.protobuf.ByteString getPathBytes() {
     }
 
     public static final int HOST_FIELD_NUMBER = 5;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object host_ = "";
+    private volatile java.lang.Object host_;
 
     /**
      *
@@ -6346,9 +6171,7 @@ public com.google.protobuf.ByteString getHostBytes() {
     }
 
     public static final int SCHEME_FIELD_NUMBER = 6;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object scheme_ = "";
+    private volatile java.lang.Object scheme_;
 
     /**
      *
@@ -6399,9 +6222,7 @@ public com.google.protobuf.ByteString getSchemeBytes() {
     }
 
     public static final int QUERY_FIELD_NUMBER = 7;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object query_ = "";
+    private volatile java.lang.Object query_;
 
     /**
      *
@@ -6470,7 +6291,7 @@ public com.google.protobuf.ByteString getQueryBytes() {
      */
     @java.lang.Override
     public boolean hasTime() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return time_ != null;
     }
 
     /**
@@ -6502,11 +6323,11 @@ public com.google.protobuf.Timestamp getTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getTimeOrBuilder() {
-      return time_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : time_;
+      return getTime();
     }
 
     public static final int SIZE_FIELD_NUMBER = 10;
-    private long size_ = 0L;
+    private long size_;
 
     /**
      *
@@ -6525,9 +6346,7 @@ public long getSize() {
     }
 
     public static final int PROTOCOL_FIELD_NUMBER = 11;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object protocol_ = "";
+    private volatile java.lang.Object protocol_;
 
     /**
      *
@@ -6584,9 +6403,7 @@ public com.google.protobuf.ByteString getProtocolBytes() {
     }
 
     public static final int REASON_FIELD_NUMBER = 12;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object reason_ = "";
+    private volatile java.lang.Object reason_;
 
     /**
      *
@@ -6655,7 +6472,7 @@ public com.google.protobuf.ByteString getReasonBytes() {
      */
     @java.lang.Override
     public boolean hasAuth() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return auth_ != null;
     }
 
     /**
@@ -6689,9 +6506,7 @@ public com.google.rpc.context.AttributeContext.Auth getAuth() {
      */
     @java.lang.Override
     public com.google.rpc.context.AttributeContext.AuthOrBuilder getAuthOrBuilder() {
-      return auth_ == null
-          ? com.google.rpc.context.AttributeContext.Auth.getDefaultInstance()
-          : auth_;
+      return getAuth();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -6728,7 +6543,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(query_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 7, query_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (time_ != null) {
         output.writeMessage(9, getTime());
       }
       if (size_ != 0L) {
@@ -6740,7 +6555,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reason_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 12, reason_);
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (auth_ != null) {
         output.writeMessage(13, getAuth());
       }
       getUnknownFields().writeTo(output);
@@ -6780,7 +6595,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(query_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, query_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (time_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getTime());
       }
       if (size_ != 0L) {
@@ -6792,7 +6607,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reason_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, reason_);
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (auth_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(13, getAuth());
       }
       size += getUnknownFields().getSerializedSize();
@@ -6994,8 +6809,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-          int number) {
+      protected com.google.protobuf.MapField internalGetMapField(int number) {
         switch (number) {
           case 3:
             return internalGetHeaders();
@@ -7005,8 +6819,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
       }
 
       @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-          int number) {
+      protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
         switch (number) {
           case 3:
             return internalGetMutableHeaders();
@@ -7026,44 +6839,44 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
       }
 
       // Construct using com.google.rpc.context.AttributeContext.Request.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getTimeFieldBuilder();
-          getAuthFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         id_ = "";
+
         method_ = "";
+
         internalGetMutableHeaders().clear();
         path_ = "";
+
         host_ = "";
+
         scheme_ = "";
+
         query_ = "";
-        time_ = null;
-        if (timeBuilder_ != null) {
-          timeBuilder_.dispose();
+
+        if (timeBuilder_ == null) {
+          time_ = null;
+        } else {
+          time_ = null;
           timeBuilder_ = null;
         }
         size_ = 0L;
+
         protocol_ = "";
+
         reason_ = "";
-        auth_ = null;
-        if (authBuilder_ != null) {
-          authBuilder_.dispose();
+
+        if (authBuilder_ == null) {
+          auth_ = null;
+        } else {
+          auth_ = null;
           authBuilder_ = null;
         }
         return this;
@@ -7093,56 +6906,30 @@ public com.google.rpc.context.AttributeContext.Request build() {
       public com.google.rpc.context.AttributeContext.Request buildPartial() {
         com.google.rpc.context.AttributeContext.Request result =
             new com.google.rpc.context.AttributeContext.Request(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
-        onBuilt();
-        return result;
-      }
-
-      private void buildPartial0(com.google.rpc.context.AttributeContext.Request result) {
         int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.id_ = id_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.method_ = method_;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.headers_ = internalGetHeaders();
-          result.headers_.makeImmutable();
-        }
-        if (((from_bitField0_ & 0x00000008) != 0)) {
-          result.path_ = path_;
-        }
-        if (((from_bitField0_ & 0x00000010) != 0)) {
-          result.host_ = host_;
-        }
-        if (((from_bitField0_ & 0x00000020) != 0)) {
-          result.scheme_ = scheme_;
-        }
-        if (((from_bitField0_ & 0x00000040) != 0)) {
-          result.query_ = query_;
-        }
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000080) != 0)) {
-          result.time_ = timeBuilder_ == null ? time_ : timeBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        if (((from_bitField0_ & 0x00000100) != 0)) {
-          result.size_ = size_;
-        }
-        if (((from_bitField0_ & 0x00000200) != 0)) {
-          result.protocol_ = protocol_;
-        }
-        if (((from_bitField0_ & 0x00000400) != 0)) {
-          result.reason_ = reason_;
+        result.id_ = id_;
+        result.method_ = method_;
+        result.headers_ = internalGetHeaders();
+        result.headers_.makeImmutable();
+        result.path_ = path_;
+        result.host_ = host_;
+        result.scheme_ = scheme_;
+        result.query_ = query_;
+        if (timeBuilder_ == null) {
+          result.time_ = time_;
+        } else {
+          result.time_ = timeBuilder_.build();
         }
-        if (((from_bitField0_ & 0x00000800) != 0)) {
-          result.auth_ = authBuilder_ == null ? auth_ : authBuilder_.build();
-          to_bitField0_ |= 0x00000002;
+        result.size_ = size_;
+        result.protocol_ = protocol_;
+        result.reason_ = reason_;
+        if (authBuilder_ == null) {
+          result.auth_ = auth_;
+        } else {
+          result.auth_ = authBuilder_.build();
         }
-        result.bitField0_ |= to_bitField0_;
+        onBuilt();
+        return result;
       }
 
       @java.lang.Override
@@ -7195,34 +6982,27 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Request other)
           return this;
         if (!other.getId().isEmpty()) {
           id_ = other.id_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getMethod().isEmpty()) {
           method_ = other.method_;
-          bitField0_ |= 0x00000002;
           onChanged();
         }
         internalGetMutableHeaders().mergeFrom(other.internalGetHeaders());
-        bitField0_ |= 0x00000004;
         if (!other.getPath().isEmpty()) {
           path_ = other.path_;
-          bitField0_ |= 0x00000008;
           onChanged();
         }
         if (!other.getHost().isEmpty()) {
           host_ = other.host_;
-          bitField0_ |= 0x00000010;
           onChanged();
         }
         if (!other.getScheme().isEmpty()) {
           scheme_ = other.scheme_;
-          bitField0_ |= 0x00000020;
           onChanged();
         }
         if (!other.getQuery().isEmpty()) {
           query_ = other.query_;
-          bitField0_ |= 0x00000040;
           onChanged();
         }
         if (other.hasTime()) {
@@ -7233,12 +7013,10 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Request other)
         }
         if (!other.getProtocol().isEmpty()) {
           protocol_ = other.protocol_;
-          bitField0_ |= 0x00000200;
           onChanged();
         }
         if (!other.getReason().isEmpty()) {
           reason_ = other.reason_;
-          bitField0_ |= 0x00000400;
           onChanged();
         }
         if (other.hasAuth()) {
@@ -7273,13 +7051,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   id_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   method_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               case 26:
@@ -7291,61 +7069,60 @@ public Builder mergeFrom(
                   internalGetMutableHeaders()
                       .getMutableMap()
                       .put(headers__.getKey(), headers__.getValue());
-                  bitField0_ |= 0x00000004;
                   break;
                 } // case 26
               case 34:
                 {
                   path_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000008;
+
                   break;
                 } // case 34
               case 42:
                 {
                   host_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000010;
+
                   break;
                 } // case 42
               case 50:
                 {
                   scheme_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000020;
+
                   break;
                 } // case 50
               case 58:
                 {
                   query_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000040;
+
                   break;
                 } // case 58
               case 74:
                 {
                   input.readMessage(getTimeFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000080;
+
                   break;
                 } // case 74
               case 80:
                 {
                   size_ = input.readInt64();
-                  bitField0_ |= 0x00000100;
+
                   break;
                 } // case 80
               case 90:
                 {
                   protocol_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000200;
+
                   break;
                 } // case 90
               case 98:
                 {
                   reason_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000400;
+
                   break;
                 } // case 98
               case 106:
                 {
                   input.readMessage(getAuthFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000800;
+
                   break;
                 } // case 106
               default:
@@ -7437,8 +7214,8 @@ public Builder setId(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         id_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7457,8 +7234,8 @@ public Builder setId(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearId() {
+
         id_ = getDefaultInstance().getId();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -7482,8 +7259,8 @@ public Builder setIdBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         id_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -7552,8 +7329,8 @@ public Builder setMethod(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         method_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -7570,8 +7347,8 @@ public Builder setMethod(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearMethod() {
+
         method_ = getDefaultInstance().getMethod();
-        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -7593,8 +7370,8 @@ public Builder setMethodBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         method_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -7611,6 +7388,8 @@ public Builder setMethodBytes(com.google.protobuf.ByteString value) {
 
       private com.google.protobuf.MapField
           internalGetMutableHeaders() {
+        onChanged();
+        ;
         if (headers_ == null) {
           headers_ =
               com.google.protobuf.MapField.newMapField(HeadersDefaultEntryHolder.defaultEntry);
@@ -7618,8 +7397,6 @@ public Builder setMethodBytes(com.google.protobuf.ByteString value) {
         if (!headers_.isMutable()) {
           headers_ = headers_.copy();
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
         return headers_;
       }
 
@@ -7681,10 +7458,8 @@ public java.util.Map getHeadersMap() {
        * map<string, string> headers = 3;
        */
       @java.lang.Override
-      public /* nullable */ java.lang.String getHeadersOrDefault(
-          java.lang.String key,
-          /* nullable */
-          java.lang.String defaultValue) {
+      public java.lang.String getHeadersOrDefault(
+          java.lang.String key, java.lang.String defaultValue) {
         if (key == null) {
           throw new NullPointerException("map key");
         }
@@ -7716,7 +7491,6 @@ public java.lang.String getHeadersOrThrow(java.lang.String key) {
       }
 
       public Builder clearHeaders() {
-        bitField0_ = (bitField0_ & ~0x00000004);
         internalGetMutableHeaders().getMutableMap().clear();
         return this;
       }
@@ -7743,7 +7517,6 @@ public Builder removeHeaders(java.lang.String key) {
       /** Use alternate mutation accessors instead. */
       @java.lang.Deprecated
       public java.util.Map getMutableHeaders() {
-        bitField0_ |= 0x00000004;
         return internalGetMutableHeaders().getMutableMap();
       }
 
@@ -7765,8 +7538,8 @@ public Builder putHeaders(java.lang.String key, java.lang.String value) {
         if (value == null) {
           throw new NullPointerException("map value");
         }
+
         internalGetMutableHeaders().getMutableMap().put(key, value);
-        bitField0_ |= 0x00000004;
         return this;
       }
 
@@ -7783,7 +7556,6 @@ public Builder putHeaders(java.lang.String key, java.lang.String value) {
        */
       public Builder putAllHeaders(java.util.Map values) {
         internalGetMutableHeaders().getMutableMap().putAll(values);
-        bitField0_ |= 0x00000004;
         return this;
       }
 
@@ -7851,8 +7623,8 @@ public Builder setPath(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         path_ = value;
-        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -7869,8 +7641,8 @@ public Builder setPath(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearPath() {
+
         path_ = getDefaultInstance().getPath();
-        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -7892,8 +7664,8 @@ public Builder setPathBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         path_ = value;
-        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -7962,8 +7734,8 @@ public Builder setHost(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         host_ = value;
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -7980,8 +7752,8 @@ public Builder setHost(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearHost() {
+
         host_ = getDefaultInstance().getHost();
-        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
       }
@@ -8003,8 +7775,8 @@ public Builder setHostBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         host_ = value;
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -8073,8 +7845,8 @@ public Builder setScheme(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         scheme_ = value;
-        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -8091,8 +7863,8 @@ public Builder setScheme(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearScheme() {
+
         scheme_ = getDefaultInstance().getScheme();
-        bitField0_ = (bitField0_ & ~0x00000020);
         onChanged();
         return this;
       }
@@ -8114,8 +7886,8 @@ public Builder setSchemeBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         scheme_ = value;
-        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -8187,8 +7959,8 @@ public Builder setQuery(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         query_ = value;
-        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -8206,8 +7978,8 @@ public Builder setQuery(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearQuery() {
+
         query_ = getDefaultInstance().getQuery();
-        bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
         return this;
       }
@@ -8230,8 +8002,8 @@ public Builder setQueryBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         query_ = value;
-        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -8256,7 +8028,7 @@ public Builder setQueryBytes(com.google.protobuf.ByteString value) {
        * @return Whether the time field is set.
        */
       public boolean hasTime() {
-        return ((bitField0_ & 0x00000080) != 0);
+        return timeBuilder_ != null || time_ != null;
       }
 
       /**
@@ -8295,11 +8067,11 @@ public Builder setTime(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           time_ = value;
+          onChanged();
         } else {
           timeBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000080;
-        onChanged();
+
         return this;
       }
 
@@ -8316,11 +8088,11 @@ public Builder setTime(com.google.protobuf.Timestamp value) {
       public Builder setTime(com.google.protobuf.Timestamp.Builder builderForValue) {
         if (timeBuilder_ == null) {
           time_ = builderForValue.build();
+          onChanged();
         } else {
           timeBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000080;
-        onChanged();
+
         return this;
       }
 
@@ -8336,20 +8108,16 @@ public Builder setTime(com.google.protobuf.Timestamp.Builder builderForValue) {
        */
       public Builder mergeTime(com.google.protobuf.Timestamp value) {
         if (timeBuilder_ == null) {
-          if (((bitField0_ & 0x00000080) != 0)
-              && time_ != null
-              && time_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-            getTimeBuilder().mergeFrom(value);
+          if (time_ != null) {
+            time_ = com.google.protobuf.Timestamp.newBuilder(time_).mergeFrom(value).buildPartial();
           } else {
             time_ = value;
           }
+          onChanged();
         } else {
           timeBuilder_.mergeFrom(value);
         }
-        if (time_ != null) {
-          bitField0_ |= 0x00000080;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -8364,13 +8132,14 @@ public Builder mergeTime(com.google.protobuf.Timestamp value) {
        * .google.protobuf.Timestamp time = 9;
        */
       public Builder clearTime() {
-        bitField0_ = (bitField0_ & ~0x00000080);
-        time_ = null;
-        if (timeBuilder_ != null) {
-          timeBuilder_.dispose();
+        if (timeBuilder_ == null) {
+          time_ = null;
+          onChanged();
+        } else {
+          time_ = null;
           timeBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -8385,7 +8154,7 @@ public Builder clearTime() {
        * .google.protobuf.Timestamp time = 9;
        */
       public com.google.protobuf.Timestamp.Builder getTimeBuilder() {
-        bitField0_ |= 0x00000080;
+
         onChanged();
         return getTimeFieldBuilder().getBuilder();
       }
@@ -8468,7 +8237,6 @@ public long getSize() {
       public Builder setSize(long value) {
 
         size_ = value;
-        bitField0_ |= 0x00000100;
         onChanged();
         return this;
       }
@@ -8485,7 +8253,7 @@ public Builder setSize(long value) {
        * @return This builder for chaining.
        */
       public Builder clearSize() {
-        bitField0_ = (bitField0_ & ~0x00000100);
+
         size_ = 0L;
         onChanged();
         return this;
@@ -8564,8 +8332,8 @@ public Builder setProtocol(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         protocol_ = value;
-        bitField0_ |= 0x00000200;
         onChanged();
         return this;
       }
@@ -8585,8 +8353,8 @@ public Builder setProtocol(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearProtocol() {
+
         protocol_ = getDefaultInstance().getProtocol();
-        bitField0_ = (bitField0_ & ~0x00000200);
         onChanged();
         return this;
       }
@@ -8611,8 +8379,8 @@ public Builder setProtocolBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         protocol_ = value;
-        bitField0_ |= 0x00000200;
         onChanged();
         return this;
       }
@@ -8684,8 +8452,8 @@ public Builder setReason(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         reason_ = value;
-        bitField0_ |= 0x00000400;
         onChanged();
         return this;
       }
@@ -8703,8 +8471,8 @@ public Builder setReason(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearReason() {
+
         reason_ = getDefaultInstance().getReason();
-        bitField0_ = (bitField0_ & ~0x00000400);
         onChanged();
         return this;
       }
@@ -8727,8 +8495,8 @@ public Builder setReasonBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         reason_ = value;
-        bitField0_ |= 0x00000400;
         onChanged();
         return this;
       }
@@ -8753,7 +8521,7 @@ public Builder setReasonBytes(com.google.protobuf.ByteString value) {
        * @return Whether the auth field is set.
        */
       public boolean hasAuth() {
-        return ((bitField0_ & 0x00000800) != 0);
+        return authBuilder_ != null || auth_ != null;
       }
 
       /**
@@ -8794,11 +8562,11 @@ public Builder setAuth(com.google.rpc.context.AttributeContext.Auth value) {
             throw new NullPointerException();
           }
           auth_ = value;
+          onChanged();
         } else {
           authBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000800;
-        onChanged();
+
         return this;
       }
 
@@ -8815,11 +8583,11 @@ public Builder setAuth(com.google.rpc.context.AttributeContext.Auth value) {
       public Builder setAuth(com.google.rpc.context.AttributeContext.Auth.Builder builderForValue) {
         if (authBuilder_ == null) {
           auth_ = builderForValue.build();
+          onChanged();
         } else {
           authBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000800;
-        onChanged();
+
         return this;
       }
 
@@ -8835,20 +8603,19 @@ public Builder setAuth(com.google.rpc.context.AttributeContext.Auth.Builder buil
        */
       public Builder mergeAuth(com.google.rpc.context.AttributeContext.Auth value) {
         if (authBuilder_ == null) {
-          if (((bitField0_ & 0x00000800) != 0)
-              && auth_ != null
-              && auth_ != com.google.rpc.context.AttributeContext.Auth.getDefaultInstance()) {
-            getAuthBuilder().mergeFrom(value);
+          if (auth_ != null) {
+            auth_ =
+                com.google.rpc.context.AttributeContext.Auth.newBuilder(auth_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             auth_ = value;
           }
+          onChanged();
         } else {
           authBuilder_.mergeFrom(value);
         }
-        if (auth_ != null) {
-          bitField0_ |= 0x00000800;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -8863,13 +8630,14 @@ public Builder mergeAuth(com.google.rpc.context.AttributeContext.Auth value) {
        * .google.rpc.context.AttributeContext.Auth auth = 13;
        */
       public Builder clearAuth() {
-        bitField0_ = (bitField0_ & ~0x00000800);
-        auth_ = null;
-        if (authBuilder_ != null) {
-          authBuilder_.dispose();
+        if (authBuilder_ == null) {
+          auth_ = null;
+          onChanged();
+        } else {
+          auth_ = null;
           authBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -8884,7 +8652,7 @@ public Builder clearAuth() {
        * .google.rpc.context.AttributeContext.Auth auth = 13;
        */
       public com.google.rpc.context.AttributeContext.Auth.Builder getAuthBuilder() {
-        bitField0_ |= 0x00000800;
+
         onChanged();
         return getAuthFieldBuilder().getBuilder();
       }
@@ -9085,6 +8853,7 @@ public interface ResponseOrBuilder
      *
      * map<string, string> headers = 3;
      */
+
     /* nullable */
     java.lang.String getHeadersOrDefault(
         java.lang.String key,
@@ -9220,6 +8989,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;
@@ -9227,8 +9001,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @SuppressWarnings({"rawtypes"})
     @java.lang.Override
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 3:
           return internalGetHeaders();
@@ -9247,9 +9020,8 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
               com.google.rpc.context.AttributeContext.Response.Builder.class);
     }
 
-    private int bitField0_;
     public static final int CODE_FIELD_NUMBER = 1;
-    private long code_ = 0L;
+    private long code_;
 
     /**
      *
@@ -9268,7 +9040,7 @@ public long getCode() {
     }
 
     public static final int SIZE_FIELD_NUMBER = 2;
-    private long size_ = 0L;
+    private long size_;
 
     /**
      *
@@ -9299,7 +9071,6 @@ private static final class HeadersDefaultEntryHolder {
               "");
     }
 
-    @SuppressWarnings("serial")
     private com.google.protobuf.MapField headers_;
 
     private com.google.protobuf.MapField internalGetHeaders() {
@@ -9367,10 +9138,8 @@ public java.util.Map getHeadersMap() {
      * map<string, string> headers = 3;
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getHeadersOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getHeadersOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -9418,7 +9187,7 @@ public java.lang.String getHeadersOrThrow(java.lang.String key) {
      */
     @java.lang.Override
     public boolean hasTime() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return time_ != null;
     }
 
     /**
@@ -9450,7 +9219,7 @@ public com.google.protobuf.Timestamp getTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getTimeOrBuilder() {
-      return time_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : time_;
+      return getTime();
     }
 
     public static final int BACKEND_LATENCY_FIELD_NUMBER = 5;
@@ -9472,7 +9241,7 @@ public com.google.protobuf.TimestampOrBuilder getTimeOrBuilder() {
      */
     @java.lang.Override
     public boolean hasBackendLatency() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return backendLatency_ != null;
     }
 
     /**
@@ -9510,9 +9279,7 @@ public com.google.protobuf.Duration getBackendLatency() {
      */
     @java.lang.Override
     public com.google.protobuf.DurationOrBuilder getBackendLatencyOrBuilder() {
-      return backendLatency_ == null
-          ? com.google.protobuf.Duration.getDefaultInstance()
-          : backendLatency_;
+      return getBackendLatency();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -9537,10 +9304,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       }
       com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
           output, internalGetHeaders(), HeadersDefaultEntryHolder.defaultEntry, 3);
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (time_ != null) {
         output.writeMessage(4, getTime());
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (backendLatency_ != null) {
         output.writeMessage(5, getBackendLatency());
       }
       getUnknownFields().writeTo(output);
@@ -9568,10 +9335,10 @@ public int getSerializedSize() {
                 .build();
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, headers__);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (time_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getTime());
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (backendLatency_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getBackendLatency());
       }
       size += getUnknownFields().getSerializedSize();
@@ -9751,8 +9518,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-          int number) {
+      protected com.google.protobuf.MapField internalGetMapField(int number) {
         switch (number) {
           case 3:
             return internalGetHeaders();
@@ -9762,8 +9528,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
       }
 
       @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-          int number) {
+      protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
         switch (number) {
           case 3:
             return internalGetMutableHeaders();
@@ -9783,37 +9548,30 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
       }
 
       // Construct using com.google.rpc.context.AttributeContext.Response.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getTimeFieldBuilder();
-          getBackendLatencyFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         code_ = 0L;
+
         size_ = 0L;
+
         internalGetMutableHeaders().clear();
-        time_ = null;
-        if (timeBuilder_ != null) {
-          timeBuilder_.dispose();
+        if (timeBuilder_ == null) {
+          time_ = null;
+        } else {
+          time_ = null;
           timeBuilder_ = null;
         }
-        backendLatency_ = null;
-        if (backendLatencyBuilder_ != null) {
-          backendLatencyBuilder_.dispose();
+        if (backendLatencyBuilder_ == null) {
+          backendLatency_ = null;
+        } else {
+          backendLatency_ = null;
           backendLatencyBuilder_ = null;
         }
         return this;
@@ -9843,36 +9601,23 @@ public com.google.rpc.context.AttributeContext.Response build() {
       public com.google.rpc.context.AttributeContext.Response buildPartial() {
         com.google.rpc.context.AttributeContext.Response result =
             new com.google.rpc.context.AttributeContext.Response(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
-        onBuilt();
-        return result;
-      }
-
-      private void buildPartial0(com.google.rpc.context.AttributeContext.Response result) {
         int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.code_ = code_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.size_ = size_;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.headers_ = internalGetHeaders();
-          result.headers_.makeImmutable();
-        }
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000008) != 0)) {
-          result.time_ = timeBuilder_ == null ? time_ : timeBuilder_.build();
-          to_bitField0_ |= 0x00000001;
+        result.code_ = code_;
+        result.size_ = size_;
+        result.headers_ = internalGetHeaders();
+        result.headers_.makeImmutable();
+        if (timeBuilder_ == null) {
+          result.time_ = time_;
+        } else {
+          result.time_ = timeBuilder_.build();
         }
-        if (((from_bitField0_ & 0x00000010) != 0)) {
-          result.backendLatency_ =
-              backendLatencyBuilder_ == null ? backendLatency_ : backendLatencyBuilder_.build();
-          to_bitField0_ |= 0x00000002;
+        if (backendLatencyBuilder_ == null) {
+          result.backendLatency_ = backendLatency_;
+        } else {
+          result.backendLatency_ = backendLatencyBuilder_.build();
         }
-        result.bitField0_ |= to_bitField0_;
+        onBuilt();
+        return result;
       }
 
       @java.lang.Override
@@ -9930,7 +9675,6 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Response other)
           setSize(other.getSize());
         }
         internalGetMutableHeaders().mergeFrom(other.internalGetHeaders());
-        bitField0_ |= 0x00000004;
         if (other.hasTime()) {
           mergeTime(other.getTime());
         }
@@ -9966,13 +9710,13 @@ public Builder mergeFrom(
               case 8:
                 {
                   code_ = input.readInt64();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 8
               case 16:
                 {
                   size_ = input.readInt64();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 16
               case 26:
@@ -9984,20 +9728,19 @@ public Builder mergeFrom(
                   internalGetMutableHeaders()
                       .getMutableMap()
                       .put(headers__.getKey(), headers__.getValue());
-                  bitField0_ |= 0x00000004;
                   break;
                 } // case 26
               case 34:
                 {
                   input.readMessage(getTimeFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000008;
+
                   break;
                 } // case 34
               case 42:
                 {
                   input.readMessage(
                       getBackendLatencyFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000010;
+
                   break;
                 } // case 42
               default:
@@ -10052,7 +9795,6 @@ public long getCode() {
       public Builder setCode(long value) {
 
         code_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -10069,7 +9811,7 @@ public Builder setCode(long value) {
        * @return This builder for chaining.
        */
       public Builder clearCode() {
-        bitField0_ = (bitField0_ & ~0x00000001);
+
         code_ = 0L;
         onChanged();
         return this;
@@ -10108,7 +9850,6 @@ public long getSize() {
       public Builder setSize(long value) {
 
         size_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -10125,7 +9866,7 @@ public Builder setSize(long value) {
        * @return This builder for chaining.
        */
       public Builder clearSize() {
-        bitField0_ = (bitField0_ & ~0x00000002);
+
         size_ = 0L;
         onChanged();
         return this;
@@ -10143,6 +9884,8 @@ public Builder clearSize() {
 
       private com.google.protobuf.MapField
           internalGetMutableHeaders() {
+        onChanged();
+        ;
         if (headers_ == null) {
           headers_ =
               com.google.protobuf.MapField.newMapField(HeadersDefaultEntryHolder.defaultEntry);
@@ -10150,8 +9893,6 @@ public Builder clearSize() {
         if (!headers_.isMutable()) {
           headers_ = headers_.copy();
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
         return headers_;
       }
 
@@ -10213,10 +9954,8 @@ public java.util.Map getHeadersMap() {
        * map<string, string> headers = 3;
        */
       @java.lang.Override
-      public /* nullable */ java.lang.String getHeadersOrDefault(
-          java.lang.String key,
-          /* nullable */
-          java.lang.String defaultValue) {
+      public java.lang.String getHeadersOrDefault(
+          java.lang.String key, java.lang.String defaultValue) {
         if (key == null) {
           throw new NullPointerException("map key");
         }
@@ -10248,7 +9987,6 @@ public java.lang.String getHeadersOrThrow(java.lang.String key) {
       }
 
       public Builder clearHeaders() {
-        bitField0_ = (bitField0_ & ~0x00000004);
         internalGetMutableHeaders().getMutableMap().clear();
         return this;
       }
@@ -10275,7 +10013,6 @@ public Builder removeHeaders(java.lang.String key) {
       /** Use alternate mutation accessors instead. */
       @java.lang.Deprecated
       public java.util.Map getMutableHeaders() {
-        bitField0_ |= 0x00000004;
         return internalGetMutableHeaders().getMutableMap();
       }
 
@@ -10297,8 +10034,8 @@ public Builder putHeaders(java.lang.String key, java.lang.String value) {
         if (value == null) {
           throw new NullPointerException("map value");
         }
+
         internalGetMutableHeaders().getMutableMap().put(key, value);
-        bitField0_ |= 0x00000004;
         return this;
       }
 
@@ -10315,7 +10052,6 @@ public Builder putHeaders(java.lang.String key, java.lang.String value) {
        */
       public Builder putAllHeaders(java.util.Map values) {
         internalGetMutableHeaders().getMutableMap().putAll(values);
-        bitField0_ |= 0x00000004;
         return this;
       }
 
@@ -10339,7 +10075,7 @@ public Builder putAllHeaders(java.util.Map v
        * @return Whether the time field is set.
        */
       public boolean hasTime() {
-        return ((bitField0_ & 0x00000008) != 0);
+        return timeBuilder_ != null || time_ != null;
       }
 
       /**
@@ -10378,11 +10114,11 @@ public Builder setTime(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           time_ = value;
+          onChanged();
         } else {
           timeBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000008;
-        onChanged();
+
         return this;
       }
 
@@ -10399,11 +10135,11 @@ public Builder setTime(com.google.protobuf.Timestamp value) {
       public Builder setTime(com.google.protobuf.Timestamp.Builder builderForValue) {
         if (timeBuilder_ == null) {
           time_ = builderForValue.build();
+          onChanged();
         } else {
           timeBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000008;
-        onChanged();
+
         return this;
       }
 
@@ -10419,20 +10155,16 @@ public Builder setTime(com.google.protobuf.Timestamp.Builder builderForValue) {
        */
       public Builder mergeTime(com.google.protobuf.Timestamp value) {
         if (timeBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) != 0)
-              && time_ != null
-              && time_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-            getTimeBuilder().mergeFrom(value);
+          if (time_ != null) {
+            time_ = com.google.protobuf.Timestamp.newBuilder(time_).mergeFrom(value).buildPartial();
           } else {
             time_ = value;
           }
+          onChanged();
         } else {
           timeBuilder_.mergeFrom(value);
         }
-        if (time_ != null) {
-          bitField0_ |= 0x00000008;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -10447,13 +10179,14 @@ public Builder mergeTime(com.google.protobuf.Timestamp value) {
        * .google.protobuf.Timestamp time = 4;
        */
       public Builder clearTime() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        time_ = null;
-        if (timeBuilder_ != null) {
-          timeBuilder_.dispose();
+        if (timeBuilder_ == null) {
+          time_ = null;
+          onChanged();
+        } else {
+          time_ = null;
           timeBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -10468,7 +10201,7 @@ public Builder clearTime() {
        * .google.protobuf.Timestamp time = 4;
        */
       public com.google.protobuf.Timestamp.Builder getTimeBuilder() {
-        bitField0_ |= 0x00000008;
+
         onChanged();
         return getTimeFieldBuilder().getBuilder();
       }
@@ -10540,7 +10273,7 @@ public com.google.protobuf.TimestampOrBuilder getTimeOrBuilder() {
        * @return Whether the backendLatency field is set.
        */
       public boolean hasBackendLatency() {
-        return ((bitField0_ & 0x00000010) != 0);
+        return backendLatencyBuilder_ != null || backendLatency_ != null;
       }
 
       /**
@@ -10585,11 +10318,11 @@ public Builder setBackendLatency(com.google.protobuf.Duration value) {
             throw new NullPointerException();
           }
           backendLatency_ = value;
+          onChanged();
         } else {
           backendLatencyBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000010;
-        onChanged();
+
         return this;
       }
 
@@ -10608,11 +10341,11 @@ public Builder setBackendLatency(com.google.protobuf.Duration value) {
       public Builder setBackendLatency(com.google.protobuf.Duration.Builder builderForValue) {
         if (backendLatencyBuilder_ == null) {
           backendLatency_ = builderForValue.build();
+          onChanged();
         } else {
           backendLatencyBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000010;
-        onChanged();
+
         return this;
       }
 
@@ -10630,20 +10363,19 @@ public Builder setBackendLatency(com.google.protobuf.Duration.Builder builderFor
        */
       public Builder mergeBackendLatency(com.google.protobuf.Duration value) {
         if (backendLatencyBuilder_ == null) {
-          if (((bitField0_ & 0x00000010) != 0)
-              && backendLatency_ != null
-              && backendLatency_ != com.google.protobuf.Duration.getDefaultInstance()) {
-            getBackendLatencyBuilder().mergeFrom(value);
+          if (backendLatency_ != null) {
+            backendLatency_ =
+                com.google.protobuf.Duration.newBuilder(backendLatency_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             backendLatency_ = value;
           }
+          onChanged();
         } else {
           backendLatencyBuilder_.mergeFrom(value);
         }
-        if (backendLatency_ != null) {
-          bitField0_ |= 0x00000010;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -10660,13 +10392,14 @@ public Builder mergeBackendLatency(com.google.protobuf.Duration value) {
        * .google.protobuf.Duration backend_latency = 5;
        */
       public Builder clearBackendLatency() {
-        bitField0_ = (bitField0_ & ~0x00000010);
-        backendLatency_ = null;
-        if (backendLatencyBuilder_ != null) {
-          backendLatencyBuilder_.dispose();
+        if (backendLatencyBuilder_ == null) {
+          backendLatency_ = null;
+          onChanged();
+        } else {
+          backendLatency_ = null;
           backendLatencyBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -10683,7 +10416,7 @@ public Builder clearBackendLatency() {
        * .google.protobuf.Duration backend_latency = 5;
        */
       public com.google.protobuf.Duration.Builder getBackendLatencyBuilder() {
-        bitField0_ |= 0x00000010;
+
         onChanged();
         return getBackendLatencyFieldBuilder().getBuilder();
       }
@@ -10845,14 +10578,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.
      * 

      *
@@ -10869,14 +10600,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.
      * 

      *
@@ -10892,7 +10621,6 @@ public interface ResourceOrBuilder
      * 
      * 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".
      * 

@@ -10909,7 +10637,6 @@ public interface ResourceOrBuilder
      * 
      * 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".
      * 

@@ -10970,6 +10697,7 @@ public interface ResourceOrBuilder
      *
      * map<string, string> labels = 4;
      */
+
     /* nullable */
     java.lang.String getLabelsOrDefault(
         java.lang.String key,
@@ -11029,7 +10757,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/concepts/overview/working-with-objects/annotations/
      * 

@@ -11045,7 +10772,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/concepts/overview/working-with-objects/annotations/
      * 

@@ -11065,7 +10791,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/concepts/overview/working-with-objects/annotations/
      * 

@@ -11081,13 +10806,13 @@ 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/concepts/overview/working-with-objects/annotations/
      * 

      *
      * map<string, string> annotations = 6;
      */
+
     /* nullable */
     java.lang.String getAnnotationsOrDefault(
         java.lang.String key,
@@ -11101,7 +10826,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/concepts/overview/working-with-objects/annotations/
      * 

@@ -11296,7 +11020,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
@@ -11316,7 +11039,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
@@ -11368,6 +11090,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;
@@ -11375,8 +11102,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     @SuppressWarnings({"rawtypes"})
     @java.lang.Override
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 4:
           return internalGetLabels();
@@ -11397,11 +11123,8 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
               com.google.rpc.context.AttributeContext.Resource.Builder.class);
     }
 
-    private int bitField0_;
     public static final int SERVICE_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object service_ = "";
+    private volatile java.lang.Object service_;
 
     /**
      *
@@ -11456,9 +11179,7 @@ public com.google.protobuf.ByteString getServiceBytes() {
     }
 
     public static final int NAME_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object name_ = "";
+    private volatile java.lang.Object name_;
 
     /**
      *
@@ -11467,14 +11188,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.
      * 

      *
@@ -11502,14 +11221,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.
      * 

      *
@@ -11531,9 +11248,7 @@ public com.google.protobuf.ByteString getNameBytes() {
     }
 
     public static final int TYPE_FIELD_NUMBER = 3;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object type_ = "";
+    private volatile java.lang.Object type_;
 
     /**
      *
@@ -11541,7 +11256,6 @@ public com.google.protobuf.ByteString getNameBytes() {
      * 
      * 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".
      * 

@@ -11569,7 +11283,6 @@ public java.lang.String getType() {
      * 
      * 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".
      * 

@@ -11604,7 +11317,6 @@ private static final class LabelsDefaultEntryHolder {
               "");
     }
 
-    @SuppressWarnings("serial")
     private com.google.protobuf.MapField labels_;
 
     private com.google.protobuf.MapField internalGetLabels() {
@@ -11669,10 +11381,8 @@ public java.util.Map getLabelsMap() {
      * map<string, string> labels = 4;
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getLabelsOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getLabelsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -11703,9 +11413,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
     }
 
     public static final int UID_FIELD_NUMBER = 5;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object uid_ = "";
+    private volatile java.lang.Object uid_;
 
     /**
      *
@@ -11776,7 +11484,6 @@ private static final class AnnotationsDefaultEntryHolder {
               "");
     }
 
-    @SuppressWarnings("serial")
     private com.google.protobuf.MapField annotations_;
 
     private com.google.protobuf.MapField
@@ -11799,7 +11506,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/concepts/overview/working-with-objects/annotations/
      * 

@@ -11828,7 +11534,6 @@ public java.util.Map 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/concepts/overview/working-with-objects/annotations/
      * 

@@ -11847,7 +11552,6 @@ public java.util.Map 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/concepts/overview/working-with-objects/annotations/
      * 

@@ -11855,10 +11559,8 @@ public java.util.Map getAnnotationsMap() {
      * map<string, string> annotations = 6;
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getAnnotationsOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getAnnotationsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -11873,7 +11575,6 @@ public java.util.Map 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/concepts/overview/working-with-objects/annotations/
      * 

@@ -11893,9 +11594,7 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
     }
 
     public static final int DISPLAY_NAME_FIELD_NUMBER = 7;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object displayName_ = "";
+    private volatile java.lang.Object displayName_;
 
     /**
      *
@@ -11962,7 +11661,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
      */
     @java.lang.Override
     public boolean hasCreateTime() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return createTime_ != null;
     }
 
     /**
@@ -11994,7 +11693,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-      return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+      return getCreateTime();
     }
 
     public static final int UPDATE_TIME_FIELD_NUMBER = 9;
@@ -12015,7 +11714,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      */
     @java.lang.Override
     public boolean hasUpdateTime() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return updateTime_ != null;
     }
 
     /**
@@ -12049,7 +11748,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-      return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+      return getUpdateTime();
     }
 
     public static final int DELETE_TIME_FIELD_NUMBER = 10;
@@ -12069,7 +11768,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
      */
     @java.lang.Override
     public boolean hasDeleteTime() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return deleteTime_ != null;
     }
 
     /**
@@ -12101,13 +11800,11 @@ public com.google.protobuf.Timestamp getDeleteTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getDeleteTimeOrBuilder() {
-      return deleteTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : deleteTime_;
+      return getDeleteTime();
     }
 
     public static final int ETAG_FIELD_NUMBER = 11;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object etag_ = "";
+    private volatile java.lang.Object etag_;
 
     /**
      *
@@ -12162,9 +11859,7 @@ public com.google.protobuf.ByteString getEtagBytes() {
     }
 
     public static final int LOCATION_FIELD_NUMBER = 12;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object location_ = "";
+    private volatile java.lang.Object location_;
 
     /**
      *
@@ -12173,7 +11868,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
@@ -12204,7 +11898,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
@@ -12261,13 +11954,13 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 7, displayName_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (createTime_ != null) {
         output.writeMessage(8, getCreateTime());
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (updateTime_ != null) {
         output.writeMessage(9, getUpdateTime());
       }
-      if (((bitField0_ & 0x00000004) != 0)) {
+      if (deleteTime_ != null) {
         output.writeMessage(10, getDeleteTime());
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(etag_)) {
@@ -12320,13 +12013,13 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, displayName_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (createTime_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getCreateTime());
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (updateTime_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getUpdateTime());
       }
-      if (((bitField0_ & 0x00000004) != 0)) {
+      if (deleteTime_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getDeleteTime());
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(etag_)) {
@@ -12541,8 +12234,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-          int number) {
+      protected com.google.protobuf.MapField internalGetMapField(int number) {
         switch (number) {
           case 4:
             return internalGetLabels();
@@ -12554,8 +12246,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
       }
 
       @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-          int number) {
+      protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
         switch (number) {
           case 4:
             return internalGetMutableLabels();
@@ -12577,51 +12268,49 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
       }
 
       // Construct using com.google.rpc.context.AttributeContext.Resource.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getCreateTimeFieldBuilder();
-          getUpdateTimeFieldBuilder();
-          getDeleteTimeFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         service_ = "";
+
         name_ = "";
+
         type_ = "";
+
         internalGetMutableLabels().clear();
         uid_ = "";
+
         internalGetMutableAnnotations().clear();
         displayName_ = "";
-        createTime_ = null;
-        if (createTimeBuilder_ != null) {
-          createTimeBuilder_.dispose();
+
+        if (createTimeBuilder_ == null) {
+          createTime_ = null;
+        } else {
+          createTime_ = null;
           createTimeBuilder_ = null;
         }
-        updateTime_ = null;
-        if (updateTimeBuilder_ != null) {
-          updateTimeBuilder_.dispose();
+        if (updateTimeBuilder_ == null) {
+          updateTime_ = null;
+        } else {
+          updateTime_ = null;
           updateTimeBuilder_ = null;
         }
-        deleteTime_ = null;
-        if (deleteTimeBuilder_ != null) {
-          deleteTimeBuilder_.dispose();
+        if (deleteTimeBuilder_ == null) {
+          deleteTime_ = null;
+        } else {
+          deleteTime_ = null;
           deleteTimeBuilder_ = null;
         }
         etag_ = "";
+
         location_ = "";
+
         return this;
       }
 
@@ -12649,61 +12338,35 @@ public com.google.rpc.context.AttributeContext.Resource build() {
       public com.google.rpc.context.AttributeContext.Resource buildPartial() {
         com.google.rpc.context.AttributeContext.Resource result =
             new com.google.rpc.context.AttributeContext.Resource(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
-        onBuilt();
-        return result;
-      }
-
-      private void buildPartial0(com.google.rpc.context.AttributeContext.Resource result) {
         int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.service_ = service_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.name_ = name_;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.type_ = type_;
-        }
-        if (((from_bitField0_ & 0x00000008) != 0)) {
-          result.labels_ = internalGetLabels();
-          result.labels_.makeImmutable();
-        }
-        if (((from_bitField0_ & 0x00000010) != 0)) {
-          result.uid_ = uid_;
-        }
-        if (((from_bitField0_ & 0x00000020) != 0)) {
-          result.annotations_ = internalGetAnnotations();
-          result.annotations_.makeImmutable();
-        }
-        if (((from_bitField0_ & 0x00000040) != 0)) {
-          result.displayName_ = displayName_;
-        }
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000080) != 0)) {
-          result.createTime_ =
-              createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        if (((from_bitField0_ & 0x00000100) != 0)) {
-          result.updateTime_ =
-              updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
-          to_bitField0_ |= 0x00000002;
-        }
-        if (((from_bitField0_ & 0x00000200) != 0)) {
-          result.deleteTime_ =
-              deleteTimeBuilder_ == null ? deleteTime_ : deleteTimeBuilder_.build();
-          to_bitField0_ |= 0x00000004;
+        result.service_ = service_;
+        result.name_ = name_;
+        result.type_ = type_;
+        result.labels_ = internalGetLabels();
+        result.labels_.makeImmutable();
+        result.uid_ = uid_;
+        result.annotations_ = internalGetAnnotations();
+        result.annotations_.makeImmutable();
+        result.displayName_ = displayName_;
+        if (createTimeBuilder_ == null) {
+          result.createTime_ = createTime_;
+        } else {
+          result.createTime_ = createTimeBuilder_.build();
         }
-        if (((from_bitField0_ & 0x00000400) != 0)) {
-          result.etag_ = etag_;
+        if (updateTimeBuilder_ == null) {
+          result.updateTime_ = updateTime_;
+        } else {
+          result.updateTime_ = updateTimeBuilder_.build();
         }
-        if (((from_bitField0_ & 0x00000800) != 0)) {
-          result.location_ = location_;
+        if (deleteTimeBuilder_ == null) {
+          result.deleteTime_ = deleteTime_;
+        } else {
+          result.deleteTime_ = deleteTimeBuilder_.build();
         }
-        result.bitField0_ |= to_bitField0_;
+        result.etag_ = etag_;
+        result.location_ = location_;
+        onBuilt();
+        return result;
       }
 
       @java.lang.Override
@@ -12756,31 +12419,24 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Resource other)
           return this;
         if (!other.getService().isEmpty()) {
           service_ = other.service_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getName().isEmpty()) {
           name_ = other.name_;
-          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (!other.getType().isEmpty()) {
           type_ = other.type_;
-          bitField0_ |= 0x00000004;
           onChanged();
         }
         internalGetMutableLabels().mergeFrom(other.internalGetLabels());
-        bitField0_ |= 0x00000008;
         if (!other.getUid().isEmpty()) {
           uid_ = other.uid_;
-          bitField0_ |= 0x00000010;
           onChanged();
         }
         internalGetMutableAnnotations().mergeFrom(other.internalGetAnnotations());
-        bitField0_ |= 0x00000020;
         if (!other.getDisplayName().isEmpty()) {
           displayName_ = other.displayName_;
-          bitField0_ |= 0x00000040;
           onChanged();
         }
         if (other.hasCreateTime()) {
@@ -12794,12 +12450,10 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Resource other)
         }
         if (!other.getEtag().isEmpty()) {
           etag_ = other.etag_;
-          bitField0_ |= 0x00000400;
           onChanged();
         }
         if (!other.getLocation().isEmpty()) {
           location_ = other.location_;
-          bitField0_ |= 0x00000800;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -12831,19 +12485,19 @@ public Builder mergeFrom(
               case 10:
                 {
                   service_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   name_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               case 26:
                 {
                   type_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 26
               case 34:
@@ -12855,13 +12509,12 @@ public Builder mergeFrom(
                   internalGetMutableLabels()
                       .getMutableMap()
                       .put(labels__.getKey(), labels__.getValue());
-                  bitField0_ |= 0x00000008;
                   break;
                 } // case 34
               case 42:
                 {
                   uid_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000010;
+
                   break;
                 } // case 42
               case 50:
@@ -12873,43 +12526,42 @@ public Builder mergeFrom(
                   internalGetMutableAnnotations()
                       .getMutableMap()
                       .put(annotations__.getKey(), annotations__.getValue());
-                  bitField0_ |= 0x00000020;
                   break;
                 } // case 50
               case 58:
                 {
                   displayName_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000040;
+
                   break;
                 } // case 58
               case 66:
                 {
                   input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000080;
+
                   break;
                 } // case 66
               case 74:
                 {
                   input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000100;
+
                   break;
                 } // case 74
               case 82:
                 {
                   input.readMessage(getDeleteTimeFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000200;
+
                   break;
                 } // case 82
               case 90:
                 {
                   etag_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000400;
+
                   break;
                 } // case 90
               case 98:
                 {
                   location_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000800;
+
                   break;
                 } // case 98
               default:
@@ -13001,8 +12653,8 @@ public Builder setService(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         service_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -13021,8 +12673,8 @@ public Builder setService(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearService() {
+
         service_ = getDefaultInstance().getService();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -13046,8 +12698,8 @@ public Builder setServiceBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         service_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -13061,14 +12713,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.
        * 

        *
@@ -13095,14 +12745,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.
        * 

        *
@@ -13129,14 +12777,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.
        * 

        *
@@ -13149,8 +12795,8 @@ public Builder setName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         name_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -13162,14 +12808,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.
        * 

        *
@@ -13178,8 +12822,8 @@ public Builder setName(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearName() {
+
         name_ = getDefaultInstance().getName();
-        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -13191,14 +12835,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.
        * 

        *
@@ -13212,8 +12854,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         name_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -13226,7 +12868,6 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
        * 
        * 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".
        * 

@@ -13253,7 +12894,6 @@ public java.lang.String getType() {
        * 
        * 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".
        * 

@@ -13280,7 +12920,6 @@ public com.google.protobuf.ByteString getTypeBytes() {
        * 
        * 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".
        * 

@@ -13294,8 +12933,8 @@ public Builder setType(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         type_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -13306,7 +12945,6 @@ public Builder setType(java.lang.String value) {
        * 
        * 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".
        * 

@@ -13316,8 +12954,8 @@ public Builder setType(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearType() {
+
         type_ = getDefaultInstance().getType();
-        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -13328,7 +12966,6 @@ public Builder clearType() {
        * 
        * 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".
        * 

@@ -13343,8 +12980,8 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         type_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -13360,14 +12997,14 @@ private com.google.protobuf.MapField interna
 
       private com.google.protobuf.MapField
           internalGetMutableLabels() {
+        onChanged();
+        ;
         if (labels_ == null) {
           labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
         }
         if (!labels_.isMutable()) {
           labels_ = labels_.copy();
         }
-        bitField0_ |= 0x00000008;
-        onChanged();
         return labels_;
       }
 
@@ -13426,10 +13063,8 @@ public java.util.Map getLabelsMap() {
        * map<string, string> labels = 4;
        */
       @java.lang.Override
-      public /* nullable */ java.lang.String getLabelsOrDefault(
-          java.lang.String key,
-          /* nullable */
-          java.lang.String defaultValue) {
+      public java.lang.String getLabelsOrDefault(
+          java.lang.String key, java.lang.String defaultValue) {
         if (key == null) {
           throw new NullPointerException("map key");
         }
@@ -13460,7 +13095,6 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) {
       }
 
       public Builder clearLabels() {
-        bitField0_ = (bitField0_ & ~0x00000008);
         internalGetMutableLabels().getMutableMap().clear();
         return this;
       }
@@ -13486,7 +13120,6 @@ public Builder removeLabels(java.lang.String key) {
       /** Use alternate mutation accessors instead. */
       @java.lang.Deprecated
       public java.util.Map getMutableLabels() {
-        bitField0_ |= 0x00000008;
         return internalGetMutableLabels().getMutableMap();
       }
 
@@ -13507,8 +13140,8 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
         if (value == null) {
           throw new NullPointerException("map value");
         }
+
         internalGetMutableLabels().getMutableMap().put(key, value);
-        bitField0_ |= 0x00000008;
         return this;
       }
 
@@ -13524,7 +13157,6 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
        */
       public Builder putAllLabels(java.util.Map values) {
         internalGetMutableLabels().getMutableMap().putAll(values);
-        bitField0_ |= 0x00000008;
         return this;
       }
 
@@ -13604,8 +13236,8 @@ public Builder setUid(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         uid_ = value;
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -13626,8 +13258,8 @@ public Builder setUid(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearUid() {
+
         uid_ = getDefaultInstance().getUid();
-        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
       }
@@ -13653,8 +13285,8 @@ public Builder setUidBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         uid_ = value;
-        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -13672,6 +13304,8 @@ public Builder setUidBytes(com.google.protobuf.ByteString value) {
 
       private com.google.protobuf.MapField
           internalGetMutableAnnotations() {
+        onChanged();
+        ;
         if (annotations_ == null) {
           annotations_ =
               com.google.protobuf.MapField.newMapField(AnnotationsDefaultEntryHolder.defaultEntry);
@@ -13679,8 +13313,6 @@ public Builder setUidBytes(com.google.protobuf.ByteString value) {
         if (!annotations_.isMutable()) {
           annotations_ = annotations_.copy();
         }
-        bitField0_ |= 0x00000020;
-        onChanged();
         return annotations_;
       }
 
@@ -13695,7 +13327,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/concepts/overview/working-with-objects/annotations/
        * 

@@ -13724,7 +13355,6 @@ public java.util.Map 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/concepts/overview/working-with-objects/annotations/
        * 

@@ -13743,7 +13373,6 @@ public java.util.Map 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/concepts/overview/working-with-objects/annotations/
        * 

@@ -13751,10 +13380,8 @@ public java.util.Map getAnnotationsMap() {
        * map<string, string> annotations = 6;
        */
       @java.lang.Override
-      public /* nullable */ java.lang.String getAnnotationsOrDefault(
-          java.lang.String key,
-          /* nullable */
-          java.lang.String defaultValue) {
+      public java.lang.String getAnnotationsOrDefault(
+          java.lang.String key, java.lang.String defaultValue) {
         if (key == null) {
           throw new NullPointerException("map key");
         }
@@ -13769,7 +13396,6 @@ public java.util.Map 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/concepts/overview/working-with-objects/annotations/
        * 

@@ -13789,7 +13415,6 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
       }
 
       public Builder clearAnnotations() {
-        bitField0_ = (bitField0_ & ~0x00000020);
         internalGetMutableAnnotations().getMutableMap().clear();
         return this;
       }
@@ -13801,7 +13426,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/concepts/overview/working-with-objects/annotations/
        * 

@@ -13819,7 +13443,6 @@ public Builder removeAnnotations(java.lang.String key) {
       /** Use alternate mutation accessors instead. */
       @java.lang.Deprecated
       public java.util.Map getMutableAnnotations() {
-        bitField0_ |= 0x00000020;
         return internalGetMutableAnnotations().getMutableMap();
       }
 
@@ -13830,7 +13453,6 @@ public java.util.Map 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/concepts/overview/working-with-objects/annotations/
        * 

@@ -13844,8 +13466,8 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) {
         if (value == null) {
           throw new NullPointerException("map value");
         }
+
         internalGetMutableAnnotations().getMutableMap().put(key, value);
-        bitField0_ |= 0x00000020;
         return this;
       }
 
@@ -13856,7 +13478,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/concepts/overview/working-with-objects/annotations/
        * 

@@ -13865,7 +13486,6 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) {
        */
       public Builder putAllAnnotations(java.util.Map values) {
         internalGetMutableAnnotations().getMutableMap().putAll(values);
-        bitField0_ |= 0x00000020;
         return this;
       }
 
@@ -13933,8 +13553,8 @@ public Builder setDisplayName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         displayName_ = value;
-        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -13951,8 +13571,8 @@ public Builder setDisplayName(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearDisplayName() {
+
         displayName_ = getDefaultInstance().getDisplayName();
-        bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
         return this;
       }
@@ -13974,8 +13594,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         displayName_ = value;
-        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -14000,7 +13620,7 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
        * @return Whether the createTime field is set.
        */
       public boolean hasCreateTime() {
-        return ((bitField0_ & 0x00000080) != 0);
+        return createTimeBuilder_ != null || createTime_ != null;
       }
 
       /**
@@ -14041,11 +13661,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           createTime_ = value;
+          onChanged();
         } else {
           createTimeBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000080;
-        onChanged();
+
         return this;
       }
 
@@ -14062,11 +13682,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
       public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
         if (createTimeBuilder_ == null) {
           createTime_ = builderForValue.build();
+          onChanged();
         } else {
           createTimeBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000080;
-        onChanged();
+
         return this;
       }
 
@@ -14082,20 +13702,19 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
        */
       public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
         if (createTimeBuilder_ == null) {
-          if (((bitField0_ & 0x00000080) != 0)
-              && createTime_ != null
-              && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-            getCreateTimeBuilder().mergeFrom(value);
+          if (createTime_ != null) {
+            createTime_ =
+                com.google.protobuf.Timestamp.newBuilder(createTime_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             createTime_ = value;
           }
+          onChanged();
         } else {
           createTimeBuilder_.mergeFrom(value);
         }
-        if (createTime_ != null) {
-          bitField0_ |= 0x00000080;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -14110,13 +13729,14 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
        * .google.protobuf.Timestamp create_time = 8;
        */
       public Builder clearCreateTime() {
-        bitField0_ = (bitField0_ & ~0x00000080);
-        createTime_ = null;
-        if (createTimeBuilder_ != null) {
-          createTimeBuilder_.dispose();
+        if (createTimeBuilder_ == null) {
+          createTime_ = null;
+          onChanged();
+        } else {
+          createTime_ = null;
           createTimeBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -14131,7 +13751,7 @@ public Builder clearCreateTime() {
        * .google.protobuf.Timestamp create_time = 8;
        */
       public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-        bitField0_ |= 0x00000080;
+
         onChanged();
         return getCreateTimeFieldBuilder().getBuilder();
       }
@@ -14204,7 +13824,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
        * @return Whether the updateTime field is set.
        */
       public boolean hasUpdateTime() {
-        return ((bitField0_ & 0x00000100) != 0);
+        return updateTimeBuilder_ != null || updateTime_ != null;
       }
 
       /**
@@ -14247,11 +13867,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           updateTime_ = value;
+          onChanged();
         } else {
           updateTimeBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000100;
-        onChanged();
+
         return this;
       }
 
@@ -14269,11 +13889,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
       public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
         if (updateTimeBuilder_ == null) {
           updateTime_ = builderForValue.build();
+          onChanged();
         } else {
           updateTimeBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000100;
-        onChanged();
+
         return this;
       }
 
@@ -14290,20 +13910,19 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
        */
       public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
         if (updateTimeBuilder_ == null) {
-          if (((bitField0_ & 0x00000100) != 0)
-              && updateTime_ != null
-              && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-            getUpdateTimeBuilder().mergeFrom(value);
+          if (updateTime_ != null) {
+            updateTime_ =
+                com.google.protobuf.Timestamp.newBuilder(updateTime_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             updateTime_ = value;
           }
+          onChanged();
         } else {
           updateTimeBuilder_.mergeFrom(value);
         }
-        if (updateTime_ != null) {
-          bitField0_ |= 0x00000100;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -14319,13 +13938,14 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
        * .google.protobuf.Timestamp update_time = 9;
        */
       public Builder clearUpdateTime() {
-        bitField0_ = (bitField0_ & ~0x00000100);
-        updateTime_ = null;
-        if (updateTimeBuilder_ != null) {
-          updateTimeBuilder_.dispose();
+        if (updateTimeBuilder_ == null) {
+          updateTime_ = null;
+          onChanged();
+        } else {
+          updateTime_ = null;
           updateTimeBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -14341,7 +13961,7 @@ public Builder clearUpdateTime() {
        * .google.protobuf.Timestamp update_time = 9;
        */
       public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-        bitField0_ |= 0x00000100;
+
         onChanged();
         return getUpdateTimeFieldBuilder().getBuilder();
       }
@@ -14415,7 +14035,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
        * @return Whether the deleteTime field is set.
        */
       public boolean hasDeleteTime() {
-        return ((bitField0_ & 0x00000200) != 0);
+        return deleteTimeBuilder_ != null || deleteTime_ != null;
       }
 
       /**
@@ -14456,11 +14076,11 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           deleteTime_ = value;
+          onChanged();
         } else {
           deleteTimeBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000200;
-        onChanged();
+
         return this;
       }
 
@@ -14477,11 +14097,11 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp value) {
       public Builder setDeleteTime(com.google.protobuf.Timestamp.Builder builderForValue) {
         if (deleteTimeBuilder_ == null) {
           deleteTime_ = builderForValue.build();
+          onChanged();
         } else {
           deleteTimeBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000200;
-        onChanged();
+
         return this;
       }
 
@@ -14497,20 +14117,19 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp.Builder builderForVal
        */
       public Builder mergeDeleteTime(com.google.protobuf.Timestamp value) {
         if (deleteTimeBuilder_ == null) {
-          if (((bitField0_ & 0x00000200) != 0)
-              && deleteTime_ != null
-              && deleteTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-            getDeleteTimeBuilder().mergeFrom(value);
+          if (deleteTime_ != null) {
+            deleteTime_ =
+                com.google.protobuf.Timestamp.newBuilder(deleteTime_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             deleteTime_ = value;
           }
+          onChanged();
         } else {
           deleteTimeBuilder_.mergeFrom(value);
         }
-        if (deleteTime_ != null) {
-          bitField0_ |= 0x00000200;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -14525,13 +14144,14 @@ public Builder mergeDeleteTime(com.google.protobuf.Timestamp value) {
        * .google.protobuf.Timestamp delete_time = 10;
        */
       public Builder clearDeleteTime() {
-        bitField0_ = (bitField0_ & ~0x00000200);
-        deleteTime_ = null;
-        if (deleteTimeBuilder_ != null) {
-          deleteTimeBuilder_.dispose();
+        if (deleteTimeBuilder_ == null) {
+          deleteTime_ = null;
+          onChanged();
+        } else {
+          deleteTime_ = null;
           deleteTimeBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -14546,7 +14166,7 @@ public Builder clearDeleteTime() {
        * .google.protobuf.Timestamp delete_time = 10;
        */
       public com.google.protobuf.Timestamp.Builder getDeleteTimeBuilder() {
-        bitField0_ |= 0x00000200;
+
         onChanged();
         return getDeleteTimeFieldBuilder().getBuilder();
       }
@@ -14668,8 +14288,8 @@ public Builder setEtag(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         etag_ = value;
-        bitField0_ |= 0x00000400;
         onChanged();
         return this;
       }
@@ -14688,8 +14308,8 @@ public Builder setEtag(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearEtag() {
+
         etag_ = getDefaultInstance().getEtag();
-        bitField0_ = (bitField0_ & ~0x00000400);
         onChanged();
         return this;
       }
@@ -14713,8 +14333,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         etag_ = value;
-        bitField0_ |= 0x00000400;
         onChanged();
         return this;
       }
@@ -14728,7 +14348,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
@@ -14758,7 +14377,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
@@ -14788,7 +14406,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
@@ -14804,8 +14421,8 @@ public Builder setLocation(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         location_ = value;
-        bitField0_ |= 0x00000800;
         onChanged();
         return this;
       }
@@ -14817,7 +14434,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
@@ -14829,8 +14445,8 @@ public Builder setLocation(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearLocation() {
+
         location_ = getDefaultInstance().getLocation();
-        bitField0_ = (bitField0_ & ~0x00000800);
         onChanged();
         return this;
       }
@@ -14842,7 +14458,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
@@ -14859,8 +14474,8 @@ public Builder setLocationBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         location_ = value;
-        bitField0_ |= 0x00000800;
         onChanged();
         return this;
       }
@@ -14929,7 +14544,6 @@ public com.google.rpc.context.AttributeContext.Resource getDefaultInstanceForTyp
     }
   }
 
-  private int bitField0_;
   public static final int ORIGIN_FIELD_NUMBER = 7;
   private com.google.rpc.context.AttributeContext.Peer origin_;
 
@@ -14948,7 +14562,7 @@ public com.google.rpc.context.AttributeContext.Resource getDefaultInstanceForTyp
    */
   @java.lang.Override
   public boolean hasOrigin() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return origin_ != null;
   }
 
   /**
@@ -14984,9 +14598,7 @@ public com.google.rpc.context.AttributeContext.Peer getOrigin() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.PeerOrBuilder getOriginOrBuilder() {
-    return origin_ == null
-        ? com.google.rpc.context.AttributeContext.Peer.getDefaultInstance()
-        : origin_;
+    return getOrigin();
   }
 
   public static final int SOURCE_FIELD_NUMBER = 1;
@@ -15007,7 +14619,7 @@ public com.google.rpc.context.AttributeContext.PeerOrBuilder getOriginOrBuilder(
    */
   @java.lang.Override
   public boolean hasSource() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return source_ != null;
   }
 
   /**
@@ -15043,9 +14655,7 @@ public com.google.rpc.context.AttributeContext.Peer getSource() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.PeerOrBuilder getSourceOrBuilder() {
-    return source_ == null
-        ? com.google.rpc.context.AttributeContext.Peer.getDefaultInstance()
-        : source_;
+    return getSource();
   }
 
   public static final int DESTINATION_FIELD_NUMBER = 2;
@@ -15066,7 +14676,7 @@ public com.google.rpc.context.AttributeContext.PeerOrBuilder getSourceOrBuilder(
    */
   @java.lang.Override
   public boolean hasDestination() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return destination_ != null;
   }
 
   /**
@@ -15102,9 +14712,7 @@ public com.google.rpc.context.AttributeContext.Peer getDestination() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.PeerOrBuilder getDestinationOrBuilder() {
-    return destination_ == null
-        ? com.google.rpc.context.AttributeContext.Peer.getDefaultInstance()
-        : destination_;
+    return getDestination();
   }
 
   public static final int REQUEST_FIELD_NUMBER = 3;
@@ -15123,7 +14731,7 @@ public com.google.rpc.context.AttributeContext.PeerOrBuilder getDestinationOrBui
    */
   @java.lang.Override
   public boolean hasRequest() {
-    return ((bitField0_ & 0x00000008) != 0);
+    return request_ != null;
   }
 
   /**
@@ -15155,9 +14763,7 @@ public com.google.rpc.context.AttributeContext.Request getRequest() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.RequestOrBuilder getRequestOrBuilder() {
-    return request_ == null
-        ? com.google.rpc.context.AttributeContext.Request.getDefaultInstance()
-        : request_;
+    return getRequest();
   }
 
   public static final int RESPONSE_FIELD_NUMBER = 4;
@@ -15176,7 +14782,7 @@ public com.google.rpc.context.AttributeContext.RequestOrBuilder getRequestOrBuil
    */
   @java.lang.Override
   public boolean hasResponse() {
-    return ((bitField0_ & 0x00000010) != 0);
+    return response_ != null;
   }
 
   /**
@@ -15208,9 +14814,7 @@ public com.google.rpc.context.AttributeContext.Response getResponse() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.ResponseOrBuilder getResponseOrBuilder() {
-    return response_ == null
-        ? com.google.rpc.context.AttributeContext.Response.getDefaultInstance()
-        : response_;
+    return getResponse();
   }
 
   public static final int RESOURCE_FIELD_NUMBER = 5;
@@ -15231,7 +14835,7 @@ public com.google.rpc.context.AttributeContext.ResponseOrBuilder getResponseOrBu
    */
   @java.lang.Override
   public boolean hasResource() {
-    return ((bitField0_ & 0x00000020) != 0);
+    return resource_ != null;
   }
 
   /**
@@ -15267,9 +14871,7 @@ public com.google.rpc.context.AttributeContext.Resource getResource() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.ResourceOrBuilder getResourceOrBuilder() {
-    return resource_ == null
-        ? com.google.rpc.context.AttributeContext.Resource.getDefaultInstance()
-        : resource_;
+    return getResource();
   }
 
   public static final int API_FIELD_NUMBER = 6;
@@ -15288,7 +14890,7 @@ public com.google.rpc.context.AttributeContext.ResourceOrBuilder getResourceOrBu
    */
   @java.lang.Override
   public boolean hasApi() {
-    return ((bitField0_ & 0x00000040) != 0);
+    return api_ != null;
   }
 
   /**
@@ -15318,12 +14920,10 @@ public com.google.rpc.context.AttributeContext.Api getApi() {
    */
   @java.lang.Override
   public com.google.rpc.context.AttributeContext.ApiOrBuilder getApiOrBuilder() {
-    return api_ == null ? com.google.rpc.context.AttributeContext.Api.getDefaultInstance() : api_;
+    return getApi();
   }
 
   public static final int EXTENSIONS_FIELD_NUMBER = 8;
-
-  @SuppressWarnings("serial")
   private java.util.List extensions_;
 
   /**
@@ -15410,25 +15010,25 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (source_ != null) {
       output.writeMessage(1, getSource());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (destination_ != null) {
       output.writeMessage(2, getDestination());
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (request_ != null) {
       output.writeMessage(3, getRequest());
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (response_ != null) {
       output.writeMessage(4, getResponse());
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (resource_ != null) {
       output.writeMessage(5, getResource());
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
+    if (api_ != null) {
       output.writeMessage(6, getApi());
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (origin_ != null) {
       output.writeMessage(7, getOrigin());
     }
     for (int i = 0; i < extensions_.size(); i++) {
@@ -15443,25 +15043,25 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (source_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getSource());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (destination_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getDestination());
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (request_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getRequest());
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (response_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getResponse());
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (resource_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getResource());
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
+    if (api_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getApi());
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (origin_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getOrigin());
     }
     for (int i = 0; i < extensions_.size(); i++) {
@@ -15660,19 +15260,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * 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.
@@ -15700,65 +15296,55 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.rpc.context.AttributeContext.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getOriginFieldBuilder();
-        getSourceFieldBuilder();
-        getDestinationFieldBuilder();
-        getRequestFieldBuilder();
-        getResponseFieldBuilder();
-        getResourceFieldBuilder();
-        getApiFieldBuilder();
-        getExtensionsFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      origin_ = null;
-      if (originBuilder_ != null) {
-        originBuilder_.dispose();
+      if (originBuilder_ == null) {
+        origin_ = null;
+      } else {
+        origin_ = null;
         originBuilder_ = null;
       }
-      source_ = null;
-      if (sourceBuilder_ != null) {
-        sourceBuilder_.dispose();
+      if (sourceBuilder_ == null) {
+        source_ = null;
+      } else {
+        source_ = null;
         sourceBuilder_ = null;
       }
-      destination_ = null;
-      if (destinationBuilder_ != null) {
-        destinationBuilder_.dispose();
+      if (destinationBuilder_ == null) {
+        destination_ = null;
+      } else {
+        destination_ = null;
         destinationBuilder_ = null;
       }
-      request_ = null;
-      if (requestBuilder_ != null) {
-        requestBuilder_.dispose();
+      if (requestBuilder_ == null) {
+        request_ = null;
+      } else {
+        request_ = null;
         requestBuilder_ = null;
       }
-      response_ = null;
-      if (responseBuilder_ != null) {
-        responseBuilder_.dispose();
+      if (responseBuilder_ == null) {
+        response_ = null;
+      } else {
+        response_ = null;
         responseBuilder_ = null;
       }
-      resource_ = null;
-      if (resourceBuilder_ != null) {
-        resourceBuilder_.dispose();
+      if (resourceBuilder_ == null) {
+        resource_ = null;
+      } else {
+        resource_ = null;
         resourceBuilder_ = null;
       }
-      api_ = null;
-      if (apiBuilder_ != null) {
-        apiBuilder_.dispose();
+      if (apiBuilder_ == null) {
+        api_ = null;
+      } else {
+        api_ = null;
         apiBuilder_ = null;
       }
       if (extensionsBuilder_ == null) {
@@ -15767,7 +15353,7 @@ public Builder clear() {
         extensions_ = null;
         extensionsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000080);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -15795,59 +15381,53 @@ public com.google.rpc.context.AttributeContext build() {
     public com.google.rpc.context.AttributeContext buildPartial() {
       com.google.rpc.context.AttributeContext result =
           new com.google.rpc.context.AttributeContext(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.rpc.context.AttributeContext result) {
-      if (extensionsBuilder_ == null) {
-        if (((bitField0_ & 0x00000080) != 0)) {
-          extensions_ = java.util.Collections.unmodifiableList(extensions_);
-          bitField0_ = (bitField0_ & ~0x00000080);
-        }
-        result.extensions_ = extensions_;
+      int from_bitField0_ = bitField0_;
+      if (originBuilder_ == null) {
+        result.origin_ = origin_;
       } else {
-        result.extensions_ = extensionsBuilder_.build();
+        result.origin_ = originBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.rpc.context.AttributeContext result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.origin_ = originBuilder_ == null ? origin_ : originBuilder_.build();
-        to_bitField0_ |= 0x00000001;
+      if (sourceBuilder_ == null) {
+        result.source_ = source_;
+      } else {
+        result.source_ = sourceBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.source_ = sourceBuilder_ == null ? source_ : sourceBuilder_.build();
-        to_bitField0_ |= 0x00000002;
+      if (destinationBuilder_ == null) {
+        result.destination_ = destination_;
+      } else {
+        result.destination_ = destinationBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.destination_ =
-            destinationBuilder_ == null ? destination_ : destinationBuilder_.build();
-        to_bitField0_ |= 0x00000004;
+      if (requestBuilder_ == null) {
+        result.request_ = request_;
+      } else {
+        result.request_ = requestBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.request_ = requestBuilder_ == null ? request_ : requestBuilder_.build();
-        to_bitField0_ |= 0x00000008;
+      if (responseBuilder_ == null) {
+        result.response_ = response_;
+      } else {
+        result.response_ = responseBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.response_ = responseBuilder_ == null ? response_ : responseBuilder_.build();
-        to_bitField0_ |= 0x00000010;
+      if (resourceBuilder_ == null) {
+        result.resource_ = resource_;
+      } else {
+        result.resource_ = resourceBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.resource_ = resourceBuilder_ == null ? resource_ : resourceBuilder_.build();
-        to_bitField0_ |= 0x00000020;
+      if (apiBuilder_ == null) {
+        result.api_ = api_;
+      } else {
+        result.api_ = apiBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.api_ = apiBuilder_ == null ? api_ : apiBuilder_.build();
-        to_bitField0_ |= 0x00000040;
+      if (extensionsBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
+          extensions_ = java.util.Collections.unmodifiableList(extensions_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.extensions_ = extensions_;
+      } else {
+        result.extensions_ = extensionsBuilder_.build();
       }
-      result.bitField0_ |= to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -15920,7 +15500,7 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext other) {
         if (!other.extensions_.isEmpty()) {
           if (extensions_.isEmpty()) {
             extensions_ = other.extensions_;
-            bitField0_ = (bitField0_ & ~0x00000080);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureExtensionsIsMutable();
             extensions_.addAll(other.extensions_);
@@ -15933,7 +15513,7 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext other) {
             extensionsBuilder_.dispose();
             extensionsBuilder_ = null;
             extensions_ = other.extensions_;
-            bitField0_ = (bitField0_ & ~0x00000080);
+            bitField0_ = (bitField0_ & ~0x00000001);
             extensionsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getExtensionsFieldBuilder()
@@ -15972,43 +15552,43 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getSourceFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getDestinationFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getRequestFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getResponseFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 34
             case 42:
               {
                 input.readMessage(getResourceFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 42
             case 50:
               {
                 input.readMessage(getApiFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 50
             case 58:
               {
                 input.readMessage(getOriginFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 58
             case 66:
@@ -16063,7 +15643,7 @@ public Builder mergeFrom(
      * @return Whether the origin field is set.
      */
     public boolean hasOrigin() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return originBuilder_ != null || origin_ != null;
     }
 
     /**
@@ -16106,11 +15686,11 @@ public Builder setOrigin(com.google.rpc.context.AttributeContext.Peer value) {
           throw new NullPointerException();
         }
         origin_ = value;
+        onChanged();
       } else {
         originBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -16128,11 +15708,11 @@ public Builder setOrigin(com.google.rpc.context.AttributeContext.Peer value) {
     public Builder setOrigin(com.google.rpc.context.AttributeContext.Peer.Builder builderForValue) {
       if (originBuilder_ == null) {
         origin_ = builderForValue.build();
+        onChanged();
       } else {
         originBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -16149,20 +15729,19 @@ public Builder setOrigin(com.google.rpc.context.AttributeContext.Peer.Builder bu
      */
     public Builder mergeOrigin(com.google.rpc.context.AttributeContext.Peer value) {
       if (originBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && origin_ != null
-            && origin_ != com.google.rpc.context.AttributeContext.Peer.getDefaultInstance()) {
-          getOriginBuilder().mergeFrom(value);
+        if (origin_ != null) {
+          origin_ =
+              com.google.rpc.context.AttributeContext.Peer.newBuilder(origin_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           origin_ = value;
         }
+        onChanged();
       } else {
         originBuilder_.mergeFrom(value);
       }
-      if (origin_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -16178,13 +15757,14 @@ public Builder mergeOrigin(com.google.rpc.context.AttributeContext.Peer value) {
      * .google.rpc.context.AttributeContext.Peer origin = 7;
      */
     public Builder clearOrigin() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      origin_ = null;
-      if (originBuilder_ != null) {
-        originBuilder_.dispose();
+      if (originBuilder_ == null) {
+        origin_ = null;
+        onChanged();
+      } else {
+        origin_ = null;
         originBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -16200,7 +15780,7 @@ public Builder clearOrigin() {
      * .google.rpc.context.AttributeContext.Peer origin = 7;
      */
     public com.google.rpc.context.AttributeContext.Peer.Builder getOriginBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getOriginFieldBuilder().getBuilder();
     }
@@ -16275,7 +15855,7 @@ public com.google.rpc.context.AttributeContext.PeerOrBuilder getOriginOrBuilder(
      * @return Whether the source field is set.
      */
     public boolean hasSource() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return sourceBuilder_ != null || source_ != null;
     }
 
     /**
@@ -16318,11 +15898,11 @@ public Builder setSource(com.google.rpc.context.AttributeContext.Peer value) {
           throw new NullPointerException();
         }
         source_ = value;
+        onChanged();
       } else {
         sourceBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -16340,11 +15920,11 @@ public Builder setSource(com.google.rpc.context.AttributeContext.Peer value) {
     public Builder setSource(com.google.rpc.context.AttributeContext.Peer.Builder builderForValue) {
       if (sourceBuilder_ == null) {
         source_ = builderForValue.build();
+        onChanged();
       } else {
         sourceBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -16361,20 +15941,19 @@ public Builder setSource(com.google.rpc.context.AttributeContext.Peer.Builder bu
      */
     public Builder mergeSource(com.google.rpc.context.AttributeContext.Peer value) {
       if (sourceBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && source_ != null
-            && source_ != com.google.rpc.context.AttributeContext.Peer.getDefaultInstance()) {
-          getSourceBuilder().mergeFrom(value);
+        if (source_ != null) {
+          source_ =
+              com.google.rpc.context.AttributeContext.Peer.newBuilder(source_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           source_ = value;
         }
+        onChanged();
       } else {
         sourceBuilder_.mergeFrom(value);
       }
-      if (source_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -16390,13 +15969,14 @@ public Builder mergeSource(com.google.rpc.context.AttributeContext.Peer value) {
      * .google.rpc.context.AttributeContext.Peer source = 1;
      */
     public Builder clearSource() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      source_ = null;
-      if (sourceBuilder_ != null) {
-        sourceBuilder_.dispose();
+      if (sourceBuilder_ == null) {
+        source_ = null;
+        onChanged();
+      } else {
+        source_ = null;
         sourceBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -16412,7 +15992,7 @@ public Builder clearSource() {
      * .google.rpc.context.AttributeContext.Peer source = 1;
      */
     public com.google.rpc.context.AttributeContext.Peer.Builder getSourceBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getSourceFieldBuilder().getBuilder();
     }
@@ -16487,7 +16067,7 @@ public com.google.rpc.context.AttributeContext.PeerOrBuilder getSourceOrBuilder(
      * @return Whether the destination field is set.
      */
     public boolean hasDestination() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return destinationBuilder_ != null || destination_ != null;
     }
 
     /**
@@ -16530,11 +16110,11 @@ public Builder setDestination(com.google.rpc.context.AttributeContext.Peer value
           throw new NullPointerException();
         }
         destination_ = value;
+        onChanged();
       } else {
         destinationBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -16553,11 +16133,11 @@ public Builder setDestination(
         com.google.rpc.context.AttributeContext.Peer.Builder builderForValue) {
       if (destinationBuilder_ == null) {
         destination_ = builderForValue.build();
+        onChanged();
       } else {
         destinationBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -16574,20 +16154,19 @@ public Builder setDestination(
      */
     public Builder mergeDestination(com.google.rpc.context.AttributeContext.Peer value) {
       if (destinationBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && destination_ != null
-            && destination_ != com.google.rpc.context.AttributeContext.Peer.getDefaultInstance()) {
-          getDestinationBuilder().mergeFrom(value);
+        if (destination_ != null) {
+          destination_ =
+              com.google.rpc.context.AttributeContext.Peer.newBuilder(destination_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           destination_ = value;
         }
+        onChanged();
       } else {
         destinationBuilder_.mergeFrom(value);
       }
-      if (destination_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -16603,13 +16182,14 @@ public Builder mergeDestination(com.google.rpc.context.AttributeContext.Peer val
      * .google.rpc.context.AttributeContext.Peer destination = 2;
      */
     public Builder clearDestination() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      destination_ = null;
-      if (destinationBuilder_ != null) {
-        destinationBuilder_.dispose();
+      if (destinationBuilder_ == null) {
+        destination_ = null;
+        onChanged();
+      } else {
+        destination_ = null;
         destinationBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -16625,7 +16205,7 @@ public Builder clearDestination() {
      * .google.rpc.context.AttributeContext.Peer destination = 2;
      */
     public com.google.rpc.context.AttributeContext.Peer.Builder getDestinationBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getDestinationFieldBuilder().getBuilder();
     }
@@ -16698,7 +16278,7 @@ public com.google.rpc.context.AttributeContext.PeerOrBuilder getDestinationOrBui
      * @return Whether the request field is set.
      */
     public boolean hasRequest() {
-      return ((bitField0_ & 0x00000008) != 0);
+      return requestBuilder_ != null || request_ != null;
     }
 
     /**
@@ -16737,11 +16317,11 @@ public Builder setRequest(com.google.rpc.context.AttributeContext.Request value)
           throw new NullPointerException();
         }
         request_ = value;
+        onChanged();
       } else {
         requestBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -16758,11 +16338,11 @@ public Builder setRequest(
         com.google.rpc.context.AttributeContext.Request.Builder builderForValue) {
       if (requestBuilder_ == null) {
         request_ = builderForValue.build();
+        onChanged();
       } else {
         requestBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -16777,20 +16357,19 @@ public Builder setRequest(
      */
     public Builder mergeRequest(com.google.rpc.context.AttributeContext.Request value) {
       if (requestBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)
-            && request_ != null
-            && request_ != com.google.rpc.context.AttributeContext.Request.getDefaultInstance()) {
-          getRequestBuilder().mergeFrom(value);
+        if (request_ != null) {
+          request_ =
+              com.google.rpc.context.AttributeContext.Request.newBuilder(request_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           request_ = value;
         }
+        onChanged();
       } else {
         requestBuilder_.mergeFrom(value);
       }
-      if (request_ != null) {
-        bitField0_ |= 0x00000008;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -16804,13 +16383,14 @@ public Builder mergeRequest(com.google.rpc.context.AttributeContext.Request valu
      * .google.rpc.context.AttributeContext.Request request = 3;
      */
     public Builder clearRequest() {
-      bitField0_ = (bitField0_ & ~0x00000008);
-      request_ = null;
-      if (requestBuilder_ != null) {
-        requestBuilder_.dispose();
+      if (requestBuilder_ == null) {
+        request_ = null;
+        onChanged();
+      } else {
+        request_ = null;
         requestBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -16824,7 +16404,7 @@ public Builder clearRequest() {
      * .google.rpc.context.AttributeContext.Request request = 3;
      */
     public com.google.rpc.context.AttributeContext.Request.Builder getRequestBuilder() {
-      bitField0_ |= 0x00000008;
+
       onChanged();
       return getRequestFieldBuilder().getBuilder();
     }
@@ -16893,7 +16473,7 @@ public com.google.rpc.context.AttributeContext.RequestOrBuilder getRequestOrBuil
      * @return Whether the response field is set.
      */
     public boolean hasResponse() {
-      return ((bitField0_ & 0x00000010) != 0);
+      return responseBuilder_ != null || response_ != null;
     }
 
     /**
@@ -16932,11 +16512,11 @@ public Builder setResponse(com.google.rpc.context.AttributeContext.Response valu
           throw new NullPointerException();
         }
         response_ = value;
+        onChanged();
       } else {
         responseBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -16953,11 +16533,11 @@ public Builder setResponse(
         com.google.rpc.context.AttributeContext.Response.Builder builderForValue) {
       if (responseBuilder_ == null) {
         response_ = builderForValue.build();
+        onChanged();
       } else {
         responseBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -16972,20 +16552,19 @@ public Builder setResponse(
      */
     public Builder mergeResponse(com.google.rpc.context.AttributeContext.Response value) {
       if (responseBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)
-            && response_ != null
-            && response_ != com.google.rpc.context.AttributeContext.Response.getDefaultInstance()) {
-          getResponseBuilder().mergeFrom(value);
+        if (response_ != null) {
+          response_ =
+              com.google.rpc.context.AttributeContext.Response.newBuilder(response_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           response_ = value;
         }
+        onChanged();
       } else {
         responseBuilder_.mergeFrom(value);
       }
-      if (response_ != null) {
-        bitField0_ |= 0x00000010;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -16999,13 +16578,14 @@ public Builder mergeResponse(com.google.rpc.context.AttributeContext.Response va
      * .google.rpc.context.AttributeContext.Response response = 4;
      */
     public Builder clearResponse() {
-      bitField0_ = (bitField0_ & ~0x00000010);
-      response_ = null;
-      if (responseBuilder_ != null) {
-        responseBuilder_.dispose();
+      if (responseBuilder_ == null) {
+        response_ = null;
+        onChanged();
+      } else {
+        response_ = null;
         responseBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -17019,7 +16599,7 @@ public Builder clearResponse() {
      * .google.rpc.context.AttributeContext.Response response = 4;
      */
     public com.google.rpc.context.AttributeContext.Response.Builder getResponseBuilder() {
-      bitField0_ |= 0x00000010;
+
       onChanged();
       return getResponseFieldBuilder().getBuilder();
     }
@@ -17090,7 +16670,7 @@ public com.google.rpc.context.AttributeContext.ResponseOrBuilder getResponseOrBu
      * @return Whether the resource field is set.
      */
     public boolean hasResource() {
-      return ((bitField0_ & 0x00000020) != 0);
+      return resourceBuilder_ != null || resource_ != null;
     }
 
     /**
@@ -17133,11 +16713,11 @@ public Builder setResource(com.google.rpc.context.AttributeContext.Resource valu
           throw new NullPointerException();
         }
         resource_ = value;
+        onChanged();
       } else {
         resourceBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000020;
-      onChanged();
+
       return this;
     }
 
@@ -17156,11 +16736,11 @@ public Builder setResource(
         com.google.rpc.context.AttributeContext.Resource.Builder builderForValue) {
       if (resourceBuilder_ == null) {
         resource_ = builderForValue.build();
+        onChanged();
       } else {
         resourceBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000020;
-      onChanged();
+
       return this;
     }
 
@@ -17177,20 +16757,19 @@ public Builder setResource(
      */
     public Builder mergeResource(com.google.rpc.context.AttributeContext.Resource value) {
       if (resourceBuilder_ == null) {
-        if (((bitField0_ & 0x00000020) != 0)
-            && resource_ != null
-            && resource_ != com.google.rpc.context.AttributeContext.Resource.getDefaultInstance()) {
-          getResourceBuilder().mergeFrom(value);
+        if (resource_ != null) {
+          resource_ =
+              com.google.rpc.context.AttributeContext.Resource.newBuilder(resource_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           resource_ = value;
         }
+        onChanged();
       } else {
         resourceBuilder_.mergeFrom(value);
       }
-      if (resource_ != null) {
-        bitField0_ |= 0x00000020;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -17206,13 +16785,14 @@ public Builder mergeResource(com.google.rpc.context.AttributeContext.Resource va
      * .google.rpc.context.AttributeContext.Resource resource = 5;
      */
     public Builder clearResource() {
-      bitField0_ = (bitField0_ & ~0x00000020);
-      resource_ = null;
-      if (resourceBuilder_ != null) {
-        resourceBuilder_.dispose();
+      if (resourceBuilder_ == null) {
+        resource_ = null;
+        onChanged();
+      } else {
+        resource_ = null;
         resourceBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -17228,7 +16808,7 @@ public Builder clearResource() {
      * .google.rpc.context.AttributeContext.Resource resource = 5;
      */
     public com.google.rpc.context.AttributeContext.Resource.Builder getResourceBuilder() {
-      bitField0_ |= 0x00000020;
+
       onChanged();
       return getResourceFieldBuilder().getBuilder();
     }
@@ -17301,7 +16881,7 @@ public com.google.rpc.context.AttributeContext.ResourceOrBuilder getResourceOrBu
      * @return Whether the api field is set.
      */
     public boolean hasApi() {
-      return ((bitField0_ & 0x00000040) != 0);
+      return apiBuilder_ != null || api_ != null;
     }
 
     /**
@@ -17340,11 +16920,11 @@ public Builder setApi(com.google.rpc.context.AttributeContext.Api value) {
           throw new NullPointerException();
         }
         api_ = value;
+        onChanged();
       } else {
         apiBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -17360,11 +16940,11 @@ public Builder setApi(com.google.rpc.context.AttributeContext.Api value) {
     public Builder setApi(com.google.rpc.context.AttributeContext.Api.Builder builderForValue) {
       if (apiBuilder_ == null) {
         api_ = builderForValue.build();
+        onChanged();
       } else {
         apiBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -17379,20 +16959,19 @@ public Builder setApi(com.google.rpc.context.AttributeContext.Api.Builder builde
      */
     public Builder mergeApi(com.google.rpc.context.AttributeContext.Api value) {
       if (apiBuilder_ == null) {
-        if (((bitField0_ & 0x00000040) != 0)
-            && api_ != null
-            && api_ != com.google.rpc.context.AttributeContext.Api.getDefaultInstance()) {
-          getApiBuilder().mergeFrom(value);
+        if (api_ != null) {
+          api_ =
+              com.google.rpc.context.AttributeContext.Api.newBuilder(api_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           api_ = value;
         }
+        onChanged();
       } else {
         apiBuilder_.mergeFrom(value);
       }
-      if (api_ != null) {
-        bitField0_ |= 0x00000040;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -17406,13 +16985,14 @@ public Builder mergeApi(com.google.rpc.context.AttributeContext.Api value) {
      * .google.rpc.context.AttributeContext.Api api = 6;
      */
     public Builder clearApi() {
-      bitField0_ = (bitField0_ & ~0x00000040);
-      api_ = null;
-      if (apiBuilder_ != null) {
-        apiBuilder_.dispose();
+      if (apiBuilder_ == null) {
+        api_ = null;
+        onChanged();
+      } else {
+        api_ = null;
         apiBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -17426,7 +17006,7 @@ public Builder clearApi() {
      * .google.rpc.context.AttributeContext.Api api = 6;
      */
     public com.google.rpc.context.AttributeContext.Api.Builder getApiBuilder() {
-      bitField0_ |= 0x00000040;
+
       onChanged();
       return getApiFieldBuilder().getBuilder();
     }
@@ -17479,9 +17059,9 @@ public com.google.rpc.context.AttributeContext.ApiOrBuilder getApiOrBuilder() {
     private java.util.List extensions_ = java.util.Collections.emptyList();
 
     private void ensureExtensionsIsMutable() {
-      if (!((bitField0_ & 0x00000080) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         extensions_ = new java.util.ArrayList(extensions_);
-        bitField0_ |= 0x00000080;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -17703,7 +17283,7 @@ public Builder addAllExtensions(java.lang.Iterable getExtensionsBuilderList(
                 com.google.protobuf.Any,
                 com.google.protobuf.Any.Builder,
                 com.google.protobuf.AnyOrBuilder>(
-                extensions_, ((bitField0_ & 0x00000080) != 0), getParentForChildren(), isClean());
+                extensions_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         extensions_ = null;
       }
       return extensionsBuilder_;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContextOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContextOrBuilder.java
index f96ffee06e..83b9d905b5 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContextOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContextOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/context/attribute_context.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc.context;
 
 public interface AttributeContextOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContextProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContextProto.java
index c38e4aec10..35ac0e47c9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContextProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContextProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/context/attribute_context.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc.context;
 
 public final class AttributeContextProto {
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 281554046c..e3cd6c09c2 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/context/audit_context.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc.context;
 
 /**
@@ -50,6 +49,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;
@@ -65,9 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.rpc.context.AuditContext.Builder.class);
   }
 
-  private int bitField0_;
   public static final int AUDIT_LOG_FIELD_NUMBER = 1;
-  private com.google.protobuf.ByteString auditLog_ = com.google.protobuf.ByteString.EMPTY;
+  private com.google.protobuf.ByteString auditLog_;
 
   /**
    *
@@ -104,7 +107,7 @@ public com.google.protobuf.ByteString getAuditLog() {
    */
   @java.lang.Override
   public boolean hasScrubbedRequest() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return scrubbedRequest_ != null;
   }
 
   /**
@@ -142,9 +145,7 @@ public com.google.protobuf.Struct getScrubbedRequest() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getScrubbedRequestOrBuilder() {
-    return scrubbedRequest_ == null
-        ? com.google.protobuf.Struct.getDefaultInstance()
-        : scrubbedRequest_;
+    return getScrubbedRequest();
   }
 
   public static final int SCRUBBED_RESPONSE_FIELD_NUMBER = 3;
@@ -166,7 +167,7 @@ public com.google.protobuf.StructOrBuilder getScrubbedRequestOrBuilder() {
    */
   @java.lang.Override
   public boolean hasScrubbedResponse() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return scrubbedResponse_ != null;
   }
 
   /**
@@ -204,13 +205,11 @@ public com.google.protobuf.Struct getScrubbedResponse() {
    */
   @java.lang.Override
   public com.google.protobuf.StructOrBuilder getScrubbedResponseOrBuilder() {
-    return scrubbedResponse_ == null
-        ? com.google.protobuf.Struct.getDefaultInstance()
-        : scrubbedResponse_;
+    return getScrubbedResponse();
   }
 
   public static final int SCRUBBED_RESPONSE_ITEM_COUNT_FIELD_NUMBER = 4;
-  private int scrubbedResponseItemCount_ = 0;
+  private int scrubbedResponseItemCount_;
 
   /**
    *
@@ -229,9 +228,7 @@ public int getScrubbedResponseItemCount() {
   }
 
   public static final int TARGET_RESOURCE_FIELD_NUMBER = 5;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object targetResource_ = "";
+  private volatile java.lang.Object targetResource_;
 
   /**
    *
@@ -298,10 +295,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!auditLog_.isEmpty()) {
       output.writeBytes(1, auditLog_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (scrubbedRequest_ != null) {
       output.writeMessage(2, getScrubbedRequest());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (scrubbedResponse_ != null) {
       output.writeMessage(3, getScrubbedResponse());
     }
     if (scrubbedResponseItemCount_ != 0) {
@@ -322,10 +319,10 @@ public int getSerializedSize() {
     if (!auditLog_.isEmpty()) {
       size += com.google.protobuf.CodedOutputStream.computeBytesSize(1, auditLog_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (scrubbedRequest_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getScrubbedRequest());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (scrubbedResponse_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getScrubbedResponse());
     }
     if (scrubbedResponseItemCount_ != 0) {
@@ -514,39 +511,33 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.rpc.context.AuditContext.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getScrubbedRequestFieldBuilder();
-        getScrubbedResponseFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       auditLog_ = com.google.protobuf.ByteString.EMPTY;
-      scrubbedRequest_ = null;
-      if (scrubbedRequestBuilder_ != null) {
-        scrubbedRequestBuilder_.dispose();
+
+      if (scrubbedRequestBuilder_ == null) {
+        scrubbedRequest_ = null;
+      } else {
+        scrubbedRequest_ = null;
         scrubbedRequestBuilder_ = null;
       }
-      scrubbedResponse_ = null;
-      if (scrubbedResponseBuilder_ != null) {
-        scrubbedResponseBuilder_.dispose();
+      if (scrubbedResponseBuilder_ == null) {
+        scrubbedResponse_ = null;
+      } else {
+        scrubbedResponse_ = null;
         scrubbedResponseBuilder_ = null;
       }
       scrubbedResponseItemCount_ = 0;
+
       targetResource_ = "";
+
       return this;
     }
 
@@ -573,38 +564,23 @@ public com.google.rpc.context.AuditContext build() {
     @java.lang.Override
     public com.google.rpc.context.AuditContext buildPartial() {
       com.google.rpc.context.AuditContext result = new com.google.rpc.context.AuditContext(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.auditLog_ = auditLog_;
+      if (scrubbedRequestBuilder_ == null) {
+        result.scrubbedRequest_ = scrubbedRequest_;
+      } else {
+        result.scrubbedRequest_ = scrubbedRequestBuilder_.build();
       }
+      if (scrubbedResponseBuilder_ == null) {
+        result.scrubbedResponse_ = scrubbedResponse_;
+      } else {
+        result.scrubbedResponse_ = scrubbedResponseBuilder_.build();
+      }
+      result.scrubbedResponseItemCount_ = scrubbedResponseItemCount_;
+      result.targetResource_ = targetResource_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.rpc.context.AuditContext result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.auditLog_ = auditLog_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.scrubbedRequest_ =
-            scrubbedRequestBuilder_ == null ? scrubbedRequest_ : scrubbedRequestBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.scrubbedResponse_ =
-            scrubbedResponseBuilder_ == null ? scrubbedResponse_ : scrubbedResponseBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.scrubbedResponseItemCount_ = scrubbedResponseItemCount_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.targetResource_ = targetResource_;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -664,7 +640,6 @@ public Builder mergeFrom(com.google.rpc.context.AuditContext other) {
       }
       if (!other.getTargetResource().isEmpty()) {
         targetResource_ = other.targetResource_;
-        bitField0_ |= 0x00000010;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -696,32 +671,32 @@ public Builder mergeFrom(
             case 10:
               {
                 auditLog_ = input.readBytes();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getScrubbedRequestFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(
                     getScrubbedResponseFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 32:
               {
                 scrubbedResponseItemCount_ = input.readInt32();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             case 42:
               {
                 targetResource_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 42
             default:
@@ -741,8 +716,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.protobuf.ByteString auditLog_ = com.google.protobuf.ByteString.EMPTY;
 
     /**
@@ -777,8 +750,8 @@ public Builder setAuditLog(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       auditLog_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -795,7 +768,7 @@ public Builder setAuditLog(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearAuditLog() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       auditLog_ = getDefaultInstance().getAuditLog();
       onChanged();
       return this;
@@ -823,7 +796,7 @@ public Builder clearAuditLog() {
      * @return Whether the scrubbedRequest field is set.
      */
     public boolean hasScrubbedRequest() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return scrubbedRequestBuilder_ != null || scrubbedRequest_ != null;
     }
 
     /**
@@ -868,11 +841,11 @@ public Builder setScrubbedRequest(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         scrubbedRequest_ = value;
+        onChanged();
       } else {
         scrubbedRequestBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -891,11 +864,11 @@ public Builder setScrubbedRequest(com.google.protobuf.Struct value) {
     public Builder setScrubbedRequest(com.google.protobuf.Struct.Builder builderForValue) {
       if (scrubbedRequestBuilder_ == null) {
         scrubbedRequest_ = builderForValue.build();
+        onChanged();
       } else {
         scrubbedRequestBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -913,20 +886,19 @@ public Builder setScrubbedRequest(com.google.protobuf.Struct.Builder builderForV
      */
     public Builder mergeScrubbedRequest(com.google.protobuf.Struct value) {
       if (scrubbedRequestBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && scrubbedRequest_ != null
-            && scrubbedRequest_ != com.google.protobuf.Struct.getDefaultInstance()) {
-          getScrubbedRequestBuilder().mergeFrom(value);
+        if (scrubbedRequest_ != null) {
+          scrubbedRequest_ =
+              com.google.protobuf.Struct.newBuilder(scrubbedRequest_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           scrubbedRequest_ = value;
         }
+        onChanged();
       } else {
         scrubbedRequestBuilder_.mergeFrom(value);
       }
-      if (scrubbedRequest_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -943,13 +915,14 @@ public Builder mergeScrubbedRequest(com.google.protobuf.Struct value) {
      * .google.protobuf.Struct scrubbed_request = 2;
      */
     public Builder clearScrubbedRequest() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      scrubbedRequest_ = null;
-      if (scrubbedRequestBuilder_ != null) {
-        scrubbedRequestBuilder_.dispose();
+      if (scrubbedRequestBuilder_ == null) {
+        scrubbedRequest_ = null;
+        onChanged();
+      } else {
+        scrubbedRequest_ = null;
         scrubbedRequestBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -966,7 +939,7 @@ public Builder clearScrubbedRequest() {
      * .google.protobuf.Struct scrubbed_request = 2;
      */
     public com.google.protobuf.Struct.Builder getScrubbedRequestBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getScrubbedRequestFieldBuilder().getBuilder();
     }
@@ -1044,7 +1017,7 @@ public com.google.protobuf.StructOrBuilder getScrubbedRequestOrBuilder() {
      * @return Whether the scrubbedResponse field is set.
      */
     public boolean hasScrubbedResponse() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return scrubbedResponseBuilder_ != null || scrubbedResponse_ != null;
     }
 
     /**
@@ -1089,11 +1062,11 @@ public Builder setScrubbedResponse(com.google.protobuf.Struct value) {
           throw new NullPointerException();
         }
         scrubbedResponse_ = value;
+        onChanged();
       } else {
         scrubbedResponseBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1112,11 +1085,11 @@ public Builder setScrubbedResponse(com.google.protobuf.Struct value) {
     public Builder setScrubbedResponse(com.google.protobuf.Struct.Builder builderForValue) {
       if (scrubbedResponseBuilder_ == null) {
         scrubbedResponse_ = builderForValue.build();
+        onChanged();
       } else {
         scrubbedResponseBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1134,20 +1107,19 @@ public Builder setScrubbedResponse(com.google.protobuf.Struct.Builder builderFor
      */
     public Builder mergeScrubbedResponse(com.google.protobuf.Struct value) {
       if (scrubbedResponseBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && scrubbedResponse_ != null
-            && scrubbedResponse_ != com.google.protobuf.Struct.getDefaultInstance()) {
-          getScrubbedResponseBuilder().mergeFrom(value);
+        if (scrubbedResponse_ != null) {
+          scrubbedResponse_ =
+              com.google.protobuf.Struct.newBuilder(scrubbedResponse_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           scrubbedResponse_ = value;
         }
+        onChanged();
       } else {
         scrubbedResponseBuilder_.mergeFrom(value);
       }
-      if (scrubbedResponse_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1164,13 +1136,14 @@ public Builder mergeScrubbedResponse(com.google.protobuf.Struct value) {
      * .google.protobuf.Struct scrubbed_response = 3;
      */
     public Builder clearScrubbedResponse() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      scrubbedResponse_ = null;
-      if (scrubbedResponseBuilder_ != null) {
-        scrubbedResponseBuilder_.dispose();
+      if (scrubbedResponseBuilder_ == null) {
+        scrubbedResponse_ = null;
+        onChanged();
+      } else {
+        scrubbedResponse_ = null;
         scrubbedResponseBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1187,7 +1160,7 @@ public Builder clearScrubbedResponse() {
      * .google.protobuf.Struct scrubbed_response = 3;
      */
     public com.google.protobuf.Struct.Builder getScrubbedResponseBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getScrubbedResponseFieldBuilder().getBuilder();
     }
@@ -1276,7 +1249,6 @@ public int getScrubbedResponseItemCount() {
     public Builder setScrubbedResponseItemCount(int value) {
 
       scrubbedResponseItemCount_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1293,7 +1265,7 @@ public Builder setScrubbedResponseItemCount(int value) {
      * @return This builder for chaining.
      */
     public Builder clearScrubbedResponseItemCount() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       scrubbedResponseItemCount_ = 0;
       onChanged();
       return this;
@@ -1363,8 +1335,8 @@ public Builder setTargetResource(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       targetResource_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1381,8 +1353,8 @@ public Builder setTargetResource(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTargetResource() {
+
       targetResource_ = getDefaultInstance().getTargetResource();
-      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -1404,8 +1376,8 @@ public Builder setTargetResourceBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       targetResource_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AuditContextOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AuditContextOrBuilder.java
index f8659d1eb8..2ec87aa735 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AuditContextOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AuditContextOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/context/audit_context.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc.context;
 
 public interface AuditContextOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AuditContextProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AuditContextProto.java
index daf34e1dfc..e31ba88fc6 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AuditContextProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/rpc/context/AuditContextProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/rpc/context/audit_context.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.rpc.context;
 
 public final class AuditContextProto {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Channel.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Channel.java
index ce3453affe..4a828a2c0f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Channel.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Channel.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/shopping/type/types.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.shopping.type;
 
 /**
@@ -24,7 +23,6 @@
  *
  * 
  * [Channel](https://support.google.com/merchants/answer/7361332) of a product.
- *
  * Channel is used to distinguish between online and local products.
  * 

  *
@@ -49,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Channel();
   }
 
+  @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.shopping.type.TypesProto
         .internal_static_google_shopping_type_Channel_descriptor;
@@ -376,7 +379,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * [Channel](https://support.google.com/merchants/answer/7361332) of a product.
-   *
    * Channel is used to distinguish between online and local products.
    * 

    *
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/ChannelOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/ChannelOrBuilder.java
index fb97a597db..4f8ff0e6e8 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/ChannelOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/ChannelOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/shopping/type/types.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.shopping.type;
 
 public interface ChannelOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/CustomAttribute.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/CustomAttribute.java
index a967777008..775405f427 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/CustomAttribute.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/CustomAttribute.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/shopping/type/types.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.shopping.type;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CustomAttribute();
   }
 
+  @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.shopping.type.TypesProto
         .internal_static_google_shopping_type_CustomAttribute_descriptor;
@@ -69,9 +73,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -138,9 +140,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int VALUE_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object value_ = "";
+  private volatile java.lang.Object value_;
 
   /**
    *
@@ -210,8 +210,6 @@ public com.google.protobuf.ByteString getValueBytes() {
   }
 
   public static final int GROUP_VALUES_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
   private java.util.List groupValues_;
 
   /**
@@ -518,9 +516,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+      bitField0_ = (bitField0_ & ~0x00000001);
       value_ = "";
+      bitField0_ = (bitField0_ & ~0x00000002);
       if (groupValuesBuilder_ == null) {
         groupValues_ = java.util.Collections.emptyList();
       } else {
@@ -555,15 +554,16 @@ public com.google.shopping.type.CustomAttribute build() {
     public com.google.shopping.type.CustomAttribute buildPartial() {
       com.google.shopping.type.CustomAttribute result =
           new com.google.shopping.type.CustomAttribute(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        to_bitField0_ |= 0x00000001;
       }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.shopping.type.CustomAttribute result) {
+      result.name_ = name_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        to_bitField0_ |= 0x00000002;
+      }
+      result.value_ = value_;
       if (groupValuesBuilder_ == null) {
         if (((bitField0_ & 0x00000004) != 0)) {
           groupValues_ = java.util.Collections.unmodifiableList(groupValues_);
@@ -573,20 +573,9 @@ private void buildPartialRepeatedFields(com.google.shopping.type.CustomAttribute
       } else {
         result.groupValues_ = groupValuesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.shopping.type.CustomAttribute result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.value_ = value_;
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -635,13 +624,13 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
     public Builder mergeFrom(com.google.shopping.type.CustomAttribute other) {
       if (other == com.google.shopping.type.CustomAttribute.getDefaultInstance()) return this;
       if (other.hasName()) {
-        name_ = other.name_;
         bitField0_ |= 0x00000001;
+        name_ = other.name_;
         onChanged();
       }
       if (other.hasValue()) {
-        value_ = other.value_;
         bitField0_ |= 0x00000002;
+        value_ = other.value_;
         onChanged();
       }
       if (groupValuesBuilder_ == null) {
@@ -820,8 +809,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      name_ = value;
       bitField0_ |= 0x00000001;
+      name_ = value;
       onChanged();
       return this;
     }
@@ -838,8 +827,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
-      name_ = getDefaultInstance().getName();
       bitField0_ = (bitField0_ & ~0x00000001);
+      name_ = getDefaultInstance().getName();
       onChanged();
       return this;
     }
@@ -861,8 +850,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-      name_ = value;
       bitField0_ |= 0x00000001;
+      name_ = value;
       onChanged();
       return this;
     }
@@ -950,8 +939,8 @@ public Builder setValue(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      value_ = value;
       bitField0_ |= 0x00000002;
+      value_ = value;
       onChanged();
       return this;
     }
@@ -969,8 +958,8 @@ public Builder setValue(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearValue() {
-      value_ = getDefaultInstance().getValue();
       bitField0_ = (bitField0_ & ~0x00000002);
+      value_ = getDefaultInstance().getValue();
       onChanged();
       return this;
     }
@@ -993,8 +982,8 @@ public Builder setValueBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-      value_ = value;
       bitField0_ |= 0x00000002;
+      value_ = value;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/CustomAttributeOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/CustomAttributeOrBuilder.java
index 8fe392381d..ec7b5676c3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/CustomAttributeOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/CustomAttributeOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/shopping/type/types.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.shopping.type;
 
 public interface CustomAttributeOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Destination.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Destination.java
index 1f912b89ff..8ea0c18277 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Destination.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Destination.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/shopping/type/types.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.shopping.type;
 
 /**
@@ -24,7 +23,6 @@
  *
  * 
  * Destinations available for a product.
- *
  * Destinations are used in Merchant Center to allow you to control where the
  * products from your data feed should be displayed.
  * 

@@ -50,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Destination();
   }
 
+  @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.shopping.type.TypesProto
         .internal_static_google_shopping_type_Destination_descriptor;
@@ -476,7 +479,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * Destinations available for a product.
-   *
    * Destinations are used in Merchant Center to allow you to control where the
    * products from your data feed should be displayed.
    * 

diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/DestinationOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/DestinationOrBuilder.java
index 9f5368ed3a..b4c8c07852 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/DestinationOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/DestinationOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/shopping/type/types.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.shopping.type;
 
 public interface DestinationOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Price.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Price.java
index a0020612ef..a09438327b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Price.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Price.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/shopping/type/types.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.shopping.type;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Price();
   }
 
+  @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.shopping.type.TypesProto
         .internal_static_google_shopping_type_Price_descriptor;
@@ -65,7 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   private int bitField0_;
   public static final int AMOUNT_MICROS_FIELD_NUMBER = 1;
-  private long amountMicros_ = 0L;
+  private long amountMicros_;
 
   /**
    *
@@ -104,9 +108,7 @@ public long getAmountMicros() {
   }
 
   public static final int CURRENCY_CODE_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object currencyCode_ = "";
+  private volatile java.lang.Object currencyCode_;
 
   /**
    *
@@ -389,9 +391,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       amountMicros_ = 0L;
+      bitField0_ = (bitField0_ & ~0x00000001);
       currencyCode_ = "";
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -418,14 +421,6 @@ public com.google.shopping.type.Price build() {
     @java.lang.Override
     public com.google.shopping.type.Price buildPartial() {
       com.google.shopping.type.Price result = new com.google.shopping.type.Price(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.shopping.type.Price result) {
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -433,10 +428,12 @@ private void buildPartial0(com.google.shopping.type.Price result) {
         to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.currencyCode_ = currencyCode_;
         to_bitField0_ |= 0x00000002;
       }
-      result.bitField0_ |= to_bitField0_;
+      result.currencyCode_ = currencyCode_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -488,8 +485,8 @@ public Builder mergeFrom(com.google.shopping.type.Price other) {
         setAmountMicros(other.getAmountMicros());
       }
       if (other.hasCurrencyCode()) {
-        currencyCode_ = other.currencyCode_;
         bitField0_ |= 0x00000002;
+        currencyCode_ = other.currencyCode_;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -602,9 +599,8 @@ public long getAmountMicros() {
      * @return This builder for chaining.
      */
     public Builder setAmountMicros(long value) {
-
-      amountMicros_ = value;
       bitField0_ |= 0x00000001;
+      amountMicros_ = value;
       onChanged();
       return this;
     }
@@ -712,8 +708,8 @@ public Builder setCurrencyCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      currencyCode_ = value;
       bitField0_ |= 0x00000002;
+      currencyCode_ = value;
       onChanged();
       return this;
     }
@@ -731,8 +727,8 @@ public Builder setCurrencyCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearCurrencyCode() {
-      currencyCode_ = getDefaultInstance().getCurrencyCode();
       bitField0_ = (bitField0_ & ~0x00000002);
+      currencyCode_ = getDefaultInstance().getCurrencyCode();
       onChanged();
       return this;
     }
@@ -755,8 +751,8 @@ public Builder setCurrencyCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
-      currencyCode_ = value;
       bitField0_ |= 0x00000002;
+      currencyCode_ = value;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/PriceOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/PriceOrBuilder.java
index 387b435fd2..862dc26f04 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/PriceOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/PriceOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/shopping/type/types.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.shopping.type;
 
 public interface PriceOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/ReportingContext.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/ReportingContext.java
index 270fbf5f0f..2158892719 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/ReportingContext.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/ReportingContext.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/shopping/type/types.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.shopping.type;
 
 /**
@@ -24,7 +23,6 @@
  *
  * 
  * Reporting contexts that your account and product issues apply to.
- *
  * Reporting contexts are groups of surfaces and formats for product results on
  * Google. They can represent the entire destination (for example, [Shopping
  * ads](https://support.google.com/merchants/answer/6149970)) or a subset of
@@ -53,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ReportingContext();
   }
 
+  @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.shopping.type.TypesProto
         .internal_static_google_shopping_type_ReportingContext_descriptor;
@@ -681,7 +684,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * Reporting contexts that your account and product issues apply to.
-   *
    * Reporting contexts are groups of surfaces and formats for product results on
    * Google. They can represent the entire destination (for example, [Shopping
    * ads](https://support.google.com/merchants/answer/6149970)) or a subset of
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/ReportingContextOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/ReportingContextOrBuilder.java
index 9ba9c0d73b..b84f9740ef 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/ReportingContextOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/ReportingContextOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/shopping/type/types.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.shopping.type;
 
 public interface ReportingContextOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/TypesProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/TypesProto.java
index e85d5a9831..4ae108138a 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/TypesProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/TypesProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/shopping/type/types.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.shopping.type;
 
 public final class TypesProto {
@@ -128,7 +127,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_shopping_type_Weight_descriptor,
             new java.lang.String[] {
-              "AmountMicros", "Unit",
+              "AmountMicros", "Unit", "AmountMicros",
             });
     internal_static_google_shopping_type_Price_descriptor =
         getDescriptor().getMessageTypes().get(1);
@@ -136,7 +135,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_shopping_type_Price_descriptor,
             new java.lang.String[] {
-              "AmountMicros", "CurrencyCode",
+              "AmountMicros", "CurrencyCode", "AmountMicros", "CurrencyCode",
             });
     internal_static_google_shopping_type_CustomAttribute_descriptor =
         getDescriptor().getMessageTypes().get(2);
@@ -144,7 +143,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_shopping_type_CustomAttribute_descriptor,
             new java.lang.String[] {
-              "Name", "Value", "GroupValues",
+              "Name", "Value", "GroupValues", "Name", "Value",
             });
     internal_static_google_shopping_type_Destination_descriptor =
         getDescriptor().getMessageTypes().get(3);
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Weight.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Weight.java
index a67b64ab04..6dcb52829e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Weight.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Weight.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/shopping/type/types.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.shopping.type;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Weight();
   }
 
+  @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.shopping.type.TypesProto
         .internal_static_google_shopping_type_Weight_descriptor;
@@ -224,7 +228,7 @@ private WeightUnit(int value) {
 
   private int bitField0_;
   public static final int AMOUNT_MICROS_FIELD_NUMBER = 1;
-  private long amountMicros_ = 0L;
+  private long amountMicros_;
 
   /**
    *
@@ -267,7 +271,7 @@ public long getAmountMicros() {
   }
 
   public static final int UNIT_FIELD_NUMBER = 2;
-  private int unit_ = 0;
+  private int unit_;
 
   /**
    *
@@ -300,8 +304,9 @@ public int getUnitValue() {
    */
   @java.lang.Override
   public com.google.shopping.type.Weight.WeightUnit getUnit() {
+    @SuppressWarnings("deprecation")
     com.google.shopping.type.Weight.WeightUnit result =
-        com.google.shopping.type.Weight.WeightUnit.forNumber(unit_);
+        com.google.shopping.type.Weight.WeightUnit.valueOf(unit_);
     return result == null ? com.google.shopping.type.Weight.WeightUnit.UNRECOGNIZED : result;
   }
 
@@ -514,9 +519,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       amountMicros_ = 0L;
+      bitField0_ = (bitField0_ & ~0x00000001);
       unit_ = 0;
+
       return this;
     }
 
@@ -543,24 +549,16 @@ public com.google.shopping.type.Weight build() {
     @java.lang.Override
     public com.google.shopping.type.Weight buildPartial() {
       com.google.shopping.type.Weight result = new com.google.shopping.type.Weight(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.shopping.type.Weight result) {
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.amountMicros_ = amountMicros_;
         to_bitField0_ |= 0x00000001;
       }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.unit_ = unit_;
-      }
-      result.bitField0_ |= to_bitField0_;
+      result.unit_ = unit_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -649,7 +647,7 @@ public Builder mergeFrom(
             case 16:
               {
                 unit_ = input.readEnum();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             default:
@@ -730,9 +728,8 @@ public long getAmountMicros() {
      * @return This builder for chaining.
      */
     public Builder setAmountMicros(long value) {
-
-      amountMicros_ = value;
       bitField0_ |= 0x00000001;
+      amountMicros_ = value;
       onChanged();
       return this;
     }
@@ -792,8 +789,8 @@ public int getUnitValue() {
      * @return This builder for chaining.
      */
     public Builder setUnitValue(int value) {
+
       unit_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -812,8 +809,9 @@ public Builder setUnitValue(int value) {
      */
     @java.lang.Override
     public com.google.shopping.type.Weight.WeightUnit getUnit() {
+      @SuppressWarnings("deprecation")
       com.google.shopping.type.Weight.WeightUnit result =
-          com.google.shopping.type.Weight.WeightUnit.forNumber(unit_);
+          com.google.shopping.type.Weight.WeightUnit.valueOf(unit_);
       return result == null ? com.google.shopping.type.Weight.WeightUnit.UNRECOGNIZED : result;
     }
 
@@ -834,7 +832,7 @@ public Builder setUnit(com.google.shopping.type.Weight.WeightUnit value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000002;
+
       unit_ = value.getNumber();
       onChanged();
       return this;
@@ -853,7 +851,7 @@ public Builder setUnit(com.google.shopping.type.Weight.WeightUnit value) {
      * @return This builder for chaining.
      */
     public Builder clearUnit() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       unit_ = 0;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/WeightOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/WeightOrBuilder.java
index aeb6f0384a..5fbe5228df 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/WeightOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/WeightOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/shopping/type/types.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.shopping.type;
 
 public interface WeightOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/CalendarPeriod.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/CalendarPeriod.java
index 13c6b5ae42..44c4f24d6c 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/CalendarPeriod.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/CalendarPeriod.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/calendar_period.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/CalendarPeriodProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/CalendarPeriodProto.java
index dc57d85dad..ff0d8942cc 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/CalendarPeriodProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/CalendarPeriodProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/calendar_period.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public final class CalendarPeriodProto {
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 b5558c100e..5b6235749e 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/color.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
@@ -30,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();
@@ -80,9 +72,7 @@
  *        return resultBuilder.build();
  *      }
  *      // ...
- *
  * Example (iOS / Obj-C):
- *
  *      // ...
  *      static UIColor* fromProto(Color* protocolor) {
  *         float red = [protocolor red];
@@ -95,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:&red green:&green blue:&blue alpha:&alpha]) {
@@ -112,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;
@@ -124,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 << 16) | (green << 8) | blue);
  *       var hexString = rgbNumber.toString(16);
@@ -145,7 +128,6 @@
  *       resultBuilder.push(hexString);
  *       return resultBuilder.join('');
  *     };
- *
  *     // ...
  * 

  *
@@ -170,6 +152,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;
   }
@@ -182,9 +169,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.type.Color.class, com.google.type.Color.Builder.class);
   }
 
-  private int bitField0_;
   public static final int RED_FIELD_NUMBER = 1;
-  private float red_ = 0F;
+  private float red_;
 
   /**
    *
@@ -203,7 +189,7 @@ public float getRed() {
   }
 
   public static final int GREEN_FIELD_NUMBER = 2;
-  private float green_ = 0F;
+  private float green_;
 
   /**
    *
@@ -222,7 +208,7 @@ public float getGreen() {
   }
 
   public static final int BLUE_FIELD_NUMBER = 3;
-  private float blue_ = 0F;
+  private float blue_;
 
   /**
    *
@@ -249,9 +235,7 @@ public float getBlue() {
    * 
    * 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
@@ -266,7 +250,7 @@ public float getBlue() {
    */
   @java.lang.Override
   public boolean hasAlpha() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return alpha_ != null;
   }
 
   /**
@@ -275,9 +259,7 @@ public boolean hasAlpha() {
    * 
    * 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
@@ -301,9 +283,7 @@ public com.google.protobuf.FloatValue getAlpha() {
    * 
    * 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
@@ -316,7 +296,7 @@ public com.google.protobuf.FloatValue getAlpha() {
    */
   @java.lang.Override
   public com.google.protobuf.FloatValueOrBuilder getAlphaOrBuilder() {
-    return alpha_ == null ? com.google.protobuf.FloatValue.getDefaultInstance() : alpha_;
+    return getAlpha();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -342,7 +322,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (java.lang.Float.floatToRawIntBits(blue_) != 0) {
       output.writeFloat(3, blue_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (alpha_ != null) {
       output.writeMessage(4, getAlpha());
     }
     getUnknownFields().writeTo(output);
@@ -363,7 +343,7 @@ public int getSerializedSize() {
     if (java.lang.Float.floatToRawIntBits(blue_) != 0) {
       size += com.google.protobuf.CodedOutputStream.computeFloatSize(3, blue_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (alpha_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getAlpha());
     }
     size += getUnknownFields().getSerializedSize();
@@ -523,34 +503,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();
@@ -573,9 +546,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];
@@ -588,7 +559,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:&red green:&green blue:&blue alpha:&alpha]) {
@@ -605,11 +575,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;
@@ -617,16 +584,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 << 16) | (green << 8) | blue);
    *       var hexString = rgbNumber.toString(16);
@@ -638,7 +602,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *       resultBuilder.push(hexString);
    *       return resultBuilder.join('');
    *     };
-   *
    *     // ...
    * 

    *
@@ -661,31 +624,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.type.Color.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getAlphaFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       red_ = 0F;
+
       green_ = 0F;
+
       blue_ = 0F;
-      alpha_ = null;
-      if (alphaBuilder_ != null) {
-        alphaBuilder_.dispose();
+
+      if (alphaBuilder_ == null) {
+        alpha_ = null;
+      } else {
+        alpha_ = null;
         alphaBuilder_ = null;
       }
       return this;
@@ -713,32 +670,18 @@ public com.google.type.Color build() {
     @java.lang.Override
     public com.google.type.Color buildPartial() {
       com.google.type.Color result = new com.google.type.Color(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.red_ = red_;
+      result.green_ = green_;
+      result.blue_ = blue_;
+      if (alphaBuilder_ == null) {
+        result.alpha_ = alpha_;
+      } else {
+        result.alpha_ = alphaBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.type.Color result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.red_ = red_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.green_ = green_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.blue_ = blue_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.alpha_ = alphaBuilder_ == null ? alpha_ : alphaBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -825,25 +768,25 @@ public Builder mergeFrom(
             case 13:
               {
                 red_ = input.readFloat();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 13
             case 21:
               {
                 green_ = input.readFloat();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 21
             case 29:
               {
                 blue_ = input.readFloat();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 29
             case 34:
               {
                 input.readMessage(getAlphaFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             default:
@@ -863,8 +806,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private float red_;
 
     /**
@@ -898,7 +839,6 @@ public float getRed() {
     public Builder setRed(float value) {
 
       red_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -915,7 +855,7 @@ public Builder setRed(float value) {
      * @return This builder for chaining.
      */
     public Builder clearRed() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       red_ = 0F;
       onChanged();
       return this;
@@ -954,7 +894,6 @@ public float getGreen() {
     public Builder setGreen(float value) {
 
       green_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -971,7 +910,7 @@ public Builder setGreen(float value) {
      * @return This builder for chaining.
      */
     public Builder clearGreen() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       green_ = 0F;
       onChanged();
       return this;
@@ -1010,7 +949,6 @@ public float getBlue() {
     public Builder setBlue(float value) {
 
       blue_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1027,7 +965,7 @@ public Builder setBlue(float value) {
      * @return This builder for chaining.
      */
     public Builder clearBlue() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       blue_ = 0F;
       onChanged();
       return this;
@@ -1046,9 +984,7 @@ public Builder clearBlue() {
      * 
      * 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
@@ -1062,7 +998,7 @@ public Builder clearBlue() {
      * @return Whether the alpha field is set.
      */
     public boolean hasAlpha() {
-      return ((bitField0_ & 0x00000008) != 0);
+      return alphaBuilder_ != null || alpha_ != null;
     }
 
     /**
@@ -1071,9 +1007,7 @@ public boolean hasAlpha() {
      * 
      * 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
@@ -1100,9 +1034,7 @@ public com.google.protobuf.FloatValue getAlpha() {
      * 
      * 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
@@ -1119,11 +1051,11 @@ public Builder setAlpha(com.google.protobuf.FloatValue value) {
           throw new NullPointerException();
         }
         alpha_ = value;
+        onChanged();
       } else {
         alphaBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -1133,9 +1065,7 @@ public Builder setAlpha(com.google.protobuf.FloatValue value) {
      * 
      * 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
@@ -1149,11 +1079,11 @@ public Builder setAlpha(com.google.protobuf.FloatValue value) {
     public Builder setAlpha(com.google.protobuf.FloatValue.Builder builderForValue) {
       if (alphaBuilder_ == null) {
         alpha_ = builderForValue.build();
+        onChanged();
       } else {
         alphaBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -1163,9 +1093,7 @@ public Builder setAlpha(com.google.protobuf.FloatValue.Builder builderForValue)
      * 
      * 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
@@ -1178,20 +1106,17 @@ public Builder setAlpha(com.google.protobuf.FloatValue.Builder builderForValue)
      */
     public Builder mergeAlpha(com.google.protobuf.FloatValue value) {
       if (alphaBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)
-            && alpha_ != null
-            && alpha_ != com.google.protobuf.FloatValue.getDefaultInstance()) {
-          getAlphaBuilder().mergeFrom(value);
+        if (alpha_ != null) {
+          alpha_ =
+              com.google.protobuf.FloatValue.newBuilder(alpha_).mergeFrom(value).buildPartial();
         } else {
           alpha_ = value;
         }
+        onChanged();
       } else {
         alphaBuilder_.mergeFrom(value);
       }
-      if (alpha_ != null) {
-        bitField0_ |= 0x00000008;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1201,9 +1126,7 @@ public Builder mergeAlpha(com.google.protobuf.FloatValue value) {
      * 
      * 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
@@ -1215,13 +1138,14 @@ public Builder mergeAlpha(com.google.protobuf.FloatValue value) {
      * .google.protobuf.FloatValue alpha = 4;
      */
     public Builder clearAlpha() {
-      bitField0_ = (bitField0_ & ~0x00000008);
-      alpha_ = null;
-      if (alphaBuilder_ != null) {
-        alphaBuilder_.dispose();
+      if (alphaBuilder_ == null) {
+        alpha_ = null;
+        onChanged();
+      } else {
+        alpha_ = null;
         alphaBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1231,9 +1155,7 @@ public Builder clearAlpha() {
      * 
      * 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
@@ -1245,7 +1167,7 @@ public Builder clearAlpha() {
      * .google.protobuf.FloatValue alpha = 4;
      */
     public com.google.protobuf.FloatValue.Builder getAlphaBuilder() {
-      bitField0_ |= 0x00000008;
+
       onChanged();
       return getAlphaFieldBuilder().getBuilder();
     }
@@ -1256,9 +1178,7 @@ public com.google.protobuf.FloatValue.Builder getAlphaBuilder() {
      * 
      * 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
@@ -1283,9 +1203,7 @@ public com.google.protobuf.FloatValueOrBuilder getAlphaOrBuilder() {
      * 
      * 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 d6a60193e5..7d8edf465c 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/color.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public interface ColorOrBuilder
@@ -69,9 +68,7 @@ public interface ColorOrBuilder
    * 
    * 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
@@ -92,9 +89,7 @@ public interface ColorOrBuilder
    * 
    * 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
@@ -115,9 +110,7 @@ public interface ColorOrBuilder
    * 
    * 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/ColorProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/ColorProto.java
index aa03c7c60c..731280e0c9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/ColorProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/ColorProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/color.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public final class ColorProto {
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 5a39bf7288..57a933f815 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/date.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
@@ -27,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`.
  * 

@@ -59,6 +56,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;
   }
@@ -72,7 +74,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int YEAR_FIELD_NUMBER = 1;
-  private int year_ = 0;
+  private int year_;
 
   /**
    *
@@ -92,7 +94,7 @@ public int getYear() {
   }
 
   public static final int MONTH_FIELD_NUMBER = 2;
-  private int month_ = 0;
+  private int month_;
 
   /**
    *
@@ -112,7 +114,7 @@ public int getMonth() {
   }
 
   public static final int DAY_FIELD_NUMBER = 3;
-  private int day_ = 0;
+  private int day_;
 
   /**
    *
@@ -316,13 +318,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`.
    * 

@@ -355,10 +355,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       year_ = 0;
+
       month_ = 0;
+
       day_ = 0;
+
       return this;
     }
 
@@ -384,26 +386,13 @@ public com.google.type.Date build() {
     @java.lang.Override
     public com.google.type.Date buildPartial() {
       com.google.type.Date result = new com.google.type.Date(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.year_ = year_;
+      result.month_ = month_;
+      result.day_ = day_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.type.Date result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.year_ = year_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.month_ = month_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.day_ = day_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -487,19 +476,19 @@ public Builder mergeFrom(
             case 8:
               {
                 year_ = input.readInt32();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 16:
               {
                 month_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 24:
               {
                 day_ = input.readInt32();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             default:
@@ -519,8 +508,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private int year_;
 
     /**
@@ -556,7 +543,6 @@ public int getYear() {
     public Builder setYear(int value) {
 
       year_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -574,7 +560,7 @@ public Builder setYear(int value) {
      * @return This builder for chaining.
      */
     public Builder clearYear() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       year_ = 0;
       onChanged();
       return this;
@@ -615,7 +601,6 @@ public int getMonth() {
     public Builder setMonth(int value) {
 
       month_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -633,7 +618,7 @@ public Builder setMonth(int value) {
      * @return This builder for chaining.
      */
     public Builder clearMonth() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       month_ = 0;
       onChanged();
       return this;
@@ -676,7 +661,6 @@ public int getDay() {
     public Builder setDay(int value) {
 
       day_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -695,7 +679,7 @@ public Builder setDay(int value) {
      * @return This builder for chaining.
      */
     public Builder clearDay() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       day_ = 0;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateOrBuilder.java
index c0eec852b8..b0e8d4d874 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/date.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public interface DateOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateProto.java
index 05b2d8d356..ef1ba40b7c 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/date.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public final class DateProto {
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 b7cdbf21e5..799e10a4a8 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/datetime.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
@@ -24,27 +23,21 @@
  *
  * 
  * 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.
  * 

@@ -70,6 +63,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;
   }
@@ -83,8 +81,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   private int timeOffsetCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object timeOffset_;
 
   public enum TimeOffsetCase
@@ -133,7 +129,7 @@ public TimeOffsetCase getTimeOffsetCase() {
   }
 
   public static final int YEAR_FIELD_NUMBER = 1;
-  private int year_ = 0;
+  private int year_;
 
   /**
    *
@@ -153,7 +149,7 @@ public int getYear() {
   }
 
   public static final int MONTH_FIELD_NUMBER = 2;
-  private int month_ = 0;
+  private int month_;
 
   /**
    *
@@ -172,7 +168,7 @@ public int getMonth() {
   }
 
   public static final int DAY_FIELD_NUMBER = 3;
-  private int day_ = 0;
+  private int day_;
 
   /**
    *
@@ -192,7 +188,7 @@ public int getDay() {
   }
 
   public static final int HOURS_FIELD_NUMBER = 4;
-  private int hours_ = 0;
+  private int hours_;
 
   /**
    *
@@ -213,7 +209,7 @@ public int getHours() {
   }
 
   public static final int MINUTES_FIELD_NUMBER = 5;
-  private int minutes_ = 0;
+  private int minutes_;
 
   /**
    *
@@ -232,7 +228,7 @@ public int getMinutes() {
   }
 
   public static final int SECONDS_FIELD_NUMBER = 6;
-  private int seconds_ = 0;
+  private int seconds_;
 
   /**
    *
@@ -252,7 +248,7 @@ public int getSeconds() {
   }
 
   public static final int NANOS_FIELD_NUMBER = 7;
-  private int nanos_ = 0;
+  private int nanos_;
 
   /**
    *
@@ -641,27 +637,21 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * 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.
    * 

@@ -694,14 +684,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       year_ = 0;
+
       month_ = 0;
+
       day_ = 0;
+
       hours_ = 0;
+
       minutes_ = 0;
+
       seconds_ = 0;
+
       nanos_ = 0;
+
       if (utcOffsetBuilder_ != null) {
         utcOffsetBuilder_.clear();
       }
@@ -735,48 +731,30 @@ public com.google.type.DateTime build() {
     @java.lang.Override
     public com.google.type.DateTime buildPartial() {
       com.google.type.DateTime result = new com.google.type.DateTime(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      buildPartialOneofs(result);
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.type.DateTime result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.year_ = year_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.month_ = month_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.day_ = day_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.hours_ = hours_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.minutes_ = minutes_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.seconds_ = seconds_;
+      result.year_ = year_;
+      result.month_ = month_;
+      result.day_ = day_;
+      result.hours_ = hours_;
+      result.minutes_ = minutes_;
+      result.seconds_ = seconds_;
+      result.nanos_ = nanos_;
+      if (timeOffsetCase_ == 8) {
+        if (utcOffsetBuilder_ == null) {
+          result.timeOffset_ = timeOffset_;
+        } else {
+          result.timeOffset_ = utcOffsetBuilder_.build();
+        }
       }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.nanos_ = nanos_;
+      if (timeOffsetCase_ == 9) {
+        if (timeZoneBuilder_ == null) {
+          result.timeOffset_ = timeOffset_;
+        } else {
+          result.timeOffset_ = timeZoneBuilder_.build();
+        }
       }
-    }
-
-    private void buildPartialOneofs(com.google.type.DateTime result) {
       result.timeOffsetCase_ = timeOffsetCase_;
-      result.timeOffset_ = this.timeOffset_;
-      if (timeOffsetCase_ == 8 && utcOffsetBuilder_ != null) {
-        result.timeOffset_ = utcOffsetBuilder_.build();
-      }
-      if (timeOffsetCase_ == 9 && timeZoneBuilder_ != null) {
-        result.timeOffset_ = timeZoneBuilder_.build();
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -890,43 +868,43 @@ public Builder mergeFrom(
             case 8:
               {
                 year_ = input.readInt32();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 16:
               {
                 month_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 24:
               {
                 day_ = input.readInt32();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 32:
               {
                 hours_ = input.readInt32();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             case 40:
               {
                 minutes_ = input.readInt32();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 40
             case 48:
               {
                 seconds_ = input.readInt32();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 48
             case 56:
               {
                 nanos_ = input.readInt32();
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 56
             case 66:
@@ -972,8 +950,6 @@ public Builder clearTimeOffset() {
       return this;
     }
 
-    private int bitField0_;
-
     private int year_;
 
     /**
@@ -1009,7 +985,6 @@ public int getYear() {
     public Builder setYear(int value) {
 
       year_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1027,7 +1002,7 @@ public Builder setYear(int value) {
      * @return This builder for chaining.
      */
     public Builder clearYear() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       year_ = 0;
       onChanged();
       return this;
@@ -1066,7 +1041,6 @@ public int getMonth() {
     public Builder setMonth(int value) {
 
       month_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1083,7 +1057,7 @@ public Builder setMonth(int value) {
      * @return This builder for chaining.
      */
     public Builder clearMonth() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       month_ = 0;
       onChanged();
       return this;
@@ -1124,7 +1098,6 @@ public int getDay() {
     public Builder setDay(int value) {
 
       day_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1142,7 +1115,7 @@ public Builder setDay(int value) {
      * @return This builder for chaining.
      */
     public Builder clearDay() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       day_ = 0;
       onChanged();
       return this;
@@ -1185,7 +1158,6 @@ public int getHours() {
     public Builder setHours(int value) {
 
       hours_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1204,7 +1176,7 @@ public Builder setHours(int value) {
      * @return This builder for chaining.
      */
     public Builder clearHours() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       hours_ = 0;
       onChanged();
       return this;
@@ -1243,7 +1215,6 @@ public int getMinutes() {
     public Builder setMinutes(int value) {
 
       minutes_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1260,7 +1231,7 @@ public Builder setMinutes(int value) {
      * @return This builder for chaining.
      */
     public Builder clearMinutes() {
-      bitField0_ = (bitField0_ & ~0x00000010);
+
       minutes_ = 0;
       onChanged();
       return this;
@@ -1301,7 +1272,6 @@ public int getSeconds() {
     public Builder setSeconds(int value) {
 
       seconds_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1319,7 +1289,7 @@ public Builder setSeconds(int value) {
      * @return This builder for chaining.
      */
     public Builder clearSeconds() {
-      bitField0_ = (bitField0_ & ~0x00000020);
+
       seconds_ = 0;
       onChanged();
       return this;
@@ -1360,7 +1330,6 @@ public int getNanos() {
     public Builder setNanos(int value) {
 
       nanos_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1378,7 +1347,7 @@ public Builder setNanos(int value) {
      * @return This builder for chaining.
      */
     public Builder clearNanos() {
-      bitField0_ = (bitField0_ & ~0x00000040);
+
       nanos_ = 0;
       onChanged();
       return this;
@@ -1613,6 +1582,7 @@ public com.google.protobuf.DurationOrBuilder getUtcOffsetOrBuilder() {
       }
       timeOffsetCase_ = 8;
       onChanged();
+      ;
       return utcOffsetBuilder_;
     }
 
@@ -1826,6 +1796,7 @@ public com.google.type.TimeZoneOrBuilder getTimeZoneOrBuilder() {
       }
       timeOffsetCase_ = 9;
       onChanged();
+      ;
       return timeZoneBuilder_;
     }
 
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 f9fc94d98c..d0cc9abbac 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/datetime.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public interface DateTimeOrBuilder
@@ -201,5 +200,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/DateTimeProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateTimeProto.java
index af1ba799e8..2eb264d2e6 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateTimeProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DateTimeProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/datetime.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public final class DateTimeProto {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DayOfWeek.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DayOfWeek.java
index 3dc86e04ba..4426666771 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DayOfWeek.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DayOfWeek.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/dayofweek.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DayOfWeekProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DayOfWeekProto.java
index 92f885f5be..6622d4dbc1 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DayOfWeekProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DayOfWeekProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/dayofweek.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public final class DayOfWeekProto {
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 d327603769..0085130f71 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/decimal.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
@@ -26,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
@@ -55,6 +53,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;
   }
@@ -68,72 +71,54 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int VALUE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object value_ = "";
+  private volatile java.lang.Object value_;
 
   /**
    *
    *
    * 
    * 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` -> `2.5`).
    *   - Replacing a zero-length integer value with `0` (`.5` -> `0.5`).
    *   - Coercing the exponent character to lower-case (`2.5E8` -> `2.5e8`).
    *   - Removing an explicitly-provided zero exponent (`2.5e0` -> `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` <-> `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.
    * 

@@ -160,63 +145,47 @@ public java.lang.String getValue() {
    *
    * 
    * 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` -> `2.5`).
    *   - Replacing a zero-length integer value with `0` (`.5` -> `0.5`).
    *   - Coercing the exponent character to lower-case (`2.5E8` -> `2.5e8`).
    *   - Removing an explicitly-provided zero exponent (`2.5e0` -> `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` <-> `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.
    * 

@@ -403,7 +372,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
@@ -437,8 +405,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       value_ = "";
+
       return this;
     }
 
@@ -464,20 +432,11 @@ public com.google.type.Decimal build() {
     @java.lang.Override
     public com.google.type.Decimal buildPartial() {
       com.google.type.Decimal result = new com.google.type.Decimal(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.value_ = value_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.type.Decimal result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.value_ = value_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -525,7 +484,6 @@ public Builder mergeFrom(com.google.type.Decimal other) {
       if (other == com.google.type.Decimal.getDefaultInstance()) return this;
       if (!other.getValue().isEmpty()) {
         value_ = other.value_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -557,7 +515,7 @@ public Builder mergeFrom(
             case 10:
               {
                 value_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -577,8 +535,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object value_ = "";
 
     /**
@@ -586,63 +542,47 @@ public Builder mergeFrom(
      *
      * 
      * 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` -> `2.5`).
      *   - Replacing a zero-length integer value with `0` (`.5` -> `0.5`).
      *   - Coercing the exponent character to lower-case (`2.5E8` -> `2.5e8`).
      *   - Removing an explicitly-provided zero exponent (`2.5e0` -> `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` <-> `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.
      * 

@@ -668,63 +608,47 @@ public java.lang.String getValue() {
      *
      * 
      * 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` -> `2.5`).
      *   - Replacing a zero-length integer value with `0` (`.5` -> `0.5`).
      *   - Coercing the exponent character to lower-case (`2.5E8` -> `2.5e8`).
      *   - Removing an explicitly-provided zero exponent (`2.5e0` -> `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` <-> `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.
      * 

@@ -750,63 +674,47 @@ public com.google.protobuf.ByteString getValueBytes() {
      *
      * 
      * 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` -> `2.5`).
      *   - Replacing a zero-length integer value with `0` (`.5` -> `0.5`).
      *   - Coercing the exponent character to lower-case (`2.5E8` -> `2.5e8`).
      *   - Removing an explicitly-provided zero exponent (`2.5e0` -> `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` <-> `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.
      * 

@@ -820,8 +728,8 @@ public Builder setValue(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       value_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -831,63 +739,47 @@ public Builder setValue(java.lang.String value) {
      *
      * 
      * 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` -> `2.5`).
      *   - Replacing a zero-length integer value with `0` (`.5` -> `0.5`).
      *   - Coercing the exponent character to lower-case (`2.5E8` -> `2.5e8`).
      *   - Removing an explicitly-provided zero exponent (`2.5e0` -> `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` <-> `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.
      * 

@@ -897,8 +789,8 @@ public Builder setValue(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearValue() {
+
       value_ = getDefaultInstance().getValue();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -908,63 +800,47 @@ public Builder clearValue() {
      *
      * 
      * 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` -> `2.5`).
      *   - Replacing a zero-length integer value with `0` (`.5` -> `0.5`).
      *   - Coercing the exponent character to lower-case (`2.5E8` -> `2.5e8`).
      *   - Removing an explicitly-provided zero exponent (`2.5e0` -> `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` <-> `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.
      * 

@@ -979,8 +855,8 @@ public Builder setValueBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       value_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
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 8f3ab69bf2..fe44918bbc 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/decimal.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public interface DecimalOrBuilder
@@ -29,63 +28,47 @@ public interface DecimalOrBuilder
    *
    * 
    * 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` -> `2.5`).
    *   - Replacing a zero-length integer value with `0` (`.5` -> `0.5`).
    *   - Coercing the exponent character to lower-case (`2.5E8` -> `2.5e8`).
    *   - Removing an explicitly-provided zero exponent (`2.5e0` -> `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` <-> `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.
    * 

@@ -101,63 +84,47 @@ public interface DecimalOrBuilder
    *
    * 
    * 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` -> `2.5`).
    *   - Replacing a zero-length integer value with `0` (`.5` -> `0.5`).
    *   - Coercing the exponent character to lower-case (`2.5E8` -> `2.5e8`).
    *   - Removing an explicitly-provided zero exponent (`2.5e0` -> `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` <-> `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.
    * 

diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DecimalProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DecimalProto.java
index d0d16c0996..bff89223a3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DecimalProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/DecimalProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/decimal.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public final class DecimalProto {
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 918966a783..b471df02e5 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/expr.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
@@ -26,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() < 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' && 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.
@@ -82,6 +72,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;
   }
@@ -95,9 +90,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int EXPRESSION_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object expression_ = "";
+  private volatile java.lang.Object expression_;
 
   /**
    *
@@ -150,9 +143,7 @@ public com.google.protobuf.ByteString getExpressionBytes() {
   }
 
   public static final int TITLE_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object title_ = "";
+  private volatile java.lang.Object title_;
 
   /**
    *
@@ -207,9 +198,7 @@ public com.google.protobuf.ByteString getTitleBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object description_ = "";
+  private volatile java.lang.Object description_;
 
   /**
    *
@@ -262,9 +251,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int LOCATION_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object location_ = "";
+  private volatile java.lang.Object location_;
 
   /**
    *
@@ -508,31 +495,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() < 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' && 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.
@@ -566,11 +544,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       expression_ = "";
+
       title_ = "";
+
       description_ = "";
+
       location_ = "";
+
       return this;
     }
 
@@ -596,29 +577,14 @@ public com.google.type.Expr build() {
     @java.lang.Override
     public com.google.type.Expr buildPartial() {
       com.google.type.Expr result = new com.google.type.Expr(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.expression_ = expression_;
+      result.title_ = title_;
+      result.description_ = description_;
+      result.location_ = location_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.type.Expr result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.expression_ = expression_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.title_ = title_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.description_ = description_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.location_ = location_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -666,22 +632,18 @@ public Builder mergeFrom(com.google.type.Expr other) {
       if (other == com.google.type.Expr.getDefaultInstance()) return this;
       if (!other.getExpression().isEmpty()) {
         expression_ = other.expression_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getTitle().isEmpty()) {
         title_ = other.title_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getLocation().isEmpty()) {
         location_ = other.location_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -713,25 +675,25 @@ public Builder mergeFrom(
             case 10:
               {
                 expression_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 title_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 description_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 location_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             default:
@@ -751,8 +713,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object expression_ = "";
 
     /**
@@ -820,8 +780,8 @@ public Builder setExpression(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       expression_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -839,8 +799,8 @@ public Builder setExpression(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearExpression() {
+
       expression_ = getDefaultInstance().getExpression();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -863,8 +823,8 @@ public Builder setExpressionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       expression_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -939,8 +899,8 @@ public Builder setTitle(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       title_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -959,8 +919,8 @@ public Builder setTitle(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTitle() {
+
       title_ = getDefaultInstance().getTitle();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -984,8 +944,8 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       title_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1057,8 +1017,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       description_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1076,8 +1036,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
+
       description_ = getDefaultInstance().getDescription();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1100,8 +1060,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       description_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1173,8 +1133,8 @@ public Builder setLocation(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       location_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1192,8 +1152,8 @@ public Builder setLocation(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLocation() {
+
       location_ = getDefaultInstance().getLocation();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1216,8 +1176,8 @@ public Builder setLocationBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       location_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/ExprOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/ExprOrBuilder.java
index af68e845f0..f5829490f1 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/ExprOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/ExprOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/expr.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public interface ExprOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/ExprProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/ExprProto.java
index 11078e0895..d8dbc58e2a 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/ExprProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/ExprProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/expr.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public final class ExprProto {
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 da75a380d3..d25ec8d849 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/fraction.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
@@ -47,6 +46,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;
   }
@@ -60,7 +64,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NUMERATOR_FIELD_NUMBER = 1;
-  private long numerator_ = 0L;
+  private long numerator_;
 
   /**
    *
@@ -79,7 +83,7 @@ public long getNumerator() {
   }
 
   public static final int DENOMINATOR_FIELD_NUMBER = 2;
-  private long denominator_ = 0L;
+  private long denominator_;
 
   /**
    *
@@ -300,9 +304,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       numerator_ = 0L;
+
       denominator_ = 0L;
+
       return this;
     }
 
@@ -328,23 +333,12 @@ public com.google.type.Fraction build() {
     @java.lang.Override
     public com.google.type.Fraction buildPartial() {
       com.google.type.Fraction result = new com.google.type.Fraction(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.numerator_ = numerator_;
+      result.denominator_ = denominator_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.type.Fraction result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.numerator_ = numerator_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.denominator_ = denominator_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -425,13 +419,13 @@ public Builder mergeFrom(
             case 8:
               {
                 numerator_ = input.readInt64();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 16:
               {
                 denominator_ = input.readInt64();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             default:
@@ -451,8 +445,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private long numerator_;
 
     /**
@@ -486,7 +478,6 @@ public long getNumerator() {
     public Builder setNumerator(long value) {
 
       numerator_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -503,7 +494,7 @@ public Builder setNumerator(long value) {
      * @return This builder for chaining.
      */
     public Builder clearNumerator() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       numerator_ = 0L;
       onChanged();
       return this;
@@ -544,7 +535,6 @@ public long getDenominator() {
     public Builder setDenominator(long value) {
 
       denominator_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -562,7 +552,7 @@ public Builder setDenominator(long value) {
      * @return This builder for chaining.
      */
     public Builder clearDenominator() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       denominator_ = 0L;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/FractionOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/FractionOrBuilder.java
index 23e12b0b97..117c772efd 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/FractionOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/FractionOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/fraction.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public interface FractionOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/FractionProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/FractionProto.java
index 9e92ba223d..5118a8a243 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/FractionProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/FractionProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/fraction.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public final class FractionProto {
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 7317b89fb3..54fe2391ed 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/interval.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
@@ -25,7 +24,6 @@
  * 
  * 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.
@@ -52,6 +50,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;
   }
@@ -64,7 +67,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.type.Interval.class, com.google.type.Interval.Builder.class);
   }
 
-  private int bitField0_;
   public static final int START_TIME_FIELD_NUMBER = 1;
   private com.google.protobuf.Timestamp startTime_;
 
@@ -73,7 +75,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * Optional. Inclusive start of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be the same
    * or after the start.
    * 

@@ -84,7 +85,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasStartTime() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return startTime_ != null;
   }
 
   /**
@@ -92,7 +93,6 @@ public boolean hasStartTime() {
    *
    * 
    * Optional. Inclusive start of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be the same
    * or after the start.
    * 

@@ -111,7 +111,6 @@ public com.google.protobuf.Timestamp getStartTime() {
    *
    * 
    * Optional. Inclusive start of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be the same
    * or after the start.
    * 

@@ -120,7 +119,7 @@ public com.google.protobuf.Timestamp getStartTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
-    return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
+    return getStartTime();
   }
 
   public static final int END_TIME_FIELD_NUMBER = 2;
@@ -131,7 +130,6 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
    *
    * 
    * Optional. Exclusive end of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be before the
    * end.
    * 

@@ -142,7 +140,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasEndTime() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return endTime_ != null;
   }
 
   /**
@@ -150,7 +148,6 @@ public boolean hasEndTime() {
    *
    * 
    * Optional. Exclusive end of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be before the
    * end.
    * 

@@ -169,7 +166,6 @@ public com.google.protobuf.Timestamp getEndTime() {
    *
    * 
    * Optional. Exclusive end of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be before the
    * end.
    * 

@@ -178,7 +174,7 @@ public com.google.protobuf.Timestamp getEndTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
-    return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_;
+    return getEndTime();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -195,10 +191,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (startTime_ != null) {
       output.writeMessage(1, getStartTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (endTime_ != null) {
       output.writeMessage(2, getEndTime());
     }
     getUnknownFields().writeTo(output);
@@ -210,10 +206,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (startTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getStartTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (endTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getEndTime());
     }
     size += getUnknownFields().getSerializedSize();
@@ -364,7 +360,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * 
    * 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.
@@ -389,34 +384,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.type.Interval.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getStartTimeFieldBuilder();
-        getEndTimeFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      startTime_ = null;
-      if (startTimeBuilder_ != null) {
-        startTimeBuilder_.dispose();
+      if (startTimeBuilder_ == null) {
+        startTime_ = null;
+      } else {
+        startTime_ = null;
         startTimeBuilder_ = null;
       }
-      endTime_ = null;
-      if (endTimeBuilder_ != null) {
-        endTimeBuilder_.dispose();
+      if (endTimeBuilder_ == null) {
+        endTime_ = null;
+      } else {
+        endTime_ = null;
         endTimeBuilder_ = null;
       }
       return this;
@@ -444,27 +430,20 @@ public com.google.type.Interval build() {
     @java.lang.Override
     public com.google.type.Interval buildPartial() {
       com.google.type.Interval result = new com.google.type.Interval(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (startTimeBuilder_ == null) {
+        result.startTime_ = startTime_;
+      } else {
+        result.startTime_ = startTimeBuilder_.build();
+      }
+      if (endTimeBuilder_ == null) {
+        result.endTime_ = endTime_;
+      } else {
+        result.endTime_ = endTimeBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.type.Interval result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.startTime_ = startTimeBuilder_ == null ? startTime_ : startTimeBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -545,13 +524,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -571,8 +550,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.protobuf.Timestamp startTime_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.protobuf.Timestamp,
@@ -585,7 +562,6 @@ public Builder mergeFrom(
      *
      * 
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * 

@@ -595,7 +571,7 @@ public Builder mergeFrom(
      * @return Whether the startTime field is set.
      */
     public boolean hasStartTime() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return startTimeBuilder_ != null || startTime_ != null;
     }
 
     /**
@@ -603,7 +579,6 @@ public boolean hasStartTime() {
      *
      * 
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * 

@@ -625,7 +600,6 @@ public com.google.protobuf.Timestamp getStartTime() {
      *
      * 
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * 

@@ -638,11 +612,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         startTime_ = value;
+        onChanged();
       } else {
         startTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -651,7 +625,6 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) {
      *
      * 
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * 

@@ -661,11 +634,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) {
     public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (startTimeBuilder_ == null) {
         startTime_ = builderForValue.build();
+        onChanged();
       } else {
         startTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -674,7 +647,6 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu
      *
      * 
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * 

@@ -683,20 +655,17 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu
      */
     public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
       if (startTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && startTime_ != null
-            && startTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getStartTimeBuilder().mergeFrom(value);
+        if (startTime_ != null) {
+          startTime_ =
+              com.google.protobuf.Timestamp.newBuilder(startTime_).mergeFrom(value).buildPartial();
         } else {
           startTime_ = value;
         }
+        onChanged();
       } else {
         startTimeBuilder_.mergeFrom(value);
       }
-      if (startTime_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -705,7 +674,6 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
      *
      * 
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * 

@@ -713,13 +681,14 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
      * .google.protobuf.Timestamp start_time = 1;
      */
     public Builder clearStartTime() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      startTime_ = null;
-      if (startTimeBuilder_ != null) {
-        startTimeBuilder_.dispose();
+      if (startTimeBuilder_ == null) {
+        startTime_ = null;
+        onChanged();
+      } else {
+        startTime_ = null;
         startTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -728,7 +697,6 @@ public Builder clearStartTime() {
      *
      * 
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * 

@@ -736,7 +704,7 @@ public Builder clearStartTime() {
      * .google.protobuf.Timestamp start_time = 1;
      */
     public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getStartTimeFieldBuilder().getBuilder();
     }
@@ -746,7 +714,6 @@ public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() {
      *
      * 
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * 

@@ -766,7 +733,6 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
      *
      * 
      * Optional. Inclusive start of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be the same
      * or after the start.
      * 

@@ -802,7 +768,6 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
      *
      * 
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * 

@@ -812,7 +777,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
      * @return Whether the endTime field is set.
      */
     public boolean hasEndTime() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return endTimeBuilder_ != null || endTime_ != null;
     }
 
     /**
@@ -820,7 +785,6 @@ public boolean hasEndTime() {
      *
      * 
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * 

@@ -842,7 +806,6 @@ public com.google.protobuf.Timestamp getEndTime() {
      *
      * 
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * 

@@ -855,11 +818,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         endTime_ = value;
+        onChanged();
       } else {
         endTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -868,7 +831,6 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
      *
      * 
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * 

@@ -878,11 +840,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
     public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (endTimeBuilder_ == null) {
         endTime_ = builderForValue.build();
+        onChanged();
       } else {
         endTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -891,7 +853,6 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue)
      *
      * 
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * 

@@ -900,20 +861,17 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue)
      */
     public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
       if (endTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && endTime_ != null
-            && endTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getEndTimeBuilder().mergeFrom(value);
+        if (endTime_ != null) {
+          endTime_ =
+              com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial();
         } else {
           endTime_ = value;
         }
+        onChanged();
       } else {
         endTimeBuilder_.mergeFrom(value);
       }
-      if (endTime_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -922,7 +880,6 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
      *
      * 
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * 

@@ -930,13 +887,14 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
      * .google.protobuf.Timestamp end_time = 2;
      */
     public Builder clearEndTime() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      endTime_ = null;
-      if (endTimeBuilder_ != null) {
-        endTimeBuilder_.dispose();
+      if (endTimeBuilder_ == null) {
+        endTime_ = null;
+        onChanged();
+      } else {
+        endTime_ = null;
         endTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -945,7 +903,6 @@ public Builder clearEndTime() {
      *
      * 
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * 

@@ -953,7 +910,7 @@ public Builder clearEndTime() {
      * .google.protobuf.Timestamp end_time = 2;
      */
     public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getEndTimeFieldBuilder().getBuilder();
     }
@@ -963,7 +920,6 @@ public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() {
      *
      * 
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * 

@@ -983,7 +939,6 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
      *
      * 
      * Optional. Exclusive end of the interval.
-     *
      * If specified, a Timestamp matching this interval will have to be before the
      * end.
      * 

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 bae587ba40..e4e745a8b4 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/interval.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public interface IntervalOrBuilder
@@ -29,7 +28,6 @@ public interface IntervalOrBuilder
    *
    * 
    * Optional. Inclusive start of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be the same
    * or after the start.
    * 

@@ -45,7 +43,6 @@ public interface IntervalOrBuilder
    *
    * 
    * Optional. Inclusive start of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be the same
    * or after the start.
    * 

@@ -61,7 +58,6 @@ public interface IntervalOrBuilder
    *
    * 
    * Optional. Inclusive start of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be the same
    * or after the start.
    * 

@@ -75,7 +71,6 @@ public interface IntervalOrBuilder
    *
    * 
    * Optional. Exclusive end of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be before the
    * end.
    * 

@@ -91,7 +86,6 @@ public interface IntervalOrBuilder
    *
    * 
    * Optional. Exclusive end of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be before the
    * end.
    * 

@@ -107,7 +101,6 @@ public interface IntervalOrBuilder
    *
    * 
    * Optional. Exclusive end of the interval.
-   *
    * If specified, a Timestamp matching this interval will have to be before the
    * end.
    * 

diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/IntervalProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/IntervalProto.java
index a74f01d805..06df2e0aac 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/IntervalProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/IntervalProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/interval.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public final class IntervalProto {
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 cfcb3abcad..d291afa98b 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/latlng.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
@@ -51,6 +50,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;
   }
@@ -64,7 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int LATITUDE_FIELD_NUMBER = 1;
-  private double latitude_ = 0D;
+  private double latitude_;
 
   /**
    *
@@ -83,7 +87,7 @@ public double getLatitude() {
   }
 
   public static final int LONGITUDE_FIELD_NUMBER = 2;
-  private double longitude_ = 0D;
+  private double longitude_;
 
   /**
    *
@@ -315,9 +319,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       latitude_ = 0D;
+
       longitude_ = 0D;
+
       return this;
     }
 
@@ -343,23 +348,12 @@ public com.google.type.LatLng build() {
     @java.lang.Override
     public com.google.type.LatLng buildPartial() {
       com.google.type.LatLng result = new com.google.type.LatLng(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.latitude_ = latitude_;
+      result.longitude_ = longitude_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.type.LatLng result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.latitude_ = latitude_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.longitude_ = longitude_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -440,13 +434,13 @@ public Builder mergeFrom(
             case 9:
               {
                 latitude_ = input.readDouble();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 9
             case 17:
               {
                 longitude_ = input.readDouble();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 17
             default:
@@ -466,8 +460,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private double latitude_;
 
     /**
@@ -501,7 +493,6 @@ public double getLatitude() {
     public Builder setLatitude(double value) {
 
       latitude_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -518,7 +509,7 @@ public Builder setLatitude(double value) {
      * @return This builder for chaining.
      */
     public Builder clearLatitude() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       latitude_ = 0D;
       onChanged();
       return this;
@@ -557,7 +548,6 @@ public double getLongitude() {
     public Builder setLongitude(double value) {
 
       longitude_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -574,7 +564,7 @@ public Builder setLongitude(double value) {
      * @return This builder for chaining.
      */
     public Builder clearLongitude() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       longitude_ = 0D;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LatLngOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LatLngOrBuilder.java
index ebaf88233a..4843ef2460 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LatLngOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LatLngOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/latlng.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public interface LatLngOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LatLngProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LatLngProto.java
index eea947ad48..8242fcb2b3 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LatLngProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LatLngProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/latlng.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public final class LatLngProto {
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 9a8b20a335..6a0d759941 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/localized_text.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
@@ -50,6 +49,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;
   }
@@ -64,9 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int TEXT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object text_ = "";
+  private volatile java.lang.Object text_;
 
   /**
    *
@@ -117,16 +119,13 @@ public com.google.protobuf.ByteString getTextBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object languageCode_ = "";
+  private volatile java.lang.Object languageCode_;
 
   /**
    *
    *
    * 
    * 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.
    * 

@@ -153,7 +152,6 @@ public java.lang.String getLanguageCode() {
    *
    * 
    * 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.
    * 

@@ -379,9 +377,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       text_ = "";
+
       languageCode_ = "";
+
       return this;
     }
 
@@ -408,23 +407,12 @@ public com.google.type.LocalizedText build() {
     @java.lang.Override
     public com.google.type.LocalizedText buildPartial() {
       com.google.type.LocalizedText result = new com.google.type.LocalizedText(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.text_ = text_;
+      result.languageCode_ = languageCode_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.type.LocalizedText result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.text_ = text_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.languageCode_ = languageCode_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -472,12 +460,10 @@ public Builder mergeFrom(com.google.type.LocalizedText other) {
       if (other == com.google.type.LocalizedText.getDefaultInstance()) return this;
       if (!other.getText().isEmpty()) {
         text_ = other.text_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -509,13 +495,13 @@ public Builder mergeFrom(
             case 10:
               {
                 text_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 languageCode_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -535,8 +521,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object text_ = "";
 
     /**
@@ -601,8 +585,8 @@ public Builder setText(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       text_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -619,8 +603,8 @@ public Builder setText(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearText() {
+
       text_ = getDefaultInstance().getText();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -642,8 +626,8 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       text_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -655,7 +639,6 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) {
      *
      * 
      * 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.
      * 

@@ -681,7 +664,6 @@ public java.lang.String getLanguageCode() {
      *
      * 
      * 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.
      * 

@@ -707,7 +689,6 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
      *
      * 
      * 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.
      * 

@@ -721,8 +702,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       languageCode_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -732,7 +713,6 @@ public Builder setLanguageCode(java.lang.String value) {
      *
      * 
      * 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.
      * 

@@ -742,8 +722,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
+
       languageCode_ = getDefaultInstance().getLanguageCode();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -753,7 +733,6 @@ public Builder clearLanguageCode() {
      *
      * 
      * 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.
      * 

@@ -768,8 +747,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       languageCode_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
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 fee797ca97..d237c6aa54 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/localized_text.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public interface LocalizedTextOrBuilder
@@ -55,7 +54,6 @@ public interface LocalizedTextOrBuilder
    *
    * 
    * 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.
    * 

@@ -71,7 +69,6 @@ public interface LocalizedTextOrBuilder
    *
    * 
    * 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.
    * 

diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LocalizedTextProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LocalizedTextProto.java
index 917798d7eb..4edc44a6b9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LocalizedTextProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/LocalizedTextProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/localized_text.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public final class LocalizedTextProto {
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 c53bc2468d..490e752dcf 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/money.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
@@ -49,6 +48,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;
   }
@@ -62,9 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CURRENCY_CODE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object currencyCode_ = "";
+  private volatile java.lang.Object currencyCode_;
 
   /**
    *
@@ -115,7 +117,7 @@ public com.google.protobuf.ByteString getCurrencyCodeBytes() {
   }
 
   public static final int UNITS_FIELD_NUMBER = 2;
-  private long units_ = 0L;
+  private long units_;
 
   /**
    *
@@ -135,7 +137,7 @@ public long getUnits() {
   }
 
   public static final int NANOS_FIELD_NUMBER = 3;
-  private int nanos_ = 0;
+  private int nanos_;
 
   /**
    *
@@ -369,10 +371,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       currencyCode_ = "";
+
       units_ = 0L;
+
       nanos_ = 0;
+
       return this;
     }
 
@@ -398,26 +402,13 @@ public com.google.type.Money build() {
     @java.lang.Override
     public com.google.type.Money buildPartial() {
       com.google.type.Money result = new com.google.type.Money(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.currencyCode_ = currencyCode_;
+      result.units_ = units_;
+      result.nanos_ = nanos_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.type.Money result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.currencyCode_ = currencyCode_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.units_ = units_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.nanos_ = nanos_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -465,7 +456,6 @@ public Builder mergeFrom(com.google.type.Money other) {
       if (other == com.google.type.Money.getDefaultInstance()) return this;
       if (!other.getCurrencyCode().isEmpty()) {
         currencyCode_ = other.currencyCode_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getUnits() != 0L) {
@@ -503,19 +493,19 @@ public Builder mergeFrom(
             case 10:
               {
                 currencyCode_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 units_ = input.readInt64();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 24:
               {
                 nanos_ = input.readInt32();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             default:
@@ -535,8 +525,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object currencyCode_ = "";
 
     /**
@@ -601,8 +589,8 @@ public Builder setCurrencyCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       currencyCode_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -619,8 +607,8 @@ public Builder setCurrencyCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearCurrencyCode() {
+
       currencyCode_ = getDefaultInstance().getCurrencyCode();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -642,8 +630,8 @@ public Builder setCurrencyCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       currencyCode_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -683,7 +671,6 @@ public long getUnits() {
     public Builder setUnits(long value) {
 
       units_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -701,7 +688,7 @@ public Builder setUnits(long value) {
      * @return This builder for chaining.
      */
     public Builder clearUnits() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       units_ = 0L;
       onChanged();
       return this;
@@ -750,7 +737,6 @@ public int getNanos() {
     public Builder setNanos(int value) {
 
       nanos_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -772,7 +758,7 @@ public Builder setNanos(int value) {
      * @return This builder for chaining.
      */
     public Builder clearNanos() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       nanos_ = 0;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/MoneyOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/MoneyOrBuilder.java
index 8a185ffb0c..817ad104db 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/MoneyOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/MoneyOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/money.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public interface MoneyOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/MoneyProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/MoneyProto.java
index 287f1c78b2..3725d85d1b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/MoneyProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/MoneyProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/money.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public final class MoneyProto {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Month.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Month.java
index f827739680..88030b8b13 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Month.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/Month.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/month.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/MonthProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/MonthProto.java
index 8a17e83ae3..722bcef0cc 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/MonthProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/MonthProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/month.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public final class MonthProto {
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 e16cbf1fb1..75e2e25a36 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/phone_number.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
@@ -24,21 +23,15 @@
  *
  * 
  * 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 =
@@ -46,7 +39,6 @@
  *    if (!wireProto.getExtension().isEmpty()) {
  *      phoneNumber.setExtension(wireProto.getExtension());
  *    }
- *
  *  Reference(s):
  *   - https://github.com/google/libphonenumber
  * 

@@ -74,6 +66,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;
   }
@@ -98,7 +95,6 @@ public interface ShortCodeOrBuilder
      * 
      * 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
      * 

@@ -115,7 +111,6 @@ public interface ShortCodeOrBuilder
      * 
      * 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
      * 

@@ -163,7 +158,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
@@ -194,6 +188,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;
@@ -210,9 +209,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int REGION_CODE_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object regionCode_ = "";
+    private volatile java.lang.Object regionCode_;
 
     /**
      *
@@ -220,7 +217,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      * 
      * 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
      * 

@@ -248,7 +244,6 @@ public java.lang.String getRegionCode() {
      * 
      * 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
      * 

@@ -271,9 +266,7 @@ public com.google.protobuf.ByteString getRegionCodeBytes() {
     }
 
     public static final int NUMBER_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object number_ = "";
+    private volatile java.lang.Object number_;
 
     /**
      *
@@ -502,7 +495,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
@@ -541,9 +533,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         regionCode_ = "";
+
         number_ = "";
+
         return this;
       }
 
@@ -571,23 +564,12 @@ public com.google.type.PhoneNumber.ShortCode build() {
       public com.google.type.PhoneNumber.ShortCode buildPartial() {
         com.google.type.PhoneNumber.ShortCode result =
             new com.google.type.PhoneNumber.ShortCode(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        result.regionCode_ = regionCode_;
+        result.number_ = number_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.type.PhoneNumber.ShortCode result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.regionCode_ = regionCode_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.number_ = number_;
-        }
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -637,12 +619,10 @@ public Builder mergeFrom(com.google.type.PhoneNumber.ShortCode other) {
         if (other == com.google.type.PhoneNumber.ShortCode.getDefaultInstance()) return this;
         if (!other.getRegionCode().isEmpty()) {
           regionCode_ = other.regionCode_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getNumber().isEmpty()) {
           number_ = other.number_;
-          bitField0_ |= 0x00000002;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -674,13 +654,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   regionCode_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   number_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               default:
@@ -700,8 +680,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private java.lang.Object regionCode_ = "";
 
       /**
@@ -710,7 +688,6 @@ public Builder mergeFrom(
        * 
        * 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
        * 

@@ -737,7 +714,6 @@ public java.lang.String getRegionCode() {
        * 
        * 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
        * 

@@ -764,7 +740,6 @@ public com.google.protobuf.ByteString getRegionCodeBytes() {
        * 
        * 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
        * 

@@ -778,8 +753,8 @@ public Builder setRegionCode(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         regionCode_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -790,7 +765,6 @@ public Builder setRegionCode(java.lang.String value) {
        * 
        * 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
        * 

@@ -800,8 +774,8 @@ public Builder setRegionCode(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearRegionCode() {
+
         regionCode_ = getDefaultInstance().getRegionCode();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -812,7 +786,6 @@ public Builder clearRegionCode() {
        * 
        * 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
        * 

@@ -827,8 +800,8 @@ public Builder setRegionCodeBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         regionCode_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -900,8 +873,8 @@ public Builder setNumber(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         number_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -919,8 +892,8 @@ public Builder setNumber(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearNumber() {
+
         number_ = getDefaultInstance().getNumber();
-        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -943,8 +916,8 @@ public Builder setNumberBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         number_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1014,8 +987,6 @@ public com.google.type.PhoneNumber.ShortCode getDefaultInstanceForType() {
   }
 
   private int kindCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object kind_;
 
   public enum KindCase
@@ -1075,11 +1046,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.
@@ -1104,11 +1073,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.
@@ -1146,11 +1113,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.
@@ -1185,7 +1150,6 @@ public com.google.protobuf.ByteString getE164NumberBytes() {
    *
    * 
    * A short code.
-   *
    * Reference(s):
    *  - https://en.wikipedia.org/wiki/Short_code
    * 

@@ -1204,7 +1168,6 @@ public boolean hasShortCode() {
    *
    * 
    * A short code.
-   *
    * Reference(s):
    *  - https://en.wikipedia.org/wiki/Short_code
    * 

@@ -1226,7 +1189,6 @@ public com.google.type.PhoneNumber.ShortCode getShortCode() {
    *
    * 
    * A short code.
-   *
    * Reference(s):
    *  - https://en.wikipedia.org/wiki/Short_code
    * 

@@ -1242,9 +1204,7 @@ public com.google.type.PhoneNumber.ShortCodeOrBuilder getShortCodeOrBuilder() {
   }
 
   public static final int EXTENSION_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object extension_ = "";
+  private volatile java.lang.Object extension_;
 
   /**
    *
@@ -1254,7 +1214,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
@@ -1286,7 +1245,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
@@ -1510,21 +1468,15 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * 
    * 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 =
@@ -1532,7 +1484,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *    if (!wireProto.getExtension().isEmpty()) {
    *      phoneNumber.setExtension(wireProto.getExtension());
    *    }
-   *
    *  Reference(s):
    *   - https://github.com/google/libphonenumber
    * 

@@ -1566,11 +1517,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (shortCodeBuilder_ != null) {
         shortCodeBuilder_.clear();
       }
       extension_ = "";
+
       kindCase_ = 0;
       kind_ = null;
       return this;
@@ -1598,27 +1549,20 @@ public com.google.type.PhoneNumber build() {
     @java.lang.Override
     public com.google.type.PhoneNumber buildPartial() {
       com.google.type.PhoneNumber result = new com.google.type.PhoneNumber(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (kindCase_ == 1) {
+        result.kind_ = kind_;
       }
-      buildPartialOneofs(result);
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.type.PhoneNumber result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.extension_ = extension_;
+      if (kindCase_ == 2) {
+        if (shortCodeBuilder_ == null) {
+          result.kind_ = kind_;
+        } else {
+          result.kind_ = shortCodeBuilder_.build();
+        }
       }
-    }
-
-    private void buildPartialOneofs(com.google.type.PhoneNumber result) {
+      result.extension_ = extension_;
       result.kindCase_ = kindCase_;
-      result.kind_ = this.kind_;
-      if (kindCase_ == 2 && shortCodeBuilder_ != null) {
-        result.kind_ = shortCodeBuilder_.build();
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1668,7 +1612,6 @@ public Builder mergeFrom(com.google.type.PhoneNumber other) {
       if (other == com.google.type.PhoneNumber.getDefaultInstance()) return this;
       if (!other.getExtension().isEmpty()) {
         extension_ = other.extension_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       switch (other.getKindCase()) {
@@ -1731,7 +1674,7 @@ public Builder mergeFrom(
             case 26:
               {
                 extension_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -1765,8 +1708,6 @@ public Builder clearKind() {
       return this;
     }
 
-    private int bitField0_;
-
     /**
      *
      *
@@ -1777,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.
@@ -1807,11 +1746,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.
@@ -1850,11 +1787,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.
@@ -1893,11 +1828,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.
@@ -1929,11 +1862,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.
@@ -1963,11 +1894,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.
@@ -2001,7 +1930,6 @@ public Builder setE164NumberBytes(com.google.protobuf.ByteString value) {
      *
      * 
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * 

@@ -2020,7 +1948,6 @@ public boolean hasShortCode() {
      *
      * 
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * 

@@ -2049,7 +1976,6 @@ public com.google.type.PhoneNumber.ShortCode getShortCode() {
      *
      * 
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * 

@@ -2075,7 +2001,6 @@ public Builder setShortCode(com.google.type.PhoneNumber.ShortCode value) {
      *
      * 
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * 

@@ -2098,7 +2023,6 @@ public Builder setShortCode(com.google.type.PhoneNumber.ShortCode.Builder builde
      *
      * 
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * 

@@ -2133,7 +2057,6 @@ public Builder mergeShortCode(com.google.type.PhoneNumber.ShortCode value) {
      *
      * 
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * 

@@ -2162,7 +2085,6 @@ public Builder clearShortCode() {
      *
      * 
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * 

@@ -2178,7 +2100,6 @@ public com.google.type.PhoneNumber.ShortCode.Builder getShortCodeBuilder() {
      *
      * 
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * 

@@ -2202,7 +2123,6 @@ public com.google.type.PhoneNumber.ShortCodeOrBuilder getShortCodeOrBuilder() {
      *
      * 
      * A short code.
-     *
      * Reference(s):
      *  - https://en.wikipedia.org/wiki/Short_code
      * 

@@ -2228,6 +2148,7 @@ public com.google.type.PhoneNumber.ShortCodeOrBuilder getShortCodeOrBuilder() {
       }
       kindCase_ = 2;
       onChanged();
+      ;
       return shortCodeBuilder_;
     }
 
@@ -2241,7 +2162,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
@@ -2272,7 +2192,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
@@ -2303,7 +2222,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
@@ -2319,8 +2237,8 @@ public Builder setExtension(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       extension_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2333,7 +2251,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
@@ -2345,8 +2262,8 @@ public Builder setExtension(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearExtension() {
+
       extension_ = getDefaultInstance().getExtension();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -2359,7 +2276,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
@@ -2376,8 +2292,8 @@ public Builder setExtensionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       extension_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
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 107e18485b..4da2ffdbd3 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/phone_number.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public interface PhoneNumberOrBuilder
@@ -34,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.
@@ -61,11 +58,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.
@@ -88,11 +83,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.
@@ -110,7 +103,6 @@ public interface PhoneNumberOrBuilder
    *
    * 
    * A short code.
-   *
    * Reference(s):
    *  - https://en.wikipedia.org/wiki/Short_code
    * 

@@ -126,7 +118,6 @@ public interface PhoneNumberOrBuilder
    *
    * 
    * A short code.
-   *
    * Reference(s):
    *  - https://en.wikipedia.org/wiki/Short_code
    * 

@@ -142,7 +133,6 @@ public interface PhoneNumberOrBuilder
    *
    * 
    * A short code.
-   *
    * Reference(s):
    *  - https://en.wikipedia.org/wiki/Short_code
    * 

@@ -159,7 +149,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
@@ -180,7 +169,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
@@ -193,5 +181,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/PhoneNumberProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PhoneNumberProto.java
index 20f2a2a455..3bc8beb6c5 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PhoneNumberProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PhoneNumberProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/phone_number.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public final class PhoneNumberProto {
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 a8bfccd471..4edfe8ec39 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/postal_address.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
@@ -28,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
  * 

@@ -63,8 +59,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_ = "";
   }
 
@@ -74,6 +70,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;
   }
@@ -88,7 +89,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int REVISION_FIELD_NUMBER = 1;
-  private int revision_ = 0;
+  private int revision_;
 
   /**
    *
@@ -96,7 +97,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * 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.
    * 

    *
@@ -110,9 +110,7 @@ public int getRevision() {
   }
 
   public static final int REGION_CODE_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object regionCode_ = "";
+  private volatile java.lang.Object regionCode_;
 
   /**
    *
@@ -171,9 +169,7 @@ public com.google.protobuf.ByteString getRegionCodeBytes() {
   }
 
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object languageCode_ = "";
+  private volatile java.lang.Object languageCode_;
 
   /**
    *
@@ -186,10 +182,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".
    * 

    *
@@ -221,10 +215,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".
    * 

    *
@@ -246,9 +238,7 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() {
   }
 
   public static final int POSTAL_CODE_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object postalCode_ = "";
+  private volatile java.lang.Object postalCode_;
 
   /**
    *
@@ -305,9 +295,7 @@ public com.google.protobuf.ByteString getPostalCodeBytes() {
   }
 
   public static final int SORTING_CODE_FIELD_NUMBER = 5;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object sortingCode_ = "";
+  private volatile java.lang.Object sortingCode_;
 
   /**
    *
@@ -366,9 +354,7 @@ public com.google.protobuf.ByteString getSortingCodeBytes() {
   }
 
   public static final int ADMINISTRATIVE_AREA_FIELD_NUMBER = 6;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object administrativeArea_ = "";
+  private volatile java.lang.Object administrativeArea_;
 
   /**
    *
@@ -431,9 +417,7 @@ public com.google.protobuf.ByteString getAdministrativeAreaBytes() {
   }
 
   public static final int LOCALITY_FIELD_NUMBER = 7;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object locality_ = "";
+  private volatile java.lang.Object locality_;
 
   /**
    *
@@ -490,9 +474,7 @@ public com.google.protobuf.ByteString getLocalityBytes() {
   }
 
   public static final int SUBLOCALITY_FIELD_NUMBER = 8;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object sublocality_ = "";
+  private volatile java.lang.Object sublocality_;
 
   /**
    *
@@ -545,17 +527,13 @@ 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_;
 
   /**
    *
    *
    * 
    * 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
@@ -564,14 +542,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
@@ -591,7 +567,6 @@ public com.google.protobuf.ProtocolStringList getAddressLinesList() {
    *
    * 
    * 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
@@ -600,14 +575,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
@@ -627,7 +600,6 @@ public int getAddressLinesCount() {
    *
    * 
    * 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
@@ -636,14 +608,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
@@ -664,7 +634,6 @@ public java.lang.String getAddressLines(int index) {
    *
    * 
    * 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
@@ -673,14 +642,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
@@ -697,10 +664,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_;
 
   /**
    *
@@ -773,9 +737,7 @@ public com.google.protobuf.ByteString getRecipientsBytes(int index) {
   }
 
   public static final int ORGANIZATION_FIELD_NUMBER = 11;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object organization_ = "";
+  private volatile java.lang.Object organization_;
 
   /**
    *
@@ -1096,16 +1058,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
    * 

@@ -1140,18 +1099,28 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       revision_ = 0;
+
       regionCode_ = "";
+
       languageCode_ = "";
+
       postalCode_ = "";
+
       sortingCode_ = "";
+
       administrativeArea_ = "";
+
       locality_ = "";
+
       sublocality_ = "";
-      addressLines_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      recipients_ = com.google.protobuf.LazyStringArrayList.emptyList();
+
+      addressLines_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      recipients_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
       organization_ = "";
+
       return this;
     }
 
@@ -1178,52 +1147,30 @@ 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);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      int from_bitField0_ = bitField0_;
+      result.revision_ = revision_;
+      result.regionCode_ = regionCode_;
+      result.languageCode_ = languageCode_;
+      result.postalCode_ = postalCode_;
+      result.sortingCode_ = sortingCode_;
+      result.administrativeArea_ = administrativeArea_;
+      result.locality_ = locality_;
+      result.sublocality_ = sublocality_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        addressLines_ = addressLines_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      }
+      result.addressLines_ = addressLines_;
+      if (((bitField0_ & 0x00000002) != 0)) {
+        recipients_ = recipients_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
+      }
+      result.recipients_ = recipients_;
+      result.organization_ = organization_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.type.PostalAddress result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.revision_ = revision_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.regionCode_ = regionCode_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.languageCode_ = languageCode_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.postalCode_ = postalCode_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.sortingCode_ = sortingCode_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.administrativeArea_ = administrativeArea_;
-      }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.locality_ = locality_;
-      }
-      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();
@@ -1274,43 +1221,36 @@ public Builder mergeFrom(com.google.type.PostalAddress other) {
       }
       if (!other.getRegionCode().isEmpty()) {
         regionCode_ = other.regionCode_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getPostalCode().isEmpty()) {
         postalCode_ = other.postalCode_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (!other.getSortingCode().isEmpty()) {
         sortingCode_ = other.sortingCode_;
-        bitField0_ |= 0x00000010;
         onChanged();
       }
       if (!other.getAdministrativeArea().isEmpty()) {
         administrativeArea_ = other.administrativeArea_;
-        bitField0_ |= 0x00000020;
         onChanged();
       }
       if (!other.getLocality().isEmpty()) {
         locality_ = other.locality_;
-        bitField0_ |= 0x00000040;
         onChanged();
       }
       if (!other.getSublocality().isEmpty()) {
         sublocality_ = other.sublocality_;
-        bitField0_ |= 0x00000080;
         onChanged();
       }
       if (!other.addressLines_.isEmpty()) {
         if (addressLines_.isEmpty()) {
           addressLines_ = other.addressLines_;
-          bitField0_ |= 0x00000100;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureAddressLinesIsMutable();
           addressLines_.addAll(other.addressLines_);
@@ -1320,7 +1260,7 @@ public Builder mergeFrom(com.google.type.PostalAddress other) {
       if (!other.recipients_.isEmpty()) {
         if (recipients_.isEmpty()) {
           recipients_ = other.recipients_;
-          bitField0_ |= 0x00000200;
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureRecipientsIsMutable();
           recipients_.addAll(other.recipients_);
@@ -1329,7 +1269,6 @@ public Builder mergeFrom(com.google.type.PostalAddress other) {
       }
       if (!other.getOrganization().isEmpty()) {
         organization_ = other.organization_;
-        bitField0_ |= 0x00000400;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -1361,49 +1300,49 @@ public Builder mergeFrom(
             case 8:
               {
                 revision_ = input.readInt32();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 18:
               {
                 regionCode_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 languageCode_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 postalCode_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             case 42:
               {
                 sortingCode_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 42
             case 50:
               {
                 administrativeArea_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 50
             case 58:
               {
                 locality_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 58
             case 66:
               {
                 sublocality_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 66
             case 74:
@@ -1423,7 +1362,7 @@ public Builder mergeFrom(
             case 90:
               {
                 organization_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000400;
+
                 break;
               } // case 90
             default:
@@ -1453,7 +1392,6 @@ public Builder mergeFrom(
      * 
      * 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.
      * 

      *
@@ -1472,7 +1410,6 @@ public int getRevision() {
      * 
      * 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.
      * 

      *
@@ -1484,7 +1421,6 @@ public int getRevision() {
     public Builder setRevision(int value) {
 
       revision_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1495,7 +1431,6 @@ public Builder setRevision(int value) {
      * 
      * 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.
      * 

      *
@@ -1504,7 +1439,7 @@ public Builder setRevision(int value) {
      * @return This builder for chaining.
      */
     public Builder clearRevision() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       revision_ = 0;
       onChanged();
       return this;
@@ -1586,8 +1521,8 @@ public Builder setRegionCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       regionCode_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1608,8 +1543,8 @@ public Builder setRegionCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearRegionCode() {
+
       regionCode_ = getDefaultInstance().getRegionCode();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1635,8 +1570,8 @@ public Builder setRegionCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       regionCode_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1654,10 +1589,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".
      * 

      *
@@ -1688,10 +1621,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".
      * 

      *
@@ -1722,10 +1653,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".
      * 

      *
@@ -1738,8 +1667,8 @@ public Builder setLanguageCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       languageCode_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1755,10 +1684,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".
      * 

      *
@@ -1767,8 +1694,8 @@ public Builder setLanguageCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLanguageCode() {
+
       languageCode_ = getDefaultInstance().getLanguageCode();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1784,10 +1711,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".
      * 

      *
@@ -1801,8 +1726,8 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       languageCode_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1880,8 +1805,8 @@ public Builder setPostalCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       postalCode_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1901,8 +1826,8 @@ public Builder setPostalCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPostalCode() {
+
       postalCode_ = getDefaultInstance().getPostalCode();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1927,8 +1852,8 @@ public Builder setPostalCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       postalCode_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2009,8 +1934,8 @@ public Builder setSortingCode(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       sortingCode_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2031,8 +1956,8 @@ public Builder setSortingCode(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSortingCode() {
+
       sortingCode_ = getDefaultInstance().getSortingCode();
-      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -2058,8 +1983,8 @@ public Builder setSortingCodeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       sortingCode_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -2146,8 +2071,8 @@ public Builder setAdministrativeArea(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       administrativeArea_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2170,8 +2095,8 @@ public Builder setAdministrativeArea(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearAdministrativeArea() {
+
       administrativeArea_ = getDefaultInstance().getAdministrativeArea();
-      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -2199,8 +2124,8 @@ public Builder setAdministrativeAreaBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       administrativeArea_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2278,8 +2203,8 @@ public Builder setLocality(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       locality_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2299,8 +2224,8 @@ public Builder setLocality(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLocality() {
+
       locality_ = getDefaultInstance().getLocality();
-      bitField0_ = (bitField0_ & ~0x00000040);
       onChanged();
       return this;
     }
@@ -2325,8 +2250,8 @@ public Builder setLocalityBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       locality_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -2398,8 +2323,8 @@ public Builder setSublocality(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       sublocality_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2417,8 +2342,8 @@ public Builder setSublocality(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearSublocality() {
+
       sublocality_ = getDefaultInstance().getSublocality();
-      bitField0_ = (bitField0_ & ~0x00000080);
       onChanged();
       return this;
     }
@@ -2441,20 +2366,20 @@ public Builder setSublocalityBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       sublocality_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       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_ & 0x00000001) != 0)) {
         addressLines_ = new com.google.protobuf.LazyStringArrayList(addressLines_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000100;
     }
 
     /**
@@ -2462,7 +2387,6 @@ private void ensureAddressLinesIsMutable() {
      *
      * 
      * 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
@@ -2471,14 +2395,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
@@ -2490,8 +2412,7 @@ private void ensureAddressLinesIsMutable() {
      * @return A list containing the addressLines.
      */
     public com.google.protobuf.ProtocolStringList getAddressLinesList() {
-      addressLines_.makeImmutable();
-      return addressLines_;
+      return addressLines_.getUnmodifiableView();
     }
 
     /**
@@ -2499,7 +2420,6 @@ public com.google.protobuf.ProtocolStringList getAddressLinesList() {
      *
      * 
      * 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
@@ -2508,14 +2428,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
@@ -2535,7 +2453,6 @@ public int getAddressLinesCount() {
      *
      * 
      * 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
@@ -2544,14 +2461,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
@@ -2572,7 +2487,6 @@ public java.lang.String getAddressLines(int index) {
      *
      * 
      * 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
@@ -2581,14 +2495,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
@@ -2609,7 +2521,6 @@ public com.google.protobuf.ByteString getAddressLinesBytes(int index) {
      *
      * 
      * 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
@@ -2618,14 +2529,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
@@ -2644,7 +2553,6 @@ public Builder setAddressLines(int index, java.lang.String value) {
       }
       ensureAddressLinesIsMutable();
       addressLines_.set(index, value);
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -2654,7 +2562,6 @@ public Builder setAddressLines(int index, java.lang.String value) {
      *
      * 
      * 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
@@ -2663,14 +2570,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
@@ -2688,7 +2593,6 @@ public Builder addAddressLines(java.lang.String value) {
       }
       ensureAddressLinesIsMutable();
       addressLines_.add(value);
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -2698,7 +2602,6 @@ public Builder addAddressLines(java.lang.String value) {
      *
      * 
      * 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
@@ -2707,14 +2610,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
@@ -2729,7 +2630,6 @@ public Builder addAddressLines(java.lang.String value) {
     public Builder addAllAddressLines(java.lang.Iterable values) {
       ensureAddressLinesIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, addressLines_);
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -2739,7 +2639,6 @@ public Builder addAllAddressLines(java.lang.Iterable values) {
      *
      * 
      * 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
@@ -2748,14 +2647,12 @@ public Builder addAllAddressLines(java.lang.Iterable 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
@@ -2767,9 +2664,8 @@ public Builder addAllAddressLines(java.lang.Iterable values) {
      * @return This builder for chaining.
      */
     public Builder clearAddressLines() {
-      addressLines_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000100);
-      ;
+      addressLines_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -2779,7 +2675,6 @@ public Builder clearAddressLines() {
      *
      * 
      * 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
@@ -2788,14 +2683,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
@@ -2814,19 +2707,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_ & 0x00000002) != 0)) {
         recipients_ = new com.google.protobuf.LazyStringArrayList(recipients_);
+        bitField0_ |= 0x00000002;
       }
-      bitField0_ |= 0x00000200;
     }
 
     /**
@@ -2843,8 +2735,7 @@ private void ensureRecipientsIsMutable() {
      * @return A list containing the recipients.
      */
     public com.google.protobuf.ProtocolStringList getRecipientsList() {
-      recipients_.makeImmutable();
-      return recipients_;
+      return recipients_.getUnmodifiableView();
     }
 
     /**
@@ -2921,7 +2812,6 @@ public Builder setRecipients(int index, java.lang.String value) {
       }
       ensureRecipientsIsMutable();
       recipients_.set(index, value);
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -2946,7 +2836,6 @@ public Builder addRecipients(java.lang.String value) {
       }
       ensureRecipientsIsMutable();
       recipients_.add(value);
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -2968,7 +2857,6 @@ public Builder addRecipients(java.lang.String value) {
     public Builder addAllRecipients(java.lang.Iterable values) {
       ensureRecipientsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, recipients_);
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -2987,9 +2875,8 @@ public Builder addAllRecipients(java.lang.Iterable values) {
      * @return This builder for chaining.
      */
     public Builder clearRecipients() {
-      recipients_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000200);
-      ;
+      recipients_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -3015,7 +2902,6 @@ public Builder addRecipientsBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureRecipientsIsMutable();
       recipients_.add(value);
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -3084,8 +2970,8 @@ public Builder setOrganization(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       organization_ = value;
-      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -3102,8 +2988,8 @@ public Builder setOrganization(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearOrganization() {
+
       organization_ = getDefaultInstance().getOrganization();
-      bitField0_ = (bitField0_ & ~0x00000400);
       onChanged();
       return this;
     }
@@ -3125,8 +3011,8 @@ public Builder setOrganizationBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       organization_ = value;
-      bitField0_ |= 0x00000400;
       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 28a3029903..4fbb5fbdb9 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/postal_address.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public interface PostalAddressOrBuilder
@@ -30,7 +29,6 @@ public interface PostalAddressOrBuilder
    * 
    * 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.
    * 

    *
@@ -85,10 +83,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".
    * 

    *
@@ -109,10 +105,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".
    * 

    *
@@ -291,7 +285,6 @@ public interface PostalAddressOrBuilder
    *
    * 
    * 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
@@ -300,14 +293,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
@@ -325,7 +316,6 @@ public interface PostalAddressOrBuilder
    *
    * 
    * 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
@@ -334,14 +324,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
@@ -359,7 +347,6 @@ public interface PostalAddressOrBuilder
    *
    * 
    * 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
@@ -368,14 +355,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
@@ -394,7 +379,6 @@ public interface PostalAddressOrBuilder
    *
    * 
    * 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
@@ -403,14 +387,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/PostalAddressProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PostalAddressProto.java
index 5255b21014..9c9f587e80 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PostalAddressProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/PostalAddressProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/postal_address.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public final class PostalAddressProto {
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 3da03489f2..e0b9ee9980 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/quaternion.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
@@ -26,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
@@ -101,6 +88,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;
   }
@@ -114,7 +106,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int X_FIELD_NUMBER = 1;
-  private double x_ = 0D;
+  private double x_;
 
   /**
    *
@@ -133,7 +125,7 @@ public double getX() {
   }
 
   public static final int Y_FIELD_NUMBER = 2;
-  private double y_ = 0D;
+  private double y_;
 
   /**
    *
@@ -152,7 +144,7 @@ public double getY() {
   }
 
   public static final int Z_FIELD_NUMBER = 3;
-  private double z_ = 0D;
+  private double z_;
 
   /**
    *
@@ -171,7 +163,7 @@ public double getZ() {
   }
 
   public static final int W_FIELD_NUMBER = 4;
-  private double w_ = 0D;
+  private double w_;
 
   /**
    *
@@ -393,53 +385,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
@@ -476,11 +456,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       x_ = 0D;
+
       y_ = 0D;
+
       z_ = 0D;
+
       w_ = 0D;
+
       return this;
     }
 
@@ -506,29 +489,14 @@ public com.google.type.Quaternion build() {
     @java.lang.Override
     public com.google.type.Quaternion buildPartial() {
       com.google.type.Quaternion result = new com.google.type.Quaternion(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.x_ = x_;
+      result.y_ = y_;
+      result.z_ = z_;
+      result.w_ = w_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.type.Quaternion result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.x_ = x_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.y_ = y_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.z_ = z_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.w_ = w_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -615,25 +583,25 @@ public Builder mergeFrom(
             case 9:
               {
                 x_ = input.readDouble();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 9
             case 17:
               {
                 y_ = input.readDouble();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 17
             case 25:
               {
                 z_ = input.readDouble();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 25
             case 33:
               {
                 w_ = input.readDouble();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 33
             default:
@@ -653,8 +621,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private double x_;
 
     /**
@@ -688,7 +654,6 @@ public double getX() {
     public Builder setX(double value) {
 
       x_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -705,7 +670,7 @@ public Builder setX(double value) {
      * @return This builder for chaining.
      */
     public Builder clearX() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       x_ = 0D;
       onChanged();
       return this;
@@ -744,7 +709,6 @@ public double getY() {
     public Builder setY(double value) {
 
       y_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -761,7 +725,7 @@ public Builder setY(double value) {
      * @return This builder for chaining.
      */
     public Builder clearY() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       y_ = 0D;
       onChanged();
       return this;
@@ -800,7 +764,6 @@ public double getZ() {
     public Builder setZ(double value) {
 
       z_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -817,7 +780,7 @@ public Builder setZ(double value) {
      * @return This builder for chaining.
      */
     public Builder clearZ() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       z_ = 0D;
       onChanged();
       return this;
@@ -856,7 +819,6 @@ public double getW() {
     public Builder setW(double value) {
 
       w_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -873,7 +835,7 @@ public Builder setW(double value) {
      * @return This builder for chaining.
      */
     public Builder clearW() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       w_ = 0D;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/QuaternionOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/QuaternionOrBuilder.java
index 88008f2cd7..40bbe53ca7 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/QuaternionOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/QuaternionOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/quaternion.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public interface QuaternionOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/QuaternionProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/QuaternionProto.java
index d43e1f259b..1a24233de7 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/QuaternionProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/QuaternionProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/quaternion.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public final class QuaternionProto {
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 cee8a63ba3..40ca8a2c9e 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/timeofday.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
@@ -50,6 +49,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;
   }
@@ -63,7 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int HOURS_FIELD_NUMBER = 1;
-  private int hours_ = 0;
+  private int hours_;
 
   /**
    *
@@ -83,7 +87,7 @@ public int getHours() {
   }
 
   public static final int MINUTES_FIELD_NUMBER = 2;
-  private int minutes_ = 0;
+  private int minutes_;
 
   /**
    *
@@ -102,7 +106,7 @@ public int getMinutes() {
   }
 
   public static final int SECONDS_FIELD_NUMBER = 3;
-  private int seconds_ = 0;
+  private int seconds_;
 
   /**
    *
@@ -122,7 +126,7 @@ public int getSeconds() {
   }
 
   public static final int NANOS_FIELD_NUMBER = 4;
-  private int nanos_ = 0;
+  private int nanos_;
 
   /**
    *
@@ -363,11 +367,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       hours_ = 0;
+
       minutes_ = 0;
+
       seconds_ = 0;
+
       nanos_ = 0;
+
       return this;
     }
 
@@ -393,29 +400,14 @@ public com.google.type.TimeOfDay build() {
     @java.lang.Override
     public com.google.type.TimeOfDay buildPartial() {
       com.google.type.TimeOfDay result = new com.google.type.TimeOfDay(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.hours_ = hours_;
+      result.minutes_ = minutes_;
+      result.seconds_ = seconds_;
+      result.nanos_ = nanos_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.type.TimeOfDay result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.hours_ = hours_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.minutes_ = minutes_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.seconds_ = seconds_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.nanos_ = nanos_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -502,25 +494,25 @@ public Builder mergeFrom(
             case 8:
               {
                 hours_ = input.readInt32();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 16:
               {
                 minutes_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 24:
               {
                 seconds_ = input.readInt32();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 32:
               {
                 nanos_ = input.readInt32();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             default:
@@ -540,8 +532,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private int hours_;
 
     /**
@@ -577,7 +567,6 @@ public int getHours() {
     public Builder setHours(int value) {
 
       hours_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -595,7 +584,7 @@ public Builder setHours(int value) {
      * @return This builder for chaining.
      */
     public Builder clearHours() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       hours_ = 0;
       onChanged();
       return this;
@@ -634,7 +623,6 @@ public int getMinutes() {
     public Builder setMinutes(int value) {
 
       minutes_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -651,7 +639,7 @@ public Builder setMinutes(int value) {
      * @return This builder for chaining.
      */
     public Builder clearMinutes() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       minutes_ = 0;
       onChanged();
       return this;
@@ -692,7 +680,6 @@ public int getSeconds() {
     public Builder setSeconds(int value) {
 
       seconds_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -710,7 +697,7 @@ public Builder setSeconds(int value) {
      * @return This builder for chaining.
      */
     public Builder clearSeconds() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       seconds_ = 0;
       onChanged();
       return this;
@@ -749,7 +736,6 @@ public int getNanos() {
     public Builder setNanos(int value) {
 
       nanos_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -766,7 +752,7 @@ public Builder setNanos(int value) {
      * @return This builder for chaining.
      */
     public Builder clearNanos() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       nanos_ = 0;
       onChanged();
       return this;
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeOfDayOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeOfDayOrBuilder.java
index c0d985fc31..52bb31f646 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeOfDayOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeOfDayOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/timeofday.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public interface TimeOfDayOrBuilder
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeOfDayProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeOfDayProto.java
index a438d28683..74d510c571 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeOfDayProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeOfDayProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/timeofday.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public final class TimeOfDayProto {
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 4e882932fb..8ab2cb3144 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
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/datetime.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 /**
@@ -51,6 +50,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;
   }
@@ -64,9 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ID_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object id_ = "";
+  private volatile java.lang.Object id_;
 
   /**
    *
@@ -117,9 +119,7 @@ public com.google.protobuf.ByteString getIdBytes() {
   }
 
   public static final int VERSION_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object version_ = "";
+  private volatile java.lang.Object version_;
 
   /**
    *
@@ -372,9 +372,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       id_ = "";
+
       version_ = "";
+
       return this;
     }
 
@@ -400,23 +401,12 @@ public com.google.type.TimeZone build() {
     @java.lang.Override
     public com.google.type.TimeZone buildPartial() {
       com.google.type.TimeZone result = new com.google.type.TimeZone(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.id_ = id_;
+      result.version_ = version_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.type.TimeZone result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.id_ = id_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.version_ = version_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -464,12 +454,10 @@ public Builder mergeFrom(com.google.type.TimeZone other) {
       if (other == com.google.type.TimeZone.getDefaultInstance()) return this;
       if (!other.getId().isEmpty()) {
         id_ = other.id_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getVersion().isEmpty()) {
         version_ = other.version_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -501,13 +489,13 @@ public Builder mergeFrom(
             case 10:
               {
                 id_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 version_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -527,8 +515,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object id_ = "";
 
     /**
@@ -593,8 +579,8 @@ public Builder setId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       id_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -611,8 +597,8 @@ public Builder setId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearId() {
+
       id_ = getDefaultInstance().getId();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -634,8 +620,8 @@ public Builder setIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       id_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -704,8 +690,8 @@ public Builder setVersion(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       version_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -722,8 +708,8 @@ public Builder setVersion(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearVersion() {
+
       version_ = getDefaultInstance().getVersion();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -745,8 +731,8 @@ public Builder setVersionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       version_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeZoneOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeZoneOrBuilder.java
index bb7c41957a..c270d892b8 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeZoneOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/type/TimeZoneOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/type/datetime.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.type;
 
 public interface TimeZoneOrBuilder
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfig.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfig.java
index 820da7ffc5..613fb3e03e 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfig.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfig.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 /**
@@ -27,14 +26,11 @@
  * The configuration determines which permission types are logged, and what
  * identities, if any, are exempted from logging.
  * An AuditConfig must have one or more AuditLogConfigs.
- *
  * If there are AuditConfigs for both `allServices` and a specific service,
  * the union of the two AuditConfigs is used for that service: the log_types
  * specified in each AuditConfig are enabled, and the exempted_members in each
  * AuditLogConfig are exempted.
- *
  * Example Policy with multiple AuditConfigs:
- *
  *     {
  *       "audit_configs": [
  *         {
@@ -70,7 +66,6 @@
  *         }
  *       ]
  *     }
- *
  * For sampleservice, this policy enables DATA_READ, DATA_WRITE and ADMIN_READ
  * logging. It also exempts `jose@example.com` from DATA_READ logging, and
  * `aliya@example.com` from DATA_WRITE logging.
@@ -100,6 +95,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new AuditConfig();
   }
 
+  @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.iam.v1.PolicyProto.internal_static_google_iam_v1_AuditConfig_descriptor;
   }
@@ -114,9 +114,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SERVICE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object service_ = "";
+  private volatile java.lang.Object service_;
 
   /**
    *
@@ -171,8 +169,6 @@ public com.google.protobuf.ByteString getServiceBytes() {
   }
 
   public static final int AUDIT_LOG_CONFIGS_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
   private java.util.List auditLogConfigs_;
 
   /**
@@ -423,14 +419,11 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * The configuration determines which permission types are logged, and what
    * identities, if any, are exempted from logging.
    * An AuditConfig must have one or more AuditLogConfigs.
-   *
    * If there are AuditConfigs for both `allServices` and a specific service,
    * the union of the two AuditConfigs is used for that service: the log_types
    * specified in each AuditConfig are enabled, and the exempted_members in each
    * AuditLogConfig are exempted.
-   *
    * Example Policy with multiple AuditConfigs:
-   *
    *     {
    *       "audit_configs": [
    *         {
@@ -466,7 +459,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         }
    *       ]
    *     }
-   *
    * For sampleservice, this policy enables DATA_READ, DATA_WRITE and ADMIN_READ
    * logging. It also exempts `jose@example.com` from DATA_READ logging, and
    * `aliya@example.com` from DATA_WRITE logging.
@@ -501,15 +493,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       service_ = "";
+
       if (auditLogConfigsBuilder_ == null) {
         auditLogConfigs_ = java.util.Collections.emptyList();
       } else {
         auditLogConfigs_ = null;
         auditLogConfigsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -535,31 +527,19 @@ public com.google.iam.v1.AuditConfig build() {
     @java.lang.Override
     public com.google.iam.v1.AuditConfig buildPartial() {
       com.google.iam.v1.AuditConfig result = new com.google.iam.v1.AuditConfig(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.iam.v1.AuditConfig result) {
+      int from_bitField0_ = bitField0_;
+      result.service_ = service_;
       if (auditLogConfigsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           auditLogConfigs_ = java.util.Collections.unmodifiableList(auditLogConfigs_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.auditLogConfigs_ = auditLogConfigs_;
       } else {
         result.auditLogConfigs_ = auditLogConfigsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.iam.v1.AuditConfig result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.service_ = service_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -609,14 +589,13 @@ public Builder mergeFrom(com.google.iam.v1.AuditConfig other) {
       if (other == com.google.iam.v1.AuditConfig.getDefaultInstance()) return this;
       if (!other.getService().isEmpty()) {
         service_ = other.service_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (auditLogConfigsBuilder_ == null) {
         if (!other.auditLogConfigs_.isEmpty()) {
           if (auditLogConfigs_.isEmpty()) {
             auditLogConfigs_ = other.auditLogConfigs_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureAuditLogConfigsIsMutable();
             auditLogConfigs_.addAll(other.auditLogConfigs_);
@@ -629,7 +608,7 @@ public Builder mergeFrom(com.google.iam.v1.AuditConfig other) {
             auditLogConfigsBuilder_.dispose();
             auditLogConfigsBuilder_ = null;
             auditLogConfigs_ = other.auditLogConfigs_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             auditLogConfigsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getAuditLogConfigsFieldBuilder()
@@ -668,7 +647,7 @@ public Builder mergeFrom(
             case 10:
               {
                 service_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 26:
@@ -772,8 +751,8 @@ public Builder setService(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       service_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -792,8 +771,8 @@ public Builder setService(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearService() {
+
       service_ = getDefaultInstance().getService();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -817,8 +796,8 @@ public Builder setServiceBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       service_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -827,10 +806,10 @@ public Builder setServiceBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureAuditLogConfigsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         auditLogConfigs_ =
             new java.util.ArrayList(auditLogConfigs_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1055,7 +1034,7 @@ public Builder addAllAuditLogConfigs(
     public Builder clearAuditLogConfigs() {
       if (auditLogConfigsBuilder_ == null) {
         auditLogConfigs_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         auditLogConfigsBuilder_.clear();
@@ -1185,7 +1164,7 @@ public com.google.iam.v1.AuditLogConfig.Builder addAuditLogConfigsBuilder(int in
                 com.google.iam.v1.AuditLogConfig.Builder,
                 com.google.iam.v1.AuditLogConfigOrBuilder>(
                 auditLogConfigs_,
-                ((bitField0_ & 0x00000002) != 0),
+                ((bitField0_ & 0x00000001) != 0),
                 getParentForChildren(),
                 isClean());
         auditLogConfigs_ = null;
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDelta.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDelta.java
index 3b904d6add..8c5321ae89 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDelta.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDelta.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 /**
@@ -53,6 +52,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new AuditConfigDelta();
   }
 
+  @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.iam.v1.PolicyProto.internal_static_google_iam_v1_AuditConfigDelta_descriptor;
   }
@@ -227,7 +231,7 @@ private Action(int value) {
   }
 
   public static final int ACTION_FIELD_NUMBER = 1;
-  private int action_ = 0;
+  private int action_;
 
   /**
    *
@@ -260,15 +264,14 @@ public int getActionValue() {
    */
   @java.lang.Override
   public com.google.iam.v1.AuditConfigDelta.Action getAction() {
+    @SuppressWarnings("deprecation")
     com.google.iam.v1.AuditConfigDelta.Action result =
-        com.google.iam.v1.AuditConfigDelta.Action.forNumber(action_);
+        com.google.iam.v1.AuditConfigDelta.Action.valueOf(action_);
     return result == null ? com.google.iam.v1.AuditConfigDelta.Action.UNRECOGNIZED : result;
   }
 
   public static final int SERVICE_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object service_ = "";
+  private volatile java.lang.Object service_;
 
   /**
    *
@@ -325,9 +328,7 @@ public com.google.protobuf.ByteString getServiceBytes() {
   }
 
   public static final int EXEMPTED_MEMBER_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object exemptedMember_ = "";
+  private volatile java.lang.Object exemptedMember_;
 
   /**
    *
@@ -382,9 +383,7 @@ public com.google.protobuf.ByteString getExemptedMemberBytes() {
   }
 
   public static final int LOG_TYPE_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object logType_ = "";
+  private volatile java.lang.Object logType_;
 
   /**
    *
@@ -662,11 +661,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       action_ = 0;
+
       service_ = "";
+
       exemptedMember_ = "";
+
       logType_ = "";
+
       return this;
     }
 
@@ -693,29 +695,14 @@ public com.google.iam.v1.AuditConfigDelta build() {
     @java.lang.Override
     public com.google.iam.v1.AuditConfigDelta buildPartial() {
       com.google.iam.v1.AuditConfigDelta result = new com.google.iam.v1.AuditConfigDelta(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.action_ = action_;
+      result.service_ = service_;
+      result.exemptedMember_ = exemptedMember_;
+      result.logType_ = logType_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v1.AuditConfigDelta result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.action_ = action_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.service_ = service_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.exemptedMember_ = exemptedMember_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.logType_ = logType_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -766,17 +753,14 @@ public Builder mergeFrom(com.google.iam.v1.AuditConfigDelta other) {
       }
       if (!other.getService().isEmpty()) {
         service_ = other.service_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getExemptedMember().isEmpty()) {
         exemptedMember_ = other.exemptedMember_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getLogType().isEmpty()) {
         logType_ = other.logType_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -808,25 +792,25 @@ public Builder mergeFrom(
             case 8:
               {
                 action_ = input.readEnum();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 18:
               {
                 service_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 exemptedMember_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 logType_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             default:
@@ -846,8 +830,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private int action_ = 0;
 
     /**
@@ -881,8 +863,8 @@ public int getActionValue() {
      * @return This builder for chaining.
      */
     public Builder setActionValue(int value) {
+
       action_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -901,8 +883,9 @@ public Builder setActionValue(int value) {
      */
     @java.lang.Override
     public com.google.iam.v1.AuditConfigDelta.Action getAction() {
+      @SuppressWarnings("deprecation")
       com.google.iam.v1.AuditConfigDelta.Action result =
-          com.google.iam.v1.AuditConfigDelta.Action.forNumber(action_);
+          com.google.iam.v1.AuditConfigDelta.Action.valueOf(action_);
       return result == null ? com.google.iam.v1.AuditConfigDelta.Action.UNRECOGNIZED : result;
     }
 
@@ -923,7 +906,7 @@ public Builder setAction(com.google.iam.v1.AuditConfigDelta.Action value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000001;
+
       action_ = value.getNumber();
       onChanged();
       return this;
@@ -942,7 +925,7 @@ public Builder setAction(com.google.iam.v1.AuditConfigDelta.Action value) {
      * @return This builder for chaining.
      */
     public Builder clearAction() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       action_ = 0;
       onChanged();
       return this;
@@ -1021,8 +1004,8 @@ public Builder setService(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       service_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1042,8 +1025,8 @@ public Builder setService(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearService() {
+
       service_ = getDefaultInstance().getService();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1068,8 +1051,8 @@ public Builder setServiceBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       service_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1144,8 +1127,8 @@ public Builder setExemptedMember(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       exemptedMember_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1164,8 +1147,8 @@ public Builder setExemptedMember(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearExemptedMember() {
+
       exemptedMember_ = getDefaultInstance().getExemptedMember();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1189,8 +1172,8 @@ public Builder setExemptedMemberBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       exemptedMember_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1265,8 +1248,8 @@ public Builder setLogType(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       logType_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1285,8 +1268,8 @@ public Builder setLogType(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearLogType() {
+
       logType_ = getDefaultInstance().getLogType();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1310,8 +1293,8 @@ public Builder setLogTypeBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       logType_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDeltaOrBuilder.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDeltaOrBuilder.java
index 7ac842e91b..f3ed9d1704 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDeltaOrBuilder.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDeltaOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 public interface AuditConfigDeltaOrBuilder
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigOrBuilder.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigOrBuilder.java
index ce5b066dda..6312184c9f 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigOrBuilder.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 public interface AuditConfigOrBuilder
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfig.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfig.java
index b7f588f489..295ed3300d 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfig.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfig.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 /**
@@ -25,7 +24,6 @@
  * 
  * Provides the configuration for logging a type of permissions.
  * Example:
- *
  *     {
  *       "audit_log_configs": [
  *         {
@@ -39,7 +37,6 @@
  *         }
  *       ]
  *     }
- *
  * This enables 'DATA_READ' and 'DATA_WRITE' logging, while exempting
  * jose@example.com from DATA_READ logging.
  * 

@@ -59,7 +56,7 @@ private AuditLogConfig(com.google.protobuf.GeneratedMessageV3.Builder builder
 
   private AuditLogConfig() {
     logType_ = 0;
-    exemptedMembers_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    exemptedMembers_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
   @java.lang.Override
@@ -68,6 +65,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new AuditLogConfig();
   }
 
+  @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.iam.v1.PolicyProto.internal_static_google_iam_v1_AuditLogConfig_descriptor;
   }
@@ -265,7 +267,7 @@ private LogType(int value) {
   }
 
   public static final int LOG_TYPE_FIELD_NUMBER = 1;
-  private int logType_ = 0;
+  private int logType_;
 
   /**
    *
@@ -296,16 +298,14 @@ public int getLogTypeValue() {
    */
   @java.lang.Override
   public com.google.iam.v1.AuditLogConfig.LogType getLogType() {
+    @SuppressWarnings("deprecation")
     com.google.iam.v1.AuditLogConfig.LogType result =
-        com.google.iam.v1.AuditLogConfig.LogType.forNumber(logType_);
+        com.google.iam.v1.AuditLogConfig.LogType.valueOf(logType_);
     return result == null ? com.google.iam.v1.AuditLogConfig.LogType.UNRECOGNIZED : result;
   }
 
   public static final int EXEMPTED_MEMBERS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList exemptedMembers_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList exemptedMembers_;
 
   /**
    *
@@ -561,7 +561,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * 
    * Provides the configuration for logging a type of permissions.
    * Example:
-   *
    *     {
    *       "audit_log_configs": [
    *         {
@@ -575,7 +574,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *         }
    *       ]
    *     }
-   *
    * This enables 'DATA_READ' and 'DATA_WRITE' logging, while exempting
    * jose@example.com from DATA_READ logging.
    * 

@@ -610,9 +608,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       logType_ = 0;
-      exemptedMembers_ = com.google.protobuf.LazyStringArrayList.emptyList();
+
+      exemptedMembers_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -638,24 +637,17 @@ public com.google.iam.v1.AuditLogConfig build() {
     @java.lang.Override
     public com.google.iam.v1.AuditLogConfig buildPartial() {
       com.google.iam.v1.AuditLogConfig result = new com.google.iam.v1.AuditLogConfig(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      result.logType_ = logType_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        exemptedMembers_ = exemptedMembers_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
+      result.exemptedMembers_ = exemptedMembers_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v1.AuditLogConfig result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.logType_ = logType_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        exemptedMembers_.makeImmutable();
-        result.exemptedMembers_ = exemptedMembers_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -707,7 +699,7 @@ public Builder mergeFrom(com.google.iam.v1.AuditLogConfig other) {
       if (!other.exemptedMembers_.isEmpty()) {
         if (exemptedMembers_.isEmpty()) {
           exemptedMembers_ = other.exemptedMembers_;
-          bitField0_ |= 0x00000002;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureExemptedMembersIsMutable();
           exemptedMembers_.addAll(other.exemptedMembers_);
@@ -743,7 +735,7 @@ public Builder mergeFrom(
             case 8:
               {
                 logType_ = input.readEnum();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 18:
@@ -803,8 +795,8 @@ public int getLogTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setLogTypeValue(int value) {
+
       logType_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -822,8 +814,9 @@ public Builder setLogTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.iam.v1.AuditLogConfig.LogType getLogType() {
+      @SuppressWarnings("deprecation")
       com.google.iam.v1.AuditLogConfig.LogType result =
-          com.google.iam.v1.AuditLogConfig.LogType.forNumber(logType_);
+          com.google.iam.v1.AuditLogConfig.LogType.valueOf(logType_);
       return result == null ? com.google.iam.v1.AuditLogConfig.LogType.UNRECOGNIZED : result;
     }
 
@@ -843,7 +836,7 @@ public Builder setLogType(com.google.iam.v1.AuditLogConfig.LogType value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000001;
+
       logType_ = value.getNumber();
       onChanged();
       return this;
@@ -861,20 +854,20 @@ public Builder setLogType(com.google.iam.v1.AuditLogConfig.LogType value) {
      * @return This builder for chaining.
      */
     public Builder clearLogType() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       logType_ = 0;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList exemptedMembers_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList exemptedMembers_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureExemptedMembersIsMutable() {
-      if (!exemptedMembers_.isModifiable()) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         exemptedMembers_ = new com.google.protobuf.LazyStringArrayList(exemptedMembers_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000002;
     }
 
     /**
@@ -892,8 +885,7 @@ private void ensureExemptedMembersIsMutable() {
      * @return A list containing the exemptedMembers.
      */
     public com.google.protobuf.ProtocolStringList getExemptedMembersList() {
-      exemptedMembers_.makeImmutable();
-      return exemptedMembers_;
+      return exemptedMembers_.getUnmodifiableView();
     }
 
     /**
@@ -974,7 +966,6 @@ public Builder setExemptedMembers(int index, java.lang.String value) {
       }
       ensureExemptedMembersIsMutable();
       exemptedMembers_.set(index, value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1000,7 +991,6 @@ public Builder addExemptedMembers(java.lang.String value) {
       }
       ensureExemptedMembersIsMutable();
       exemptedMembers_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1023,7 +1013,6 @@ public Builder addExemptedMembers(java.lang.String value) {
     public Builder addAllExemptedMembers(java.lang.Iterable values) {
       ensureExemptedMembersIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, exemptedMembers_);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1043,9 +1032,8 @@ public Builder addAllExemptedMembers(java.lang.Iterable values
      * @return This builder for chaining.
      */
     public Builder clearExemptedMembers() {
-      exemptedMembers_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000002);
-      ;
+      exemptedMembers_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1072,7 +1060,6 @@ public Builder addExemptedMembersBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureExemptedMembersIsMutable();
       exemptedMembers_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfigOrBuilder.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfigOrBuilder.java
index 8ed63bc79e..ce62ea6463 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfigOrBuilder.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfigOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 public interface AuditLogConfigOrBuilder
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Binding.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Binding.java
index fbbb320c1a..5c95b47dc3 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Binding.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Binding.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 /**
@@ -41,7 +40,7 @@ private Binding(com.google.protobuf.GeneratedMessageV3.Builder builder) {
 
   private Binding() {
     role_ = "";
-    members_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    members_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
   @java.lang.Override
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Binding();
   }
 
+  @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.iam.v1.PolicyProto.internal_static_google_iam_v1_Binding_descriptor;
   }
@@ -62,11 +66,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v1.Binding.class, com.google.iam.v1.Binding.Builder.class);
   }
 
-  private int bitField0_;
   public static final int ROLE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object role_ = "";
+  private volatile java.lang.Object role_;
 
   /**
    *
@@ -119,10 +120,7 @@ public com.google.protobuf.ByteString getRoleBytes() {
   }
 
   public static final int MEMBERS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList members_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList members_;
 
   /**
    *
@@ -130,29 +128,21 @@ public com.google.protobuf.ByteString getRoleBytes() {
    * 
    * Specifies the principals requesting access for a Google Cloud resource.
    * `members` can have the following values:
-   *
    * * `allUsers`: A special identifier that represents anyone who is
    *    on the internet; with or without a Google account.
-   *
    * * `allAuthenticatedUsers`: A special identifier that represents anyone
    *    who is authenticated with a Google account or a service account.
-   *
    * * `user:{emailid}`: An email address that represents a specific Google
    *    account. For example, `alice@example.com` .
-   *
-   *
    * * `serviceAccount:{emailid}`: An email address that represents a service
    *    account. For example, `my-other-app@appspot.gserviceaccount.com`.
-   *
    * * `group:{emailid}`: An email address that represents a Google group.
    *    For example, `admins@example.com`.
-   *
    * * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique
    *    identifier) representing a user that has been recently deleted. For
    *    example, `alice@example.com?uid=123456789012345678901`. If the user is
    *    recovered, this value reverts to `user:{emailid}` and the recovered user
    *    retains the role in the binding.
-   *
    * * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus
    *    unique identifier) representing a service account that has been recently
    *    deleted. For example,
@@ -160,14 +150,11 @@ public com.google.protobuf.ByteString getRoleBytes() {
    *    If the service account is undeleted, this value reverts to
    *    `serviceAccount:{emailid}` and the undeleted service account retains the
    *    role in the binding.
-   *
    * * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique
    *    identifier) representing a Google group that has been recently
    *    deleted. For example, `admins@example.com?uid=123456789012345678901`. If
    *    the group is recovered, this value reverts to `group:{emailid}` and the
    *    recovered group retains the role in the binding.
-   *
-   *
    * * `domain:{domain}`: The G Suite domain (primary) that represents all the
    *    users of that domain. For example, `google.com` or `example.com`.
    * 

@@ -186,29 +173,21 @@ public com.google.protobuf.ProtocolStringList getMembersList() {
    * 
    * Specifies the principals requesting access for a Google Cloud resource.
    * `members` can have the following values:
-   *
    * * `allUsers`: A special identifier that represents anyone who is
    *    on the internet; with or without a Google account.
-   *
    * * `allAuthenticatedUsers`: A special identifier that represents anyone
    *    who is authenticated with a Google account or a service account.
-   *
    * * `user:{emailid}`: An email address that represents a specific Google
    *    account. For example, `alice@example.com` .
-   *
-   *
    * * `serviceAccount:{emailid}`: An email address that represents a service
    *    account. For example, `my-other-app@appspot.gserviceaccount.com`.
-   *
    * * `group:{emailid}`: An email address that represents a Google group.
    *    For example, `admins@example.com`.
-   *
    * * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique
    *    identifier) representing a user that has been recently deleted. For
    *    example, `alice@example.com?uid=123456789012345678901`. If the user is
    *    recovered, this value reverts to `user:{emailid}` and the recovered user
    *    retains the role in the binding.
-   *
    * * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus
    *    unique identifier) representing a service account that has been recently
    *    deleted. For example,
@@ -216,14 +195,11 @@ public com.google.protobuf.ProtocolStringList getMembersList() {
    *    If the service account is undeleted, this value reverts to
    *    `serviceAccount:{emailid}` and the undeleted service account retains the
    *    role in the binding.
-   *
    * * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique
    *    identifier) representing a Google group that has been recently
    *    deleted. For example, `admins@example.com?uid=123456789012345678901`. If
    *    the group is recovered, this value reverts to `group:{emailid}` and the
    *    recovered group retains the role in the binding.
-   *
-   *
    * * `domain:{domain}`: The G Suite domain (primary) that represents all the
    *    users of that domain. For example, `google.com` or `example.com`.
    * 

@@ -242,29 +218,21 @@ public int getMembersCount() {
    * 
    * Specifies the principals requesting access for a Google Cloud resource.
    * `members` can have the following values:
-   *
    * * `allUsers`: A special identifier that represents anyone who is
    *    on the internet; with or without a Google account.
-   *
    * * `allAuthenticatedUsers`: A special identifier that represents anyone
    *    who is authenticated with a Google account or a service account.
-   *
    * * `user:{emailid}`: An email address that represents a specific Google
    *    account. For example, `alice@example.com` .
-   *
-   *
    * * `serviceAccount:{emailid}`: An email address that represents a service
    *    account. For example, `my-other-app@appspot.gserviceaccount.com`.
-   *
    * * `group:{emailid}`: An email address that represents a Google group.
    *    For example, `admins@example.com`.
-   *
    * * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique
    *    identifier) representing a user that has been recently deleted. For
    *    example, `alice@example.com?uid=123456789012345678901`. If the user is
    *    recovered, this value reverts to `user:{emailid}` and the recovered user
    *    retains the role in the binding.
-   *
    * * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus
    *    unique identifier) representing a service account that has been recently
    *    deleted. For example,
@@ -272,14 +240,11 @@ public int getMembersCount() {
    *    If the service account is undeleted, this value reverts to
    *    `serviceAccount:{emailid}` and the undeleted service account retains the
    *    role in the binding.
-   *
    * * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique
    *    identifier) representing a Google group that has been recently
    *    deleted. For example, `admins@example.com?uid=123456789012345678901`. If
    *    the group is recovered, this value reverts to `group:{emailid}` and the
    *    recovered group retains the role in the binding.
-   *
-   *
    * * `domain:{domain}`: The G Suite domain (primary) that represents all the
    *    users of that domain. For example, `google.com` or `example.com`.
    * 

@@ -299,29 +264,21 @@ public java.lang.String getMembers(int index) {
    * 
    * Specifies the principals requesting access for a Google Cloud resource.
    * `members` can have the following values:
-   *
    * * `allUsers`: A special identifier that represents anyone who is
    *    on the internet; with or without a Google account.
-   *
    * * `allAuthenticatedUsers`: A special identifier that represents anyone
    *    who is authenticated with a Google account or a service account.
-   *
    * * `user:{emailid}`: An email address that represents a specific Google
    *    account. For example, `alice@example.com` .
-   *
-   *
    * * `serviceAccount:{emailid}`: An email address that represents a service
    *    account. For example, `my-other-app@appspot.gserviceaccount.com`.
-   *
    * * `group:{emailid}`: An email address that represents a Google group.
    *    For example, `admins@example.com`.
-   *
    * * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique
    *    identifier) representing a user that has been recently deleted. For
    *    example, `alice@example.com?uid=123456789012345678901`. If the user is
    *    recovered, this value reverts to `user:{emailid}` and the recovered user
    *    retains the role in the binding.
-   *
    * * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus
    *    unique identifier) representing a service account that has been recently
    *    deleted. For example,
@@ -329,14 +286,11 @@ public java.lang.String getMembers(int index) {
    *    If the service account is undeleted, this value reverts to
    *    `serviceAccount:{emailid}` and the undeleted service account retains the
    *    role in the binding.
-   *
    * * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique
    *    identifier) representing a Google group that has been recently
    *    deleted. For example, `admins@example.com?uid=123456789012345678901`. If
    *    the group is recovered, this value reverts to `group:{emailid}` and the
    *    recovered group retains the role in the binding.
-   *
-   *
    * * `domain:{domain}`: The G Suite domain (primary) that represents all the
    *    users of that domain. For example, `google.com` or `example.com`.
    * 

@@ -358,14 +312,11 @@ public com.google.protobuf.ByteString getMembersBytes(int index) {
    *
    * 
    * The condition that is associated with this binding.
-   *
    * If the condition evaluates to `true`, then this binding applies to the
    * current request.
-   *
    * If the condition evaluates to `false`, then this binding does not apply to
    * the current request. However, a different role binding might grant the same
    * role to one or more of the principals in this binding.
-   *
    * To learn which resources support conditions in their IAM policies, see the
    * [IAM
    * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -377,7 +328,7 @@ public com.google.protobuf.ByteString getMembersBytes(int index) {
    */
   @java.lang.Override
   public boolean hasCondition() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return condition_ != null;
   }
 
   /**
@@ -385,14 +336,11 @@ public boolean hasCondition() {
    *
    * 
    * The condition that is associated with this binding.
-   *
    * If the condition evaluates to `true`, then this binding applies to the
    * current request.
-   *
    * If the condition evaluates to `false`, then this binding does not apply to
    * the current request. However, a different role binding might grant the same
    * role to one or more of the principals in this binding.
-   *
    * To learn which resources support conditions in their IAM policies, see the
    * [IAM
    * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -412,14 +360,11 @@ public com.google.type.Expr getCondition() {
    *
    * 
    * The condition that is associated with this binding.
-   *
    * If the condition evaluates to `true`, then this binding applies to the
    * current request.
-   *
    * If the condition evaluates to `false`, then this binding does not apply to
    * the current request. However, a different role binding might grant the same
    * role to one or more of the principals in this binding.
-   *
    * To learn which resources support conditions in their IAM policies, see the
    * [IAM
    * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -429,7 +374,7 @@ public com.google.type.Expr getCondition() {
    */
   @java.lang.Override
   public com.google.type.ExprOrBuilder getConditionOrBuilder() {
-    return condition_ == null ? com.google.type.Expr.getDefaultInstance() : condition_;
+    return getCondition();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -452,7 +397,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < members_.size(); i++) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, members_.getRaw(i));
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (condition_ != null) {
       output.writeMessage(3, getCondition());
     }
     getUnknownFields().writeTo(output);
@@ -475,7 +420,7 @@ public int getSerializedSize() {
       size += dataSize;
       size += 1 * getMembersList().size();
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (condition_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getCondition());
     }
     size += getUnknownFields().getSerializedSize();
@@ -646,30 +591,23 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.Binding.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getConditionFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       role_ = "";
-      members_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      condition_ = null;
-      if (conditionBuilder_ != null) {
-        conditionBuilder_.dispose();
+
+      members_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      if (conditionBuilder_ == null) {
+        condition_ = null;
+      } else {
+        condition_ = null;
         conditionBuilder_ = null;
       }
       return this;
@@ -697,28 +635,20 @@ public com.google.iam.v1.Binding build() {
     @java.lang.Override
     public com.google.iam.v1.Binding buildPartial() {
       com.google.iam.v1.Binding result = new com.google.iam.v1.Binding(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.iam.v1.Binding result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.role_ = role_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        members_.makeImmutable();
-        result.members_ = members_;
+      result.role_ = role_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        members_ = members_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.condition_ = conditionBuilder_ == null ? condition_ : conditionBuilder_.build();
-        to_bitField0_ |= 0x00000001;
+      result.members_ = members_;
+      if (conditionBuilder_ == null) {
+        result.condition_ = condition_;
+      } else {
+        result.condition_ = conditionBuilder_.build();
       }
-      result.bitField0_ |= to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -768,13 +698,12 @@ public Builder mergeFrom(com.google.iam.v1.Binding other) {
       if (other == com.google.iam.v1.Binding.getDefaultInstance()) return this;
       if (!other.getRole().isEmpty()) {
         role_ = other.role_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.members_.isEmpty()) {
         if (members_.isEmpty()) {
           members_ = other.members_;
-          bitField0_ |= 0x00000002;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureMembersIsMutable();
           members_.addAll(other.members_);
@@ -813,7 +742,7 @@ public Builder mergeFrom(
             case 10:
               {
                 role_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -826,7 +755,7 @@ public Builder mergeFrom(
             case 26:
               {
                 input.readMessage(getConditionFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -915,8 +844,8 @@ public Builder setRole(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       role_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -934,8 +863,8 @@ public Builder setRole(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearRole() {
+
       role_ = getDefaultInstance().getRole();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -958,20 +887,20 @@ public Builder setRoleBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       role_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList members_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList members_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureMembersIsMutable() {
-      if (!members_.isModifiable()) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         members_ = new com.google.protobuf.LazyStringArrayList(members_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000002;
     }
 
     /**
@@ -980,29 +909,21 @@ private void ensureMembersIsMutable() {
      * 
      * Specifies the principals requesting access for a Google Cloud resource.
      * `members` can have the following values:
-     *
      * * `allUsers`: A special identifier that represents anyone who is
      *    on the internet; with or without a Google account.
-     *
      * * `allAuthenticatedUsers`: A special identifier that represents anyone
      *    who is authenticated with a Google account or a service account.
-     *
      * * `user:{emailid}`: An email address that represents a specific Google
      *    account. For example, `alice@example.com` .
-     *
-     *
      * * `serviceAccount:{emailid}`: An email address that represents a service
      *    account. For example, `my-other-app@appspot.gserviceaccount.com`.
-     *
      * * `group:{emailid}`: An email address that represents a Google group.
      *    For example, `admins@example.com`.
-     *
      * * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a user that has been recently deleted. For
      *    example, `alice@example.com?uid=123456789012345678901`. If the user is
      *    recovered, this value reverts to `user:{emailid}` and the recovered user
      *    retains the role in the binding.
-     *
      * * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus
      *    unique identifier) representing a service account that has been recently
      *    deleted. For example,
@@ -1010,14 +931,11 @@ private void ensureMembersIsMutable() {
      *    If the service account is undeleted, this value reverts to
      *    `serviceAccount:{emailid}` and the undeleted service account retains the
      *    role in the binding.
-     *
      * * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a Google group that has been recently
      *    deleted. For example, `admins@example.com?uid=123456789012345678901`. If
      *    the group is recovered, this value reverts to `group:{emailid}` and the
      *    recovered group retains the role in the binding.
-     *
-     *
      * * `domain:{domain}`: The G Suite domain (primary) that represents all the
      *    users of that domain. For example, `google.com` or `example.com`.
      * 

@@ -1027,8 +945,7 @@ private void ensureMembersIsMutable() {
      * @return A list containing the members.
      */
     public com.google.protobuf.ProtocolStringList getMembersList() {
-      members_.makeImmutable();
-      return members_;
+      return members_.getUnmodifiableView();
     }
 
     /**
@@ -1037,29 +954,21 @@ public com.google.protobuf.ProtocolStringList getMembersList() {
      * 
      * Specifies the principals requesting access for a Google Cloud resource.
      * `members` can have the following values:
-     *
      * * `allUsers`: A special identifier that represents anyone who is
      *    on the internet; with or without a Google account.
-     *
      * * `allAuthenticatedUsers`: A special identifier that represents anyone
      *    who is authenticated with a Google account or a service account.
-     *
      * * `user:{emailid}`: An email address that represents a specific Google
      *    account. For example, `alice@example.com` .
-     *
-     *
      * * `serviceAccount:{emailid}`: An email address that represents a service
      *    account. For example, `my-other-app@appspot.gserviceaccount.com`.
-     *
      * * `group:{emailid}`: An email address that represents a Google group.
      *    For example, `admins@example.com`.
-     *
      * * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a user that has been recently deleted. For
      *    example, `alice@example.com?uid=123456789012345678901`. If the user is
      *    recovered, this value reverts to `user:{emailid}` and the recovered user
      *    retains the role in the binding.
-     *
      * * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus
      *    unique identifier) representing a service account that has been recently
      *    deleted. For example,
@@ -1067,14 +976,11 @@ public com.google.protobuf.ProtocolStringList getMembersList() {
      *    If the service account is undeleted, this value reverts to
      *    `serviceAccount:{emailid}` and the undeleted service account retains the
      *    role in the binding.
-     *
      * * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a Google group that has been recently
      *    deleted. For example, `admins@example.com?uid=123456789012345678901`. If
      *    the group is recovered, this value reverts to `group:{emailid}` and the
      *    recovered group retains the role in the binding.
-     *
-     *
      * * `domain:{domain}`: The G Suite domain (primary) that represents all the
      *    users of that domain. For example, `google.com` or `example.com`.
      * 

@@ -1093,29 +999,21 @@ public int getMembersCount() {
      * 
      * Specifies the principals requesting access for a Google Cloud resource.
      * `members` can have the following values:
-     *
      * * `allUsers`: A special identifier that represents anyone who is
      *    on the internet; with or without a Google account.
-     *
      * * `allAuthenticatedUsers`: A special identifier that represents anyone
      *    who is authenticated with a Google account or a service account.
-     *
      * * `user:{emailid}`: An email address that represents a specific Google
      *    account. For example, `alice@example.com` .
-     *
-     *
      * * `serviceAccount:{emailid}`: An email address that represents a service
      *    account. For example, `my-other-app@appspot.gserviceaccount.com`.
-     *
      * * `group:{emailid}`: An email address that represents a Google group.
      *    For example, `admins@example.com`.
-     *
      * * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a user that has been recently deleted. For
      *    example, `alice@example.com?uid=123456789012345678901`. If the user is
      *    recovered, this value reverts to `user:{emailid}` and the recovered user
      *    retains the role in the binding.
-     *
      * * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus
      *    unique identifier) representing a service account that has been recently
      *    deleted. For example,
@@ -1123,14 +1021,11 @@ public int getMembersCount() {
      *    If the service account is undeleted, this value reverts to
      *    `serviceAccount:{emailid}` and the undeleted service account retains the
      *    role in the binding.
-     *
      * * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a Google group that has been recently
      *    deleted. For example, `admins@example.com?uid=123456789012345678901`. If
      *    the group is recovered, this value reverts to `group:{emailid}` and the
      *    recovered group retains the role in the binding.
-     *
-     *
      * * `domain:{domain}`: The G Suite domain (primary) that represents all the
      *    users of that domain. For example, `google.com` or `example.com`.
      * 

@@ -1150,29 +1045,21 @@ public java.lang.String getMembers(int index) {
      * 
      * Specifies the principals requesting access for a Google Cloud resource.
      * `members` can have the following values:
-     *
      * * `allUsers`: A special identifier that represents anyone who is
      *    on the internet; with or without a Google account.
-     *
      * * `allAuthenticatedUsers`: A special identifier that represents anyone
      *    who is authenticated with a Google account or a service account.
-     *
      * * `user:{emailid}`: An email address that represents a specific Google
      *    account. For example, `alice@example.com` .
-     *
-     *
      * * `serviceAccount:{emailid}`: An email address that represents a service
      *    account. For example, `my-other-app@appspot.gserviceaccount.com`.
-     *
      * * `group:{emailid}`: An email address that represents a Google group.
      *    For example, `admins@example.com`.
-     *
      * * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a user that has been recently deleted. For
      *    example, `alice@example.com?uid=123456789012345678901`. If the user is
      *    recovered, this value reverts to `user:{emailid}` and the recovered user
      *    retains the role in the binding.
-     *
      * * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus
      *    unique identifier) representing a service account that has been recently
      *    deleted. For example,
@@ -1180,14 +1067,11 @@ public java.lang.String getMembers(int index) {
      *    If the service account is undeleted, this value reverts to
      *    `serviceAccount:{emailid}` and the undeleted service account retains the
      *    role in the binding.
-     *
      * * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a Google group that has been recently
      *    deleted. For example, `admins@example.com?uid=123456789012345678901`. If
      *    the group is recovered, this value reverts to `group:{emailid}` and the
      *    recovered group retains the role in the binding.
-     *
-     *
      * * `domain:{domain}`: The G Suite domain (primary) that represents all the
      *    users of that domain. For example, `google.com` or `example.com`.
      * 

@@ -1207,29 +1091,21 @@ public com.google.protobuf.ByteString getMembersBytes(int index) {
      * 
      * Specifies the principals requesting access for a Google Cloud resource.
      * `members` can have the following values:
-     *
      * * `allUsers`: A special identifier that represents anyone who is
      *    on the internet; with or without a Google account.
-     *
      * * `allAuthenticatedUsers`: A special identifier that represents anyone
      *    who is authenticated with a Google account or a service account.
-     *
      * * `user:{emailid}`: An email address that represents a specific Google
      *    account. For example, `alice@example.com` .
-     *
-     *
      * * `serviceAccount:{emailid}`: An email address that represents a service
      *    account. For example, `my-other-app@appspot.gserviceaccount.com`.
-     *
      * * `group:{emailid}`: An email address that represents a Google group.
      *    For example, `admins@example.com`.
-     *
      * * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a user that has been recently deleted. For
      *    example, `alice@example.com?uid=123456789012345678901`. If the user is
      *    recovered, this value reverts to `user:{emailid}` and the recovered user
      *    retains the role in the binding.
-     *
      * * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus
      *    unique identifier) representing a service account that has been recently
      *    deleted. For example,
@@ -1237,14 +1113,11 @@ public com.google.protobuf.ByteString getMembersBytes(int index) {
      *    If the service account is undeleted, this value reverts to
      *    `serviceAccount:{emailid}` and the undeleted service account retains the
      *    role in the binding.
-     *
      * * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a Google group that has been recently
      *    deleted. For example, `admins@example.com?uid=123456789012345678901`. If
      *    the group is recovered, this value reverts to `group:{emailid}` and the
      *    recovered group retains the role in the binding.
-     *
-     *
      * * `domain:{domain}`: The G Suite domain (primary) that represents all the
      *    users of that domain. For example, `google.com` or `example.com`.
      * 

@@ -1261,7 +1134,6 @@ public Builder setMembers(int index, java.lang.String value) {
       }
       ensureMembersIsMutable();
       members_.set(index, value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1272,29 +1144,21 @@ public Builder setMembers(int index, java.lang.String value) {
      * 
      * Specifies the principals requesting access for a Google Cloud resource.
      * `members` can have the following values:
-     *
      * * `allUsers`: A special identifier that represents anyone who is
      *    on the internet; with or without a Google account.
-     *
      * * `allAuthenticatedUsers`: A special identifier that represents anyone
      *    who is authenticated with a Google account or a service account.
-     *
      * * `user:{emailid}`: An email address that represents a specific Google
      *    account. For example, `alice@example.com` .
-     *
-     *
      * * `serviceAccount:{emailid}`: An email address that represents a service
      *    account. For example, `my-other-app@appspot.gserviceaccount.com`.
-     *
      * * `group:{emailid}`: An email address that represents a Google group.
      *    For example, `admins@example.com`.
-     *
      * * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a user that has been recently deleted. For
      *    example, `alice@example.com?uid=123456789012345678901`. If the user is
      *    recovered, this value reverts to `user:{emailid}` and the recovered user
      *    retains the role in the binding.
-     *
      * * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus
      *    unique identifier) representing a service account that has been recently
      *    deleted. For example,
@@ -1302,14 +1166,11 @@ public Builder setMembers(int index, java.lang.String value) {
      *    If the service account is undeleted, this value reverts to
      *    `serviceAccount:{emailid}` and the undeleted service account retains the
      *    role in the binding.
-     *
      * * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a Google group that has been recently
      *    deleted. For example, `admins@example.com?uid=123456789012345678901`. If
      *    the group is recovered, this value reverts to `group:{emailid}` and the
      *    recovered group retains the role in the binding.
-     *
-     *
      * * `domain:{domain}`: The G Suite domain (primary) that represents all the
      *    users of that domain. For example, `google.com` or `example.com`.
      * 

@@ -1325,7 +1186,6 @@ public Builder addMembers(java.lang.String value) {
       }
       ensureMembersIsMutable();
       members_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1336,29 +1196,21 @@ public Builder addMembers(java.lang.String value) {
      * 
      * Specifies the principals requesting access for a Google Cloud resource.
      * `members` can have the following values:
-     *
      * * `allUsers`: A special identifier that represents anyone who is
      *    on the internet; with or without a Google account.
-     *
      * * `allAuthenticatedUsers`: A special identifier that represents anyone
      *    who is authenticated with a Google account or a service account.
-     *
      * * `user:{emailid}`: An email address that represents a specific Google
      *    account. For example, `alice@example.com` .
-     *
-     *
      * * `serviceAccount:{emailid}`: An email address that represents a service
      *    account. For example, `my-other-app@appspot.gserviceaccount.com`.
-     *
      * * `group:{emailid}`: An email address that represents a Google group.
      *    For example, `admins@example.com`.
-     *
      * * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a user that has been recently deleted. For
      *    example, `alice@example.com?uid=123456789012345678901`. If the user is
      *    recovered, this value reverts to `user:{emailid}` and the recovered user
      *    retains the role in the binding.
-     *
      * * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus
      *    unique identifier) representing a service account that has been recently
      *    deleted. For example,
@@ -1366,14 +1218,11 @@ public Builder addMembers(java.lang.String value) {
      *    If the service account is undeleted, this value reverts to
      *    `serviceAccount:{emailid}` and the undeleted service account retains the
      *    role in the binding.
-     *
      * * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a Google group that has been recently
      *    deleted. For example, `admins@example.com?uid=123456789012345678901`. If
      *    the group is recovered, this value reverts to `group:{emailid}` and the
      *    recovered group retains the role in the binding.
-     *
-     *
      * * `domain:{domain}`: The G Suite domain (primary) that represents all the
      *    users of that domain. For example, `google.com` or `example.com`.
      * 

@@ -1386,7 +1235,6 @@ public Builder addMembers(java.lang.String value) {
     public Builder addAllMembers(java.lang.Iterable values) {
       ensureMembersIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, members_);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1397,29 +1245,21 @@ public Builder addAllMembers(java.lang.Iterable values) {
      * 
      * Specifies the principals requesting access for a Google Cloud resource.
      * `members` can have the following values:
-     *
      * * `allUsers`: A special identifier that represents anyone who is
      *    on the internet; with or without a Google account.
-     *
      * * `allAuthenticatedUsers`: A special identifier that represents anyone
      *    who is authenticated with a Google account or a service account.
-     *
      * * `user:{emailid}`: An email address that represents a specific Google
      *    account. For example, `alice@example.com` .
-     *
-     *
      * * `serviceAccount:{emailid}`: An email address that represents a service
      *    account. For example, `my-other-app@appspot.gserviceaccount.com`.
-     *
      * * `group:{emailid}`: An email address that represents a Google group.
      *    For example, `admins@example.com`.
-     *
      * * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a user that has been recently deleted. For
      *    example, `alice@example.com?uid=123456789012345678901`. If the user is
      *    recovered, this value reverts to `user:{emailid}` and the recovered user
      *    retains the role in the binding.
-     *
      * * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus
      *    unique identifier) representing a service account that has been recently
      *    deleted. For example,
@@ -1427,14 +1267,11 @@ public Builder addAllMembers(java.lang.Iterable values) {
      *    If the service account is undeleted, this value reverts to
      *    `serviceAccount:{emailid}` and the undeleted service account retains the
      *    role in the binding.
-     *
      * * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a Google group that has been recently
      *    deleted. For example, `admins@example.com?uid=123456789012345678901`. If
      *    the group is recovered, this value reverts to `group:{emailid}` and the
      *    recovered group retains the role in the binding.
-     *
-     *
      * * `domain:{domain}`: The G Suite domain (primary) that represents all the
      *    users of that domain. For example, `google.com` or `example.com`.
      * 

@@ -1444,9 +1281,8 @@ public Builder addAllMembers(java.lang.Iterable values) {
      * @return This builder for chaining.
      */
     public Builder clearMembers() {
-      members_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000002);
-      ;
+      members_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1457,29 +1293,21 @@ public Builder clearMembers() {
      * 
      * Specifies the principals requesting access for a Google Cloud resource.
      * `members` can have the following values:
-     *
      * * `allUsers`: A special identifier that represents anyone who is
      *    on the internet; with or without a Google account.
-     *
      * * `allAuthenticatedUsers`: A special identifier that represents anyone
      *    who is authenticated with a Google account or a service account.
-     *
      * * `user:{emailid}`: An email address that represents a specific Google
      *    account. For example, `alice@example.com` .
-     *
-     *
      * * `serviceAccount:{emailid}`: An email address that represents a service
      *    account. For example, `my-other-app@appspot.gserviceaccount.com`.
-     *
      * * `group:{emailid}`: An email address that represents a Google group.
      *    For example, `admins@example.com`.
-     *
      * * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a user that has been recently deleted. For
      *    example, `alice@example.com?uid=123456789012345678901`. If the user is
      *    recovered, this value reverts to `user:{emailid}` and the recovered user
      *    retains the role in the binding.
-     *
      * * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus
      *    unique identifier) representing a service account that has been recently
      *    deleted. For example,
@@ -1487,14 +1315,11 @@ public Builder clearMembers() {
      *    If the service account is undeleted, this value reverts to
      *    `serviceAccount:{emailid}` and the undeleted service account retains the
      *    role in the binding.
-     *
      * * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique
      *    identifier) representing a Google group that has been recently
      *    deleted. For example, `admins@example.com?uid=123456789012345678901`. If
      *    the group is recovered, this value reverts to `group:{emailid}` and the
      *    recovered group retains the role in the binding.
-     *
-     *
      * * `domain:{domain}`: The G Suite domain (primary) that represents all the
      *    users of that domain. For example, `google.com` or `example.com`.
      * 

@@ -1511,7 +1336,6 @@ public Builder addMembersBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureMembersIsMutable();
       members_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1526,14 +1350,11 @@ public Builder addMembersBytes(com.google.protobuf.ByteString value) {
      *
      * 
      * The condition that is associated with this binding.
-     *
      * If the condition evaluates to `true`, then this binding applies to the
      * current request.
-     *
      * If the condition evaluates to `false`, then this binding does not apply to
      * the current request. However, a different role binding might grant the same
      * role to one or more of the principals in this binding.
-     *
      * To learn which resources support conditions in their IAM policies, see the
      * [IAM
      * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -1544,7 +1365,7 @@ public Builder addMembersBytes(com.google.protobuf.ByteString value) {
      * @return Whether the condition field is set.
      */
     public boolean hasCondition() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return conditionBuilder_ != null || condition_ != null;
     }
 
     /**
@@ -1552,14 +1373,11 @@ public boolean hasCondition() {
      *
      * 
      * The condition that is associated with this binding.
-     *
      * If the condition evaluates to `true`, then this binding applies to the
      * current request.
-     *
      * If the condition evaluates to `false`, then this binding does not apply to
      * the current request. However, a different role binding might grant the same
      * role to one or more of the principals in this binding.
-     *
      * To learn which resources support conditions in their IAM policies, see the
      * [IAM
      * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -1582,14 +1400,11 @@ public com.google.type.Expr getCondition() {
      *
      * 
      * The condition that is associated with this binding.
-     *
      * If the condition evaluates to `true`, then this binding applies to the
      * current request.
-     *
      * If the condition evaluates to `false`, then this binding does not apply to
      * the current request. However, a different role binding might grant the same
      * role to one or more of the principals in this binding.
-     *
      * To learn which resources support conditions in their IAM policies, see the
      * [IAM
      * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -1603,11 +1418,11 @@ public Builder setCondition(com.google.type.Expr value) {
           throw new NullPointerException();
         }
         condition_ = value;
+        onChanged();
       } else {
         conditionBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1616,14 +1431,11 @@ public Builder setCondition(com.google.type.Expr value) {
      *
      * 
      * The condition that is associated with this binding.
-     *
      * If the condition evaluates to `true`, then this binding applies to the
      * current request.
-     *
      * If the condition evaluates to `false`, then this binding does not apply to
      * the current request. However, a different role binding might grant the same
      * role to one or more of the principals in this binding.
-     *
      * To learn which resources support conditions in their IAM policies, see the
      * [IAM
      * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -1634,11 +1446,11 @@ public Builder setCondition(com.google.type.Expr value) {
     public Builder setCondition(com.google.type.Expr.Builder builderForValue) {
       if (conditionBuilder_ == null) {
         condition_ = builderForValue.build();
+        onChanged();
       } else {
         conditionBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1647,14 +1459,11 @@ public Builder setCondition(com.google.type.Expr.Builder builderForValue) {
      *
      * 
      * The condition that is associated with this binding.
-     *
      * If the condition evaluates to `true`, then this binding applies to the
      * current request.
-     *
      * If the condition evaluates to `false`, then this binding does not apply to
      * the current request. However, a different role binding might grant the same
      * role to one or more of the principals in this binding.
-     *
      * To learn which resources support conditions in their IAM policies, see the
      * [IAM
      * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -1664,20 +1473,16 @@ public Builder setCondition(com.google.type.Expr.Builder builderForValue) {
      */
     public Builder mergeCondition(com.google.type.Expr value) {
       if (conditionBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && condition_ != null
-            && condition_ != com.google.type.Expr.getDefaultInstance()) {
-          getConditionBuilder().mergeFrom(value);
+        if (condition_ != null) {
+          condition_ = com.google.type.Expr.newBuilder(condition_).mergeFrom(value).buildPartial();
         } else {
           condition_ = value;
         }
+        onChanged();
       } else {
         conditionBuilder_.mergeFrom(value);
       }
-      if (condition_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1686,14 +1491,11 @@ public Builder mergeCondition(com.google.type.Expr value) {
      *
      * 
      * The condition that is associated with this binding.
-     *
      * If the condition evaluates to `true`, then this binding applies to the
      * current request.
-     *
      * If the condition evaluates to `false`, then this binding does not apply to
      * the current request. However, a different role binding might grant the same
      * role to one or more of the principals in this binding.
-     *
      * To learn which resources support conditions in their IAM policies, see the
      * [IAM
      * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -1702,13 +1504,14 @@ public Builder mergeCondition(com.google.type.Expr value) {
      * .google.type.Expr condition = 3;
      */
     public Builder clearCondition() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      condition_ = null;
-      if (conditionBuilder_ != null) {
-        conditionBuilder_.dispose();
+      if (conditionBuilder_ == null) {
+        condition_ = null;
+        onChanged();
+      } else {
+        condition_ = null;
         conditionBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1717,14 +1520,11 @@ public Builder clearCondition() {
      *
      * 
      * The condition that is associated with this binding.
-     *
      * If the condition evaluates to `true`, then this binding applies to the
      * current request.
-     *
      * If the condition evaluates to `false`, then this binding does not apply to
      * the current request. However, a different role binding might grant the same
      * role to one or more of the principals in this binding.
-     *
      * To learn which resources support conditions in their IAM policies, see the
      * [IAM
      * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -1733,7 +1533,7 @@ public Builder clearCondition() {
      * .google.type.Expr condition = 3;
      */
     public com.google.type.Expr.Builder getConditionBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getConditionFieldBuilder().getBuilder();
     }
@@ -1743,14 +1543,11 @@ public com.google.type.Expr.Builder getConditionBuilder() {
      *
      * 
      * The condition that is associated with this binding.
-     *
      * If the condition evaluates to `true`, then this binding applies to the
      * current request.
-     *
      * If the condition evaluates to `false`, then this binding does not apply to
      * the current request. However, a different role binding might grant the same
      * role to one or more of the principals in this binding.
-     *
      * To learn which resources support conditions in their IAM policies, see the
      * [IAM
      * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -1771,14 +1568,11 @@ public com.google.type.ExprOrBuilder getConditionOrBuilder() {
      *
      * 
      * The condition that is associated with this binding.
-     *
      * If the condition evaluates to `true`, then this binding applies to the
      * current request.
-     *
      * If the condition evaluates to `false`, then this binding does not apply to
      * the current request. However, a different role binding might grant the same
      * role to one or more of the principals in this binding.
-     *
      * To learn which resources support conditions in their IAM policies, see the
      * [IAM
      * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDelta.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDelta.java
index 5b97ce40ad..42fe29a056 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDelta.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDelta.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new BindingDelta();
   }
 
+  @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.iam.v1.PolicyProto.internal_static_google_iam_v1_BindingDelta_descriptor;
   }
@@ -224,9 +228,8 @@ private Action(int value) {
     // @@protoc_insertion_point(enum_scope:google.iam.v1.BindingDelta.Action)
   }
 
-  private int bitField0_;
   public static final int ACTION_FIELD_NUMBER = 1;
-  private int action_ = 0;
+  private int action_;
 
   /**
    *
@@ -259,15 +262,14 @@ public int getActionValue() {
    */
   @java.lang.Override
   public com.google.iam.v1.BindingDelta.Action getAction() {
+    @SuppressWarnings("deprecation")
     com.google.iam.v1.BindingDelta.Action result =
-        com.google.iam.v1.BindingDelta.Action.forNumber(action_);
+        com.google.iam.v1.BindingDelta.Action.valueOf(action_);
     return result == null ? com.google.iam.v1.BindingDelta.Action.UNRECOGNIZED : result;
   }
 
   public static final int ROLE_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object role_ = "";
+  private volatile java.lang.Object role_;
 
   /**
    *
@@ -322,9 +324,7 @@ public com.google.protobuf.ByteString getRoleBytes() {
   }
 
   public static final int MEMBER_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object member_ = "";
+  private volatile java.lang.Object member_;
 
   /**
    *
@@ -394,7 +394,7 @@ public com.google.protobuf.ByteString getMemberBytes() {
    */
   @java.lang.Override
   public boolean hasCondition() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return condition_ != null;
   }
 
   /**
@@ -424,7 +424,7 @@ public com.google.type.Expr getCondition() {
    */
   @java.lang.Override
   public com.google.type.ExprOrBuilder getConditionOrBuilder() {
-    return condition_ == null ? com.google.type.Expr.getDefaultInstance() : condition_;
+    return getCondition();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -450,7 +450,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(member_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, member_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (condition_ != null) {
       output.writeMessage(4, getCondition());
     }
     getUnknownFields().writeTo(output);
@@ -471,7 +471,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(member_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, member_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (condition_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getCondition());
     }
     size += getUnknownFields().getSerializedSize();
@@ -645,31 +645,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.BindingDelta.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getConditionFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       action_ = 0;
+
       role_ = "";
+
       member_ = "";
-      condition_ = null;
-      if (conditionBuilder_ != null) {
-        conditionBuilder_.dispose();
+
+      if (conditionBuilder_ == null) {
+        condition_ = null;
+      } else {
+        condition_ = null;
         conditionBuilder_ = null;
       }
       return this;
@@ -697,32 +691,18 @@ public com.google.iam.v1.BindingDelta build() {
     @java.lang.Override
     public com.google.iam.v1.BindingDelta buildPartial() {
       com.google.iam.v1.BindingDelta result = new com.google.iam.v1.BindingDelta(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.action_ = action_;
+      result.role_ = role_;
+      result.member_ = member_;
+      if (conditionBuilder_ == null) {
+        result.condition_ = condition_;
+      } else {
+        result.condition_ = conditionBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v1.BindingDelta result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.action_ = action_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.role_ = role_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.member_ = member_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.condition_ = conditionBuilder_ == null ? condition_ : conditionBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -773,12 +753,10 @@ public Builder mergeFrom(com.google.iam.v1.BindingDelta other) {
       }
       if (!other.getRole().isEmpty()) {
         role_ = other.role_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getMember().isEmpty()) {
         member_ = other.member_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.hasCondition()) {
@@ -813,25 +791,25 @@ public Builder mergeFrom(
             case 8:
               {
                 action_ = input.readEnum();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 18:
               {
                 role_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 member_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getConditionFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             default:
@@ -851,8 +829,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private int action_ = 0;
 
     /**
@@ -886,8 +862,8 @@ public int getActionValue() {
      * @return This builder for chaining.
      */
     public Builder setActionValue(int value) {
+
       action_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -906,8 +882,9 @@ public Builder setActionValue(int value) {
      */
     @java.lang.Override
     public com.google.iam.v1.BindingDelta.Action getAction() {
+      @SuppressWarnings("deprecation")
       com.google.iam.v1.BindingDelta.Action result =
-          com.google.iam.v1.BindingDelta.Action.forNumber(action_);
+          com.google.iam.v1.BindingDelta.Action.valueOf(action_);
       return result == null ? com.google.iam.v1.BindingDelta.Action.UNRECOGNIZED : result;
     }
 
@@ -928,7 +905,7 @@ public Builder setAction(com.google.iam.v1.BindingDelta.Action value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000001;
+
       action_ = value.getNumber();
       onChanged();
       return this;
@@ -947,7 +924,7 @@ public Builder setAction(com.google.iam.v1.BindingDelta.Action value) {
      * @return This builder for chaining.
      */
     public Builder clearAction() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       action_ = 0;
       onChanged();
       return this;
@@ -1023,8 +1000,8 @@ public Builder setRole(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       role_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1043,8 +1020,8 @@ public Builder setRole(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearRole() {
+
       role_ = getDefaultInstance().getRole();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1068,8 +1045,8 @@ public Builder setRoleBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       role_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1144,8 +1121,8 @@ public Builder setMember(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       member_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1164,8 +1141,8 @@ public Builder setMember(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearMember() {
+
       member_ = getDefaultInstance().getMember();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1189,8 +1166,8 @@ public Builder setMemberBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       member_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1212,7 +1189,7 @@ public Builder setMemberBytes(com.google.protobuf.ByteString value) {
      * @return Whether the condition field is set.
      */
     public boolean hasCondition() {
-      return ((bitField0_ & 0x00000008) != 0);
+      return conditionBuilder_ != null || condition_ != null;
     }
 
     /**
@@ -1249,11 +1226,11 @@ public Builder setCondition(com.google.type.Expr value) {
           throw new NullPointerException();
         }
         condition_ = value;
+        onChanged();
       } else {
         conditionBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -1269,11 +1246,11 @@ public Builder setCondition(com.google.type.Expr value) {
     public Builder setCondition(com.google.type.Expr.Builder builderForValue) {
       if (conditionBuilder_ == null) {
         condition_ = builderForValue.build();
+        onChanged();
       } else {
         conditionBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -1288,20 +1265,16 @@ public Builder setCondition(com.google.type.Expr.Builder builderForValue) {
      */
     public Builder mergeCondition(com.google.type.Expr value) {
       if (conditionBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)
-            && condition_ != null
-            && condition_ != com.google.type.Expr.getDefaultInstance()) {
-          getConditionBuilder().mergeFrom(value);
+        if (condition_ != null) {
+          condition_ = com.google.type.Expr.newBuilder(condition_).mergeFrom(value).buildPartial();
         } else {
           condition_ = value;
         }
+        onChanged();
       } else {
         conditionBuilder_.mergeFrom(value);
       }
-      if (condition_ != null) {
-        bitField0_ |= 0x00000008;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1315,13 +1288,14 @@ public Builder mergeCondition(com.google.type.Expr value) {
      * .google.type.Expr condition = 4;
      */
     public Builder clearCondition() {
-      bitField0_ = (bitField0_ & ~0x00000008);
-      condition_ = null;
-      if (conditionBuilder_ != null) {
-        conditionBuilder_.dispose();
+      if (conditionBuilder_ == null) {
+        condition_ = null;
+        onChanged();
+      } else {
+        condition_ = null;
         conditionBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1335,7 +1309,7 @@ public Builder clearCondition() {
      * .google.type.Expr condition = 4;
      */
     public com.google.type.Expr.Builder getConditionBuilder() {
-      bitField0_ |= 0x00000008;
+
       onChanged();
       return getConditionFieldBuilder().getBuilder();
     }
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDeltaOrBuilder.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDeltaOrBuilder.java
index 60dc6cdd80..50f511b01b 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDeltaOrBuilder.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDeltaOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 public interface BindingDeltaOrBuilder
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingOrBuilder.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingOrBuilder.java
index 1e76df4830..db3c904a5a 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingOrBuilder.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 public interface BindingOrBuilder
@@ -58,29 +57,21 @@ public interface BindingOrBuilder
    * 
    * Specifies the principals requesting access for a Google Cloud resource.
    * `members` can have the following values:
-   *
    * * `allUsers`: A special identifier that represents anyone who is
    *    on the internet; with or without a Google account.
-   *
    * * `allAuthenticatedUsers`: A special identifier that represents anyone
    *    who is authenticated with a Google account or a service account.
-   *
    * * `user:{emailid}`: An email address that represents a specific Google
    *    account. For example, `alice@example.com` .
-   *
-   *
    * * `serviceAccount:{emailid}`: An email address that represents a service
    *    account. For example, `my-other-app@appspot.gserviceaccount.com`.
-   *
    * * `group:{emailid}`: An email address that represents a Google group.
    *    For example, `admins@example.com`.
-   *
    * * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique
    *    identifier) representing a user that has been recently deleted. For
    *    example, `alice@example.com?uid=123456789012345678901`. If the user is
    *    recovered, this value reverts to `user:{emailid}` and the recovered user
    *    retains the role in the binding.
-   *
    * * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus
    *    unique identifier) representing a service account that has been recently
    *    deleted. For example,
@@ -88,14 +79,11 @@ public interface BindingOrBuilder
    *    If the service account is undeleted, this value reverts to
    *    `serviceAccount:{emailid}` and the undeleted service account retains the
    *    role in the binding.
-   *
    * * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique
    *    identifier) representing a Google group that has been recently
    *    deleted. For example, `admins@example.com?uid=123456789012345678901`. If
    *    the group is recovered, this value reverts to `group:{emailid}` and the
    *    recovered group retains the role in the binding.
-   *
-   *
    * * `domain:{domain}`: The G Suite domain (primary) that represents all the
    *    users of that domain. For example, `google.com` or `example.com`.
    * 

@@ -112,29 +100,21 @@ public interface BindingOrBuilder
    * 
    * Specifies the principals requesting access for a Google Cloud resource.
    * `members` can have the following values:
-   *
    * * `allUsers`: A special identifier that represents anyone who is
    *    on the internet; with or without a Google account.
-   *
    * * `allAuthenticatedUsers`: A special identifier that represents anyone
    *    who is authenticated with a Google account or a service account.
-   *
    * * `user:{emailid}`: An email address that represents a specific Google
    *    account. For example, `alice@example.com` .
-   *
-   *
    * * `serviceAccount:{emailid}`: An email address that represents a service
    *    account. For example, `my-other-app@appspot.gserviceaccount.com`.
-   *
    * * `group:{emailid}`: An email address that represents a Google group.
    *    For example, `admins@example.com`.
-   *
    * * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique
    *    identifier) representing a user that has been recently deleted. For
    *    example, `alice@example.com?uid=123456789012345678901`. If the user is
    *    recovered, this value reverts to `user:{emailid}` and the recovered user
    *    retains the role in the binding.
-   *
    * * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus
    *    unique identifier) representing a service account that has been recently
    *    deleted. For example,
@@ -142,14 +122,11 @@ public interface BindingOrBuilder
    *    If the service account is undeleted, this value reverts to
    *    `serviceAccount:{emailid}` and the undeleted service account retains the
    *    role in the binding.
-   *
    * * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique
    *    identifier) representing a Google group that has been recently
    *    deleted. For example, `admins@example.com?uid=123456789012345678901`. If
    *    the group is recovered, this value reverts to `group:{emailid}` and the
    *    recovered group retains the role in the binding.
-   *
-   *
    * * `domain:{domain}`: The G Suite domain (primary) that represents all the
    *    users of that domain. For example, `google.com` or `example.com`.
    * 

@@ -166,29 +143,21 @@ public interface BindingOrBuilder
    * 
    * Specifies the principals requesting access for a Google Cloud resource.
    * `members` can have the following values:
-   *
    * * `allUsers`: A special identifier that represents anyone who is
    *    on the internet; with or without a Google account.
-   *
    * * `allAuthenticatedUsers`: A special identifier that represents anyone
    *    who is authenticated with a Google account or a service account.
-   *
    * * `user:{emailid}`: An email address that represents a specific Google
    *    account. For example, `alice@example.com` .
-   *
-   *
    * * `serviceAccount:{emailid}`: An email address that represents a service
    *    account. For example, `my-other-app@appspot.gserviceaccount.com`.
-   *
    * * `group:{emailid}`: An email address that represents a Google group.
    *    For example, `admins@example.com`.
-   *
    * * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique
    *    identifier) representing a user that has been recently deleted. For
    *    example, `alice@example.com?uid=123456789012345678901`. If the user is
    *    recovered, this value reverts to `user:{emailid}` and the recovered user
    *    retains the role in the binding.
-   *
    * * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus
    *    unique identifier) representing a service account that has been recently
    *    deleted. For example,
@@ -196,14 +165,11 @@ public interface BindingOrBuilder
    *    If the service account is undeleted, this value reverts to
    *    `serviceAccount:{emailid}` and the undeleted service account retains the
    *    role in the binding.
-   *
    * * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique
    *    identifier) representing a Google group that has been recently
    *    deleted. For example, `admins@example.com?uid=123456789012345678901`. If
    *    the group is recovered, this value reverts to `group:{emailid}` and the
    *    recovered group retains the role in the binding.
-   *
-   *
    * * `domain:{domain}`: The G Suite domain (primary) that represents all the
    *    users of that domain. For example, `google.com` or `example.com`.
    * 

@@ -221,29 +187,21 @@ public interface BindingOrBuilder
    * 
    * Specifies the principals requesting access for a Google Cloud resource.
    * `members` can have the following values:
-   *
    * * `allUsers`: A special identifier that represents anyone who is
    *    on the internet; with or without a Google account.
-   *
    * * `allAuthenticatedUsers`: A special identifier that represents anyone
    *    who is authenticated with a Google account or a service account.
-   *
    * * `user:{emailid}`: An email address that represents a specific Google
    *    account. For example, `alice@example.com` .
-   *
-   *
    * * `serviceAccount:{emailid}`: An email address that represents a service
    *    account. For example, `my-other-app@appspot.gserviceaccount.com`.
-   *
    * * `group:{emailid}`: An email address that represents a Google group.
    *    For example, `admins@example.com`.
-   *
    * * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique
    *    identifier) representing a user that has been recently deleted. For
    *    example, `alice@example.com?uid=123456789012345678901`. If the user is
    *    recovered, this value reverts to `user:{emailid}` and the recovered user
    *    retains the role in the binding.
-   *
    * * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus
    *    unique identifier) representing a service account that has been recently
    *    deleted. For example,
@@ -251,14 +209,11 @@ public interface BindingOrBuilder
    *    If the service account is undeleted, this value reverts to
    *    `serviceAccount:{emailid}` and the undeleted service account retains the
    *    role in the binding.
-   *
    * * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique
    *    identifier) representing a Google group that has been recently
    *    deleted. For example, `admins@example.com?uid=123456789012345678901`. If
    *    the group is recovered, this value reverts to `group:{emailid}` and the
    *    recovered group retains the role in the binding.
-   *
-   *
    * * `domain:{domain}`: The G Suite domain (primary) that represents all the
    *    users of that domain. For example, `google.com` or `example.com`.
    * 

@@ -275,14 +230,11 @@ public interface BindingOrBuilder
    *
    * 
    * The condition that is associated with this binding.
-   *
    * If the condition evaluates to `true`, then this binding applies to the
    * current request.
-   *
    * If the condition evaluates to `false`, then this binding does not apply to
    * the current request. However, a different role binding might grant the same
    * role to one or more of the principals in this binding.
-   *
    * To learn which resources support conditions in their IAM policies, see the
    * [IAM
    * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -299,14 +251,11 @@ public interface BindingOrBuilder
    *
    * 
    * The condition that is associated with this binding.
-   *
    * If the condition evaluates to `true`, then this binding applies to the
    * current request.
-   *
    * If the condition evaluates to `false`, then this binding does not apply to
    * the current request. However, a different role binding might grant the same
    * role to one or more of the principals in this binding.
-   *
    * To learn which resources support conditions in their IAM policies, see the
    * [IAM
    * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -323,14 +272,11 @@ public interface BindingOrBuilder
    *
    * 
    * The condition that is associated with this binding.
-   *
    * If the condition evaluates to `true`, then this binding applies to the
    * current request.
-   *
    * If the condition evaluates to `false`, then this binding does not apply to
    * the current request. However, a different role binding might grant the same
    * role to one or more of the principals in this binding.
-   *
    * To learn which resources support conditions in their IAM policies, see the
    * [IAM
    * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequest.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequest.java
index 2b4fe8d156..a59dd47b79 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequest.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/iam_policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GetIamPolicyRequest();
   }
 
+  @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.iam.v1.IamPolicyProto
         .internal_static_google_iam_v1_GetIamPolicyRequest_descriptor;
@@ -64,11 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v1.GetIamPolicyRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int RESOURCE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object resource_ = "";
+  private volatile java.lang.Object resource_;
 
   /**
    *
@@ -141,7 +142,7 @@ public com.google.protobuf.ByteString getResourceBytes() {
    */
   @java.lang.Override
   public boolean hasOptions() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return options_ != null;
   }
 
   /**
@@ -173,7 +174,7 @@ public com.google.iam.v1.GetPolicyOptions getOptions() {
    */
   @java.lang.Override
   public com.google.iam.v1.GetPolicyOptionsOrBuilder getOptionsOrBuilder() {
-    return options_ == null ? com.google.iam.v1.GetPolicyOptions.getDefaultInstance() : options_;
+    return getOptions();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -193,7 +194,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(resource_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, resource_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (options_ != null) {
       output.writeMessage(2, getOptions());
     }
     getUnknownFields().writeTo(output);
@@ -208,7 +209,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(resource_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, resource_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (options_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getOptions());
     }
     size += getUnknownFields().getSerializedSize();
@@ -377,29 +378,21 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.GetIamPolicyRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getOptionsFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       resource_ = "";
-      options_ = null;
-      if (optionsBuilder_ != null) {
-        optionsBuilder_.dispose();
+
+      if (optionsBuilder_ == null) {
+        options_ = null;
+      } else {
+        options_ = null;
         optionsBuilder_ = null;
       }
       return this;
@@ -429,26 +422,16 @@ public com.google.iam.v1.GetIamPolicyRequest build() {
     public com.google.iam.v1.GetIamPolicyRequest buildPartial() {
       com.google.iam.v1.GetIamPolicyRequest result =
           new com.google.iam.v1.GetIamPolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.resource_ = resource_;
+      if (optionsBuilder_ == null) {
+        result.options_ = options_;
+      } else {
+        result.options_ = optionsBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v1.GetIamPolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.resource_ = resource_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.options_ = optionsBuilder_ == null ? options_ : optionsBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -496,7 +479,6 @@ public Builder mergeFrom(com.google.iam.v1.GetIamPolicyRequest other) {
       if (other == com.google.iam.v1.GetIamPolicyRequest.getDefaultInstance()) return this;
       if (!other.getResource().isEmpty()) {
         resource_ = other.resource_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasOptions()) {
@@ -531,13 +513,13 @@ public Builder mergeFrom(
             case 10:
               {
                 resource_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getOptionsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -557,8 +539,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object resource_ = "";
 
     /**
@@ -632,8 +612,8 @@ public Builder setResource(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       resource_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -653,8 +633,8 @@ public Builder setResource(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResource() {
+
       resource_ = getDefaultInstance().getResource();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -679,8 +659,8 @@ public Builder setResourceBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       resource_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -705,7 +685,7 @@ public Builder setResourceBytes(com.google.protobuf.ByteString value) {
      * @return Whether the options field is set.
      */
     public boolean hasOptions() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return optionsBuilder_ != null || options_ != null;
     }
 
     /**
@@ -746,11 +726,11 @@ public Builder setOptions(com.google.iam.v1.GetPolicyOptions value) {
           throw new NullPointerException();
         }
         options_ = value;
+        onChanged();
       } else {
         optionsBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -767,11 +747,11 @@ public Builder setOptions(com.google.iam.v1.GetPolicyOptions value) {
     public Builder setOptions(com.google.iam.v1.GetPolicyOptions.Builder builderForValue) {
       if (optionsBuilder_ == null) {
         options_ = builderForValue.build();
+        onChanged();
       } else {
         optionsBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -787,20 +767,19 @@ public Builder setOptions(com.google.iam.v1.GetPolicyOptions.Builder builderForV
      */
     public Builder mergeOptions(com.google.iam.v1.GetPolicyOptions value) {
       if (optionsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && options_ != null
-            && options_ != com.google.iam.v1.GetPolicyOptions.getDefaultInstance()) {
-          getOptionsBuilder().mergeFrom(value);
+        if (options_ != null) {
+          options_ =
+              com.google.iam.v1.GetPolicyOptions.newBuilder(options_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           options_ = value;
         }
+        onChanged();
       } else {
         optionsBuilder_.mergeFrom(value);
       }
-      if (options_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -815,13 +794,14 @@ public Builder mergeOptions(com.google.iam.v1.GetPolicyOptions value) {
      * .google.iam.v1.GetPolicyOptions options = 2;
      */
     public Builder clearOptions() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      options_ = null;
-      if (optionsBuilder_ != null) {
-        optionsBuilder_.dispose();
+      if (optionsBuilder_ == null) {
+        options_ = null;
+        onChanged();
+      } else {
+        options_ = null;
         optionsBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -836,7 +816,7 @@ public Builder clearOptions() {
      * .google.iam.v1.GetPolicyOptions options = 2;
      */
     public com.google.iam.v1.GetPolicyOptions.Builder getOptionsBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getOptionsFieldBuilder().getBuilder();
     }
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequestOrBuilder.java
index 339aabd49a..f50349b871 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/iam_policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 public interface GetIamPolicyRequestOrBuilder
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptions.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptions.java
index 923a72bd87..4ceb48708f 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptions.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptions.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/options.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 /**
@@ -47,6 +46,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GetPolicyOptions();
   }
 
+  @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.iam.v1.OptionsProto.internal_static_google_iam_v1_GetPolicyOptions_descriptor;
   }
@@ -62,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int REQUESTED_POLICY_VERSION_FIELD_NUMBER = 1;
-  private int requestedPolicyVersion_ = 0;
+  private int requestedPolicyVersion_;
 
   /**
    *
@@ -70,19 +74,15 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * Optional. The maximum policy version that will be used to format the
    * policy.
-   *
    * Valid values are 0, 1, and 3. Requests specifying an invalid value will be
    * rejected.
-   *
    * Requests for policies with any conditional role bindings must specify
    * version 3. Policies with no conditional role bindings may specify any valid
    * value or leave the field unset.
-   *
    * The policy in the response might use the policy version that you specified,
    * or it might use a lower policy version. For example, if you specify version
    * 3, but the policy has no conditional role bindings, the response uses
    * version 1.
-   *
    * To learn which resources support conditions in their IAM policies, see the
    * [IAM
    * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -293,8 +293,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       requestedPolicyVersion_ = 0;
+
       return this;
     }
 
@@ -321,20 +321,11 @@ public com.google.iam.v1.GetPolicyOptions build() {
     @java.lang.Override
     public com.google.iam.v1.GetPolicyOptions buildPartial() {
       com.google.iam.v1.GetPolicyOptions result = new com.google.iam.v1.GetPolicyOptions(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.requestedPolicyVersion_ = requestedPolicyVersion_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v1.GetPolicyOptions result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.requestedPolicyVersion_ = requestedPolicyVersion_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -412,7 +403,7 @@ public Builder mergeFrom(
             case 8:
               {
                 requestedPolicyVersion_ = input.readInt32();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             default:
@@ -432,8 +423,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private int requestedPolicyVersion_;
 
     /**
@@ -442,19 +431,15 @@ public Builder mergeFrom(
      * 
      * Optional. The maximum policy version that will be used to format the
      * policy.
-     *
      * Valid values are 0, 1, and 3. Requests specifying an invalid value will be
      * rejected.
-     *
      * Requests for policies with any conditional role bindings must specify
      * version 3. Policies with no conditional role bindings may specify any valid
      * value or leave the field unset.
-     *
      * The policy in the response might use the policy version that you specified,
      * or it might use a lower policy version. For example, if you specify version
      * 3, but the policy has no conditional role bindings, the response uses
      * version 1.
-     *
      * To learn which resources support conditions in their IAM policies, see the
      * [IAM
      * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -475,19 +460,15 @@ public int getRequestedPolicyVersion() {
      * 
      * Optional. The maximum policy version that will be used to format the
      * policy.
-     *
      * Valid values are 0, 1, and 3. Requests specifying an invalid value will be
      * rejected.
-     *
      * Requests for policies with any conditional role bindings must specify
      * version 3. Policies with no conditional role bindings may specify any valid
      * value or leave the field unset.
-     *
      * The policy in the response might use the policy version that you specified,
      * or it might use a lower policy version. For example, if you specify version
      * 3, but the policy has no conditional role bindings, the response uses
      * version 1.
-     *
      * To learn which resources support conditions in their IAM policies, see the
      * [IAM
      * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -501,7 +482,6 @@ public int getRequestedPolicyVersion() {
     public Builder setRequestedPolicyVersion(int value) {
 
       requestedPolicyVersion_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -512,19 +492,15 @@ public Builder setRequestedPolicyVersion(int value) {
      * 
      * Optional. The maximum policy version that will be used to format the
      * policy.
-     *
      * Valid values are 0, 1, and 3. Requests specifying an invalid value will be
      * rejected.
-     *
      * Requests for policies with any conditional role bindings must specify
      * version 3. Policies with no conditional role bindings may specify any valid
      * value or leave the field unset.
-     *
      * The policy in the response might use the policy version that you specified,
      * or it might use a lower policy version. For example, if you specify version
      * 3, but the policy has no conditional role bindings, the response uses
      * version 1.
-     *
      * To learn which resources support conditions in their IAM policies, see the
      * [IAM
      * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -535,7 +511,7 @@ public Builder setRequestedPolicyVersion(int value) {
      * @return This builder for chaining.
      */
     public Builder clearRequestedPolicyVersion() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       requestedPolicyVersion_ = 0;
       onChanged();
       return this;
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptionsOrBuilder.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptionsOrBuilder.java
index 809b6aa2d9..1153a5c19d 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptionsOrBuilder.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptionsOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/options.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 public interface GetPolicyOptionsOrBuilder
@@ -30,19 +29,15 @@ public interface GetPolicyOptionsOrBuilder
    * 
    * Optional. The maximum policy version that will be used to format the
    * policy.
-   *
    * Valid values are 0, 1, and 3. Requests specifying an invalid value will be
    * rejected.
-   *
    * Requests for policies with any conditional role bindings must specify
    * version 3. Policies with no conditional role bindings may specify any valid
    * value or leave the field unset.
-   *
    * The policy in the response might use the policy version that you specified,
    * or it might use a lower policy version. For example, if you specify version
    * 3, but the policy has no conditional role bindings, the response uses
    * version 1.
-   *
    * To learn which resources support conditions in their IAM policies, see the
    * [IAM
    * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/IamPolicyProto.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/IamPolicyProto.java
index 2058d66c54..baf2cf93a8 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/IamPolicyProto.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/IamPolicyProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/iam_policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 public final class IamPolicyProto {
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/OptionsProto.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/OptionsProto.java
index df509f4f88..fb95d83009 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/OptionsProto.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/OptionsProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/options.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 public final class OptionsProto {
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Policy.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Policy.java
index 9098f2251c..ded48b6846 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Policy.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Policy.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 /**
@@ -25,14 +24,11 @@
  * 
  * An Identity and Access Management (IAM) policy, which specifies access
  * controls for Google Cloud resources.
- *
- *
  * A `Policy` is a collection of `bindings`. A `binding` binds one or more
  * `members`, or principals, to a single `role`. Principals can be user
  * accounts, service accounts, Google groups, and domains (such as G Suite). A
  * `role` is a named list of permissions; each `role` can be an IAM predefined
  * role or a user-created custom role.
- *
  * For some types of Google Cloud resources, a `binding` can also specify a
  * `condition`, which is a logical expression that allows access to a resource
  * only if the expression evaluates to `true`. A condition can add constraints
@@ -40,9 +36,7 @@
  * resources support conditions in their IAM policies, see the
  * [IAM
  * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
- *
  * **JSON example:**
- *
  * ```
  *     {
  *       "bindings": [
@@ -72,9 +66,7 @@
  *       "version": 3
  *     }
  * ```
- *
  * **YAML example:**
- *
  * ```
  *     bindings:
  *     - members:
@@ -93,7 +85,6 @@
  *     etag: BwWWja0YfJA=
  *     version: 3
  * ```
- *
  * For a description of IAM and its features, see the
  * [IAM documentation](https://cloud.google.com/iam/docs/).
  * 

@@ -123,6 +114,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Policy();
   }
 
+  @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.iam.v1.PolicyProto.internal_static_google_iam_v1_Policy_descriptor;
   }
@@ -136,34 +132,28 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int VERSION_FIELD_NUMBER = 1;
-  private int version_ = 0;
+  private int version_;
 
   /**
    *
    *
    * 
    * Specifies the format of the policy.
-   *
    * Valid values are `0`, `1`, and `3`. Requests that specify an invalid value
    * are rejected.
-   *
    * Any operation that affects conditional role bindings must specify version
    * `3`. This requirement applies to the following operations:
-   *
    * * Getting a policy that includes a conditional role binding
    * * Adding a conditional role binding to a policy
    * * Changing a conditional role binding in a policy
    * * Removing any role binding, with or without a condition, from a policy
    *   that includes conditions
-   *
    * **Important:** If you use IAM Conditions, you must include the `etag` field
    * whenever you call `setIamPolicy`. If you omit this field, then IAM allows
    * you to overwrite a version `3` policy with a version `1` policy, and all of
    * the conditions in the version `3` policy are lost.
-   *
    * If a policy does not include any conditions, operations on that policy may
    * specify any valid version or leave the field unset.
-   *
    * To learn which resources support conditions in their IAM policies, see the
    * [IAM
    * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -179,8 +169,6 @@ public int getVersion() {
   }
 
   public static final int BINDINGS_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
   private java.util.List bindings_;
 
   /**
@@ -190,7 +178,6 @@ public int getVersion() {
    * Associates a list of `members`, or principals, with a `role`. Optionally,
    * may specify a `condition` that determines how and when the `bindings` are
    * applied. Each of the `bindings` must contain at least one principal.
-   *
    * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
    * of these principals can be Google groups. Each occurrence of a principal
    * counts towards these limits. For example, if the `bindings` grant 50
@@ -213,7 +200,6 @@ public java.util.List getBindingsList() {
    * Associates a list of `members`, or principals, with a `role`. Optionally,
    * may specify a `condition` that determines how and when the `bindings` are
    * applied. Each of the `bindings` must contain at least one principal.
-   *
    * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
    * of these principals can be Google groups. Each occurrence of a principal
    * counts towards these limits. For example, if the `bindings` grant 50
@@ -236,7 +222,6 @@ public java.util.List getBindingsO
    * Associates a list of `members`, or principals, with a `role`. Optionally,
    * may specify a `condition` that determines how and when the `bindings` are
    * applied. Each of the `bindings` must contain at least one principal.
-   *
    * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
    * of these principals can be Google groups. Each occurrence of a principal
    * counts towards these limits. For example, if the `bindings` grant 50
@@ -259,7 +244,6 @@ public int getBindingsCount() {
    * Associates a list of `members`, or principals, with a `role`. Optionally,
    * may specify a `condition` that determines how and when the `bindings` are
    * applied. Each of the `bindings` must contain at least one principal.
-   *
    * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
    * of these principals can be Google groups. Each occurrence of a principal
    * counts towards these limits. For example, if the `bindings` grant 50
@@ -282,7 +266,6 @@ public com.google.iam.v1.Binding getBindings(int index) {
    * Associates a list of `members`, or principals, with a `role`. Optionally,
    * may specify a `condition` that determines how and when the `bindings` are
    * applied. Each of the `bindings` must contain at least one principal.
-   *
    * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
    * of these principals can be Google groups. Each occurrence of a principal
    * counts towards these limits. For example, if the `bindings` grant 50
@@ -299,8 +282,6 @@ public com.google.iam.v1.BindingOrBuilder getBindingsOrBuilder(int index) {
   }
 
   public static final int AUDIT_CONFIGS_FIELD_NUMBER = 6;
-
-  @SuppressWarnings("serial")
   private java.util.List auditConfigs_;
 
   /**
@@ -375,7 +356,7 @@ public com.google.iam.v1.AuditConfigOrBuilder getAuditConfigsOrBuilder(int index
   }
 
   public static final int ETAG_FIELD_NUMBER = 3;
-  private com.google.protobuf.ByteString etag_ = com.google.protobuf.ByteString.EMPTY;
+  private com.google.protobuf.ByteString etag_;
 
   /**
    *
@@ -388,7 +369,6 @@ public com.google.iam.v1.AuditConfigOrBuilder getAuditConfigsOrBuilder(int index
    * conditions: An `etag` is returned in the response to `getIamPolicy`, and
    * systems are expected to put that etag in the request to `setIamPolicy` to
    * ensure that their change will be applied to the same version of the policy.
-   *
    * **Important:** If you use IAM Conditions, you must include the `etag` field
    * whenever you call `setIamPolicy`. If you omit this field, then IAM allows
    * you to overwrite a version `3` policy with a version `1` policy, and all of
@@ -599,14 +579,11 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * 
    * An Identity and Access Management (IAM) policy, which specifies access
    * controls for Google Cloud resources.
-   *
-   *
    * A `Policy` is a collection of `bindings`. A `binding` binds one or more
    * `members`, or principals, to a single `role`. Principals can be user
    * accounts, service accounts, Google groups, and domains (such as G Suite). A
    * `role` is a named list of permissions; each `role` can be an IAM predefined
    * role or a user-created custom role.
-   *
    * For some types of Google Cloud resources, a `binding` can also specify a
    * `condition`, which is a logical expression that allows access to a resource
    * only if the expression evaluates to `true`. A condition can add constraints
@@ -614,9 +591,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * resources support conditions in their IAM policies, see the
    * [IAM
    * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
-   *
    * **JSON example:**
-   *
    * ```
    *     {
    *       "bindings": [
@@ -646,9 +621,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *       "version": 3
    *     }
    * ```
-   *
    * **YAML example:**
-   *
    * ```
    *     bindings:
    *     - members:
@@ -667,7 +640,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *     etag: BwWWja0YfJA=
    *     version: 3
    * ```
-   *
    * For a description of IAM and its features, see the
    * [IAM documentation](https://cloud.google.com/iam/docs/).
    * 

@@ -700,23 +672,24 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       version_ = 0;
+
       if (bindingsBuilder_ == null) {
         bindings_ = java.util.Collections.emptyList();
       } else {
         bindings_ = null;
         bindingsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       if (auditConfigsBuilder_ == null) {
         auditConfigs_ = java.util.Collections.emptyList();
       } else {
         auditConfigs_ = null;
         auditConfigsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000002);
       etag_ = com.google.protobuf.ByteString.EMPTY;
+
       return this;
     }
 
@@ -742,43 +715,29 @@ public com.google.iam.v1.Policy build() {
     @java.lang.Override
     public com.google.iam.v1.Policy buildPartial() {
       com.google.iam.v1.Policy result = new com.google.iam.v1.Policy(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.iam.v1.Policy result) {
+      int from_bitField0_ = bitField0_;
+      result.version_ = version_;
       if (bindingsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           bindings_ = java.util.Collections.unmodifiableList(bindings_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.bindings_ = bindings_;
       } else {
         result.bindings_ = bindingsBuilder_.build();
       }
       if (auditConfigsBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           auditConfigs_ = java.util.Collections.unmodifiableList(auditConfigs_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.auditConfigs_ = auditConfigs_;
       } else {
         result.auditConfigs_ = auditConfigsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.iam.v1.Policy result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.version_ = version_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.etag_ = etag_;
-      }
+      result.etag_ = etag_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -833,7 +792,7 @@ public Builder mergeFrom(com.google.iam.v1.Policy other) {
         if (!other.bindings_.isEmpty()) {
           if (bindings_.isEmpty()) {
             bindings_ = other.bindings_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureBindingsIsMutable();
             bindings_.addAll(other.bindings_);
@@ -846,7 +805,7 @@ public Builder mergeFrom(com.google.iam.v1.Policy other) {
             bindingsBuilder_.dispose();
             bindingsBuilder_ = null;
             bindings_ = other.bindings_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             bindingsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getBindingsFieldBuilder()
@@ -860,7 +819,7 @@ public Builder mergeFrom(com.google.iam.v1.Policy other) {
         if (!other.auditConfigs_.isEmpty()) {
           if (auditConfigs_.isEmpty()) {
             auditConfigs_ = other.auditConfigs_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureAuditConfigsIsMutable();
             auditConfigs_.addAll(other.auditConfigs_);
@@ -873,7 +832,7 @@ public Builder mergeFrom(com.google.iam.v1.Policy other) {
             auditConfigsBuilder_.dispose();
             auditConfigsBuilder_ = null;
             auditConfigs_ = other.auditConfigs_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000002);
             auditConfigsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getAuditConfigsFieldBuilder()
@@ -915,13 +874,13 @@ public Builder mergeFrom(
             case 8:
               {
                 version_ = input.readInt32();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 26:
               {
                 etag_ = input.readBytes();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 26
             case 34:
@@ -974,27 +933,21 @@ public Builder mergeFrom(
      *
      * 
      * Specifies the format of the policy.
-     *
      * Valid values are `0`, `1`, and `3`. Requests that specify an invalid value
      * are rejected.
-     *
      * Any operation that affects conditional role bindings must specify version
      * `3`. This requirement applies to the following operations:
-     *
      * * Getting a policy that includes a conditional role binding
      * * Adding a conditional role binding to a policy
      * * Changing a conditional role binding in a policy
      * * Removing any role binding, with or without a condition, from a policy
      *   that includes conditions
-     *
      * **Important:** If you use IAM Conditions, you must include the `etag` field
      * whenever you call `setIamPolicy`. If you omit this field, then IAM allows
      * you to overwrite a version `3` policy with a version `1` policy, and all of
      * the conditions in the version `3` policy are lost.
-     *
      * If a policy does not include any conditions, operations on that policy may
      * specify any valid version or leave the field unset.
-     *
      * To learn which resources support conditions in their IAM policies, see the
      * [IAM
      * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -1014,27 +967,21 @@ public int getVersion() {
      *
      * 
      * Specifies the format of the policy.
-     *
      * Valid values are `0`, `1`, and `3`. Requests that specify an invalid value
      * are rejected.
-     *
      * Any operation that affects conditional role bindings must specify version
      * `3`. This requirement applies to the following operations:
-     *
      * * Getting a policy that includes a conditional role binding
      * * Adding a conditional role binding to a policy
      * * Changing a conditional role binding in a policy
      * * Removing any role binding, with or without a condition, from a policy
      *   that includes conditions
-     *
      * **Important:** If you use IAM Conditions, you must include the `etag` field
      * whenever you call `setIamPolicy`. If you omit this field, then IAM allows
      * you to overwrite a version `3` policy with a version `1` policy, and all of
      * the conditions in the version `3` policy are lost.
-     *
      * If a policy does not include any conditions, operations on that policy may
      * specify any valid version or leave the field unset.
-     *
      * To learn which resources support conditions in their IAM policies, see the
      * [IAM
      * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -1048,7 +995,6 @@ public int getVersion() {
     public Builder setVersion(int value) {
 
       version_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1058,27 +1004,21 @@ public Builder setVersion(int value) {
      *
      * 
      * Specifies the format of the policy.
-     *
      * Valid values are `0`, `1`, and `3`. Requests that specify an invalid value
      * are rejected.
-     *
      * Any operation that affects conditional role bindings must specify version
      * `3`. This requirement applies to the following operations:
-     *
      * * Getting a policy that includes a conditional role binding
      * * Adding a conditional role binding to a policy
      * * Changing a conditional role binding in a policy
      * * Removing any role binding, with or without a condition, from a policy
      *   that includes conditions
-     *
      * **Important:** If you use IAM Conditions, you must include the `etag` field
      * whenever you call `setIamPolicy`. If you omit this field, then IAM allows
      * you to overwrite a version `3` policy with a version `1` policy, and all of
      * the conditions in the version `3` policy are lost.
-     *
      * If a policy does not include any conditions, operations on that policy may
      * specify any valid version or leave the field unset.
-     *
      * To learn which resources support conditions in their IAM policies, see the
      * [IAM
      * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -1089,7 +1029,7 @@ public Builder setVersion(int value) {
      * @return This builder for chaining.
      */
     public Builder clearVersion() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       version_ = 0;
       onChanged();
       return this;
@@ -1098,9 +1038,9 @@ public Builder clearVersion() {
     private java.util.List bindings_ = java.util.Collections.emptyList();
 
     private void ensureBindingsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         bindings_ = new java.util.ArrayList(bindings_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1117,7 +1057,6 @@ private void ensureBindingsIsMutable() {
      * Associates a list of `members`, or principals, with a `role`. Optionally,
      * may specify a `condition` that determines how and when the `bindings` are
      * applied. Each of the `bindings` must contain at least one principal.
-     *
      * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
      * of these principals can be Google groups. Each occurrence of a principal
      * counts towards these limits. For example, if the `bindings` grant 50
@@ -1143,7 +1082,6 @@ public java.util.List getBindingsList() {
      * Associates a list of `members`, or principals, with a `role`. Optionally,
      * may specify a `condition` that determines how and when the `bindings` are
      * applied. Each of the `bindings` must contain at least one principal.
-     *
      * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
      * of these principals can be Google groups. Each occurrence of a principal
      * counts towards these limits. For example, if the `bindings` grant 50
@@ -1169,7 +1107,6 @@ public int getBindingsCount() {
      * Associates a list of `members`, or principals, with a `role`. Optionally,
      * may specify a `condition` that determines how and when the `bindings` are
      * applied. Each of the `bindings` must contain at least one principal.
-     *
      * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
      * of these principals can be Google groups. Each occurrence of a principal
      * counts towards these limits. For example, if the `bindings` grant 50
@@ -1195,7 +1132,6 @@ public com.google.iam.v1.Binding getBindings(int index) {
      * Associates a list of `members`, or principals, with a `role`. Optionally,
      * may specify a `condition` that determines how and when the `bindings` are
      * applied. Each of the `bindings` must contain at least one principal.
-     *
      * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
      * of these principals can be Google groups. Each occurrence of a principal
      * counts towards these limits. For example, if the `bindings` grant 50
@@ -1227,7 +1163,6 @@ public Builder setBindings(int index, com.google.iam.v1.Binding value) {
      * Associates a list of `members`, or principals, with a `role`. Optionally,
      * may specify a `condition` that determines how and when the `bindings` are
      * applied. Each of the `bindings` must contain at least one principal.
-     *
      * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
      * of these principals can be Google groups. Each occurrence of a principal
      * counts towards these limits. For example, if the `bindings` grant 50
@@ -1256,7 +1191,6 @@ public Builder setBindings(int index, com.google.iam.v1.Binding.Builder builderF
      * Associates a list of `members`, or principals, with a `role`. Optionally,
      * may specify a `condition` that determines how and when the `bindings` are
      * applied. Each of the `bindings` must contain at least one principal.
-     *
      * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
      * of these principals can be Google groups. Each occurrence of a principal
      * counts towards these limits. For example, if the `bindings` grant 50
@@ -1288,7 +1222,6 @@ public Builder addBindings(com.google.iam.v1.Binding value) {
      * Associates a list of `members`, or principals, with a `role`. Optionally,
      * may specify a `condition` that determines how and when the `bindings` are
      * applied. Each of the `bindings` must contain at least one principal.
-     *
      * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
      * of these principals can be Google groups. Each occurrence of a principal
      * counts towards these limits. For example, if the `bindings` grant 50
@@ -1320,7 +1253,6 @@ public Builder addBindings(int index, com.google.iam.v1.Binding value) {
      * Associates a list of `members`, or principals, with a `role`. Optionally,
      * may specify a `condition` that determines how and when the `bindings` are
      * applied. Each of the `bindings` must contain at least one principal.
-     *
      * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
      * of these principals can be Google groups. Each occurrence of a principal
      * counts towards these limits. For example, if the `bindings` grant 50
@@ -1349,7 +1281,6 @@ public Builder addBindings(com.google.iam.v1.Binding.Builder builderForValue) {
      * Associates a list of `members`, or principals, with a `role`. Optionally,
      * may specify a `condition` that determines how and when the `bindings` are
      * applied. Each of the `bindings` must contain at least one principal.
-     *
      * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
      * of these principals can be Google groups. Each occurrence of a principal
      * counts towards these limits. For example, if the `bindings` grant 50
@@ -1378,7 +1309,6 @@ public Builder addBindings(int index, com.google.iam.v1.Binding.Builder builderF
      * Associates a list of `members`, or principals, with a `role`. Optionally,
      * may specify a `condition` that determines how and when the `bindings` are
      * applied. Each of the `bindings` must contain at least one principal.
-     *
      * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
      * of these principals can be Google groups. Each occurrence of a principal
      * counts towards these limits. For example, if the `bindings` grant 50
@@ -1407,7 +1337,6 @@ public Builder addAllBindings(java.lang.Iterable getBindingsO
      * Associates a list of `members`, or principals, with a `role`. Optionally,
      * may specify a `condition` that determines how and when the `bindings` are
      * applied. Each of the `bindings` must contain at least one principal.
-     *
      * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
      * of these principals can be Google groups. Each occurrence of a principal
      * counts towards these limits. For example, if the `bindings` grant 50
@@ -1561,7 +1485,6 @@ public com.google.iam.v1.Binding.Builder addBindingsBuilder() {
      * Associates a list of `members`, or principals, with a `role`. Optionally,
      * may specify a `condition` that determines how and when the `bindings` are
      * applied. Each of the `bindings` must contain at least one principal.
-     *
      * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
      * of these principals can be Google groups. Each occurrence of a principal
      * counts towards these limits. For example, if the `bindings` grant 50
@@ -1584,7 +1507,6 @@ public com.google.iam.v1.Binding.Builder addBindingsBuilder(int index) {
      * Associates a list of `members`, or principals, with a `role`. Optionally,
      * may specify a `condition` that determines how and when the `bindings` are
      * applied. Each of the `bindings` must contain at least one principal.
-     *
      * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
      * of these principals can be Google groups. Each occurrence of a principal
      * counts towards these limits. For example, if the `bindings` grant 50
@@ -1610,7 +1532,7 @@ public java.util.List getBindingsBuilderList(
                 com.google.iam.v1.Binding,
                 com.google.iam.v1.Binding.Builder,
                 com.google.iam.v1.BindingOrBuilder>(
-                bindings_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                bindings_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         bindings_ = null;
       }
       return bindingsBuilder_;
@@ -1620,9 +1542,9 @@ public java.util.List getBindingsBuilderList(
         java.util.Collections.emptyList();
 
     private void ensureAuditConfigsIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         auditConfigs_ = new java.util.ArrayList(auditConfigs_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -1847,7 +1769,7 @@ public Builder addAllAuditConfigs(
     public Builder clearAuditConfigs() {
       if (auditConfigsBuilder_ == null) {
         auditConfigs_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         auditConfigsBuilder_.clear();
@@ -1975,7 +1897,7 @@ public java.util.List getAuditConfigsBuil
                 com.google.iam.v1.AuditConfig,
                 com.google.iam.v1.AuditConfig.Builder,
                 com.google.iam.v1.AuditConfigOrBuilder>(
-                auditConfigs_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
+                auditConfigs_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         auditConfigs_ = null;
       }
       return auditConfigsBuilder_;
@@ -1994,7 +1916,6 @@ public java.util.List getAuditConfigsBuil
      * conditions: An `etag` is returned in the response to `getIamPolicy`, and
      * systems are expected to put that etag in the request to `setIamPolicy` to
      * ensure that their change will be applied to the same version of the policy.
-     *
      * **Important:** If you use IAM Conditions, you must include the `etag` field
      * whenever you call `setIamPolicy`. If you omit this field, then IAM allows
      * you to overwrite a version `3` policy with a version `1` policy, and all of
@@ -2021,7 +1942,6 @@ public com.google.protobuf.ByteString getEtag() {
      * conditions: An `etag` is returned in the response to `getIamPolicy`, and
      * systems are expected to put that etag in the request to `setIamPolicy` to
      * ensure that their change will be applied to the same version of the policy.
-     *
      * **Important:** If you use IAM Conditions, you must include the `etag` field
      * whenever you call `setIamPolicy`. If you omit this field, then IAM allows
      * you to overwrite a version `3` policy with a version `1` policy, and all of
@@ -2037,8 +1957,8 @@ public Builder setEtag(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       etag_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2054,7 +1974,6 @@ public Builder setEtag(com.google.protobuf.ByteString value) {
      * conditions: An `etag` is returned in the response to `getIamPolicy`, and
      * systems are expected to put that etag in the request to `setIamPolicy` to
      * ensure that their change will be applied to the same version of the policy.
-     *
      * **Important:** If you use IAM Conditions, you must include the `etag` field
      * whenever you call `setIamPolicy`. If you omit this field, then IAM allows
      * you to overwrite a version `3` policy with a version `1` policy, and all of
@@ -2066,7 +1985,7 @@ public Builder setEtag(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearEtag() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       etag_ = getDefaultInstance().getEtag();
       onChanged();
       return this;
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDelta.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDelta.java
index 48648760f1..7faf5c852a 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDelta.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDelta.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PolicyDelta();
   }
 
+  @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.iam.v1.PolicyProto.internal_static_google_iam_v1_PolicyDelta_descriptor;
   }
@@ -64,8 +68,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int BINDING_DELTAS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List bindingDeltas_;
 
   /**
@@ -140,8 +142,6 @@ public com.google.iam.v1.BindingDeltaOrBuilder getBindingDeltasOrBuilder(int ind
   }
 
   public static final int AUDIT_CONFIG_DELTAS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List auditConfigDeltas_;
 
   /**
@@ -423,7 +423,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (bindingDeltasBuilder_ == null) {
         bindingDeltas_ = java.util.Collections.emptyList();
       } else {
@@ -463,15 +462,7 @@ public com.google.iam.v1.PolicyDelta build() {
     @java.lang.Override
     public com.google.iam.v1.PolicyDelta buildPartial() {
       com.google.iam.v1.PolicyDelta result = new com.google.iam.v1.PolicyDelta(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.iam.v1.PolicyDelta result) {
+      int from_bitField0_ = bitField0_;
       if (bindingDeltasBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           bindingDeltas_ = java.util.Collections.unmodifiableList(bindingDeltas_);
@@ -490,10 +481,8 @@ private void buildPartialRepeatedFields(com.google.iam.v1.PolicyDelta result) {
       } else {
         result.auditConfigDeltas_ = auditConfigDeltasBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.iam.v1.PolicyDelta result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDeltaOrBuilder.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDeltaOrBuilder.java
index e169897c1e..07d4f20c4e 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDeltaOrBuilder.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDeltaOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 public interface PolicyDeltaOrBuilder
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyOrBuilder.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyOrBuilder.java
index 6a66294242..1361fdcf8e 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyOrBuilder.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 public interface PolicyOrBuilder
@@ -29,27 +28,21 @@ public interface PolicyOrBuilder
    *
    * 
    * Specifies the format of the policy.
-   *
    * Valid values are `0`, `1`, and `3`. Requests that specify an invalid value
    * are rejected.
-   *
    * Any operation that affects conditional role bindings must specify version
    * `3`. This requirement applies to the following operations:
-   *
    * * Getting a policy that includes a conditional role binding
    * * Adding a conditional role binding to a policy
    * * Changing a conditional role binding in a policy
    * * Removing any role binding, with or without a condition, from a policy
    *   that includes conditions
-   *
    * **Important:** If you use IAM Conditions, you must include the `etag` field
    * whenever you call `setIamPolicy`. If you omit this field, then IAM allows
    * you to overwrite a version `3` policy with a version `1` policy, and all of
    * the conditions in the version `3` policy are lost.
-   *
    * If a policy does not include any conditions, operations on that policy may
    * specify any valid version or leave the field unset.
-   *
    * To learn which resources support conditions in their IAM policies, see the
    * [IAM
    * documentation](https://cloud.google.com/iam/help/conditions/resource-policies).
@@ -68,7 +61,6 @@ public interface PolicyOrBuilder
    * Associates a list of `members`, or principals, with a `role`. Optionally,
    * may specify a `condition` that determines how and when the `bindings` are
    * applied. Each of the `bindings` must contain at least one principal.
-   *
    * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
    * of these principals can be Google groups. Each occurrence of a principal
    * counts towards these limits. For example, if the `bindings` grant 50
@@ -88,7 +80,6 @@ public interface PolicyOrBuilder
    * Associates a list of `members`, or principals, with a `role`. Optionally,
    * may specify a `condition` that determines how and when the `bindings` are
    * applied. Each of the `bindings` must contain at least one principal.
-   *
    * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
    * of these principals can be Google groups. Each occurrence of a principal
    * counts towards these limits. For example, if the `bindings` grant 50
@@ -108,7 +99,6 @@ public interface PolicyOrBuilder
    * Associates a list of `members`, or principals, with a `role`. Optionally,
    * may specify a `condition` that determines how and when the `bindings` are
    * applied. Each of the `bindings` must contain at least one principal.
-   *
    * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
    * of these principals can be Google groups. Each occurrence of a principal
    * counts towards these limits. For example, if the `bindings` grant 50
@@ -128,7 +118,6 @@ public interface PolicyOrBuilder
    * Associates a list of `members`, or principals, with a `role`. Optionally,
    * may specify a `condition` that determines how and when the `bindings` are
    * applied. Each of the `bindings` must contain at least one principal.
-   *
    * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
    * of these principals can be Google groups. Each occurrence of a principal
    * counts towards these limits. For example, if the `bindings` grant 50
@@ -148,7 +137,6 @@ public interface PolicyOrBuilder
    * Associates a list of `members`, or principals, with a `role`. Optionally,
    * may specify a `condition` that determines how and when the `bindings` are
    * applied. Each of the `bindings` must contain at least one principal.
-   *
    * The `bindings` in a `Policy` can refer to up to 1,500 principals; up to 250
    * of these principals can be Google groups. Each occurrence of a principal
    * counts towards these limits. For example, if the `bindings` grant 50
@@ -227,7 +215,6 @@ public interface PolicyOrBuilder
    * conditions: An `etag` is returned in the response to `getIamPolicy`, and
    * systems are expected to put that etag in the request to `setIamPolicy` to
    * ensure that their change will be applied to the same version of the policy.
-   *
    * **Important:** If you use IAM Conditions, you must include the `etag` field
    * whenever you call `setIamPolicy`. If you omit this field, then IAM allows
    * you to overwrite a version `3` policy with a version `1` policy, and all of
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyProto.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyProto.java
index 9a02e2c3ee..8f73d07026 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyProto.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 public final class PolicyProto {
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/ResourcePolicyMember.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/ResourcePolicyMember.java
index 0512dee22f..89c7b5ea09 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/ResourcePolicyMember.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/ResourcePolicyMember.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/resource_policy_member.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 /**
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ResourcePolicyMember();
   }
 
+  @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.iam.v1.ResourcePolicyMemberProto
         .internal_static_google_iam_v1_ResourcePolicyMember_descriptor;
@@ -67,9 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int IAM_POLICY_NAME_PRINCIPAL_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object iamPolicyNamePrincipal_ = "";
+  private volatile java.lang.Object iamPolicyNamePrincipal_;
 
   /**
    *
@@ -79,7 +81,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * user-assigned name (https://google.aip.dev/122). If a resource is deleted
    * and recreated with the same name, the binding will be applicable to the new
    * resource.
-   *
    * Example:
    * `principal://parametermanager.googleapis.com/projects/12345/name/locations/us-central1-a/parameters/my-parameter`
    * 

@@ -109,7 +110,6 @@ public java.lang.String getIamPolicyNamePrincipal() {
    * user-assigned name (https://google.aip.dev/122). If a resource is deleted
    * and recreated with the same name, the binding will be applicable to the new
    * resource.
-   *
    * Example:
    * `principal://parametermanager.googleapis.com/projects/12345/name/locations/us-central1-a/parameters/my-parameter`
    * 

@@ -132,9 +132,7 @@ public com.google.protobuf.ByteString getIamPolicyNamePrincipalBytes() {
   }
 
   public static final int IAM_POLICY_UID_PRINCIPAL_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object iamPolicyUidPrincipal_ = "";
+  private volatile java.lang.Object iamPolicyUidPrincipal_;
 
   /**
    *
@@ -144,7 +142,6 @@ public com.google.protobuf.ByteString getIamPolicyNamePrincipalBytes() {
    * system-assigned unique identifier (https://google.aip.dev/148#uid). If a
    * resource is deleted and recreated with the same name, the binding will not
    * be applicable to the new resource
-   *
    * Example:
    * `principal://parametermanager.googleapis.com/projects/12345/uid/locations/us-central1-a/parameters/a918fed5`
    * 

@@ -174,7 +171,6 @@ public java.lang.String getIamPolicyUidPrincipal() {
    * system-assigned unique identifier (https://google.aip.dev/148#uid). If a
    * resource is deleted and recreated with the same name, the binding will not
    * be applicable to the new resource
-   *
    * Example:
    * `principal://parametermanager.googleapis.com/projects/12345/uid/locations/us-central1-a/parameters/a918fed5`
    * 

@@ -403,9 +399,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       iamPolicyNamePrincipal_ = "";
+
       iamPolicyUidPrincipal_ = "";
+
       return this;
     }
 
@@ -433,23 +430,12 @@ public com.google.iam.v1.ResourcePolicyMember build() {
     public com.google.iam.v1.ResourcePolicyMember buildPartial() {
       com.google.iam.v1.ResourcePolicyMember result =
           new com.google.iam.v1.ResourcePolicyMember(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.iamPolicyNamePrincipal_ = iamPolicyNamePrincipal_;
+      result.iamPolicyUidPrincipal_ = iamPolicyUidPrincipal_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v1.ResourcePolicyMember result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.iamPolicyNamePrincipal_ = iamPolicyNamePrincipal_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.iamPolicyUidPrincipal_ = iamPolicyUidPrincipal_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -497,12 +483,10 @@ public Builder mergeFrom(com.google.iam.v1.ResourcePolicyMember other) {
       if (other == com.google.iam.v1.ResourcePolicyMember.getDefaultInstance()) return this;
       if (!other.getIamPolicyNamePrincipal().isEmpty()) {
         iamPolicyNamePrincipal_ = other.iamPolicyNamePrincipal_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getIamPolicyUidPrincipal().isEmpty()) {
         iamPolicyUidPrincipal_ = other.iamPolicyUidPrincipal_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -534,13 +518,13 @@ public Builder mergeFrom(
             case 10:
               {
                 iamPolicyNamePrincipal_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 iamPolicyUidPrincipal_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -560,8 +544,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object iamPolicyNamePrincipal_ = "";
 
     /**
@@ -572,7 +554,6 @@ public Builder mergeFrom(
      * user-assigned name (https://google.aip.dev/122). If a resource is deleted
      * and recreated with the same name, the binding will be applicable to the new
      * resource.
-     *
      * Example:
      * `principal://parametermanager.googleapis.com/projects/12345/name/locations/us-central1-a/parameters/my-parameter`
      * 

@@ -602,7 +583,6 @@ public java.lang.String getIamPolicyNamePrincipal() {
      * user-assigned name (https://google.aip.dev/122). If a resource is deleted
      * and recreated with the same name, the binding will be applicable to the new
      * resource.
-     *
      * Example:
      * `principal://parametermanager.googleapis.com/projects/12345/name/locations/us-central1-a/parameters/my-parameter`
      * 

@@ -632,7 +612,6 @@ public com.google.protobuf.ByteString getIamPolicyNamePrincipalBytes() {
      * user-assigned name (https://google.aip.dev/122). If a resource is deleted
      * and recreated with the same name, the binding will be applicable to the new
      * resource.
-     *
      * Example:
      * `principal://parametermanager.googleapis.com/projects/12345/name/locations/us-central1-a/parameters/my-parameter`
      * 

@@ -647,8 +626,8 @@ public Builder setIamPolicyNamePrincipal(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       iamPolicyNamePrincipal_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -661,7 +640,6 @@ public Builder setIamPolicyNamePrincipal(java.lang.String value) {
      * user-assigned name (https://google.aip.dev/122). If a resource is deleted
      * and recreated with the same name, the binding will be applicable to the new
      * resource.
-     *
      * Example:
      * `principal://parametermanager.googleapis.com/projects/12345/name/locations/us-central1-a/parameters/my-parameter`
      * 

@@ -672,8 +650,8 @@ public Builder setIamPolicyNamePrincipal(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearIamPolicyNamePrincipal() {
+
       iamPolicyNamePrincipal_ = getDefaultInstance().getIamPolicyNamePrincipal();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -686,7 +664,6 @@ public Builder clearIamPolicyNamePrincipal() {
      * user-assigned name (https://google.aip.dev/122). If a resource is deleted
      * and recreated with the same name, the binding will be applicable to the new
      * resource.
-     *
      * Example:
      * `principal://parametermanager.googleapis.com/projects/12345/name/locations/us-central1-a/parameters/my-parameter`
      * 

@@ -702,8 +679,8 @@ public Builder setIamPolicyNamePrincipalBytes(com.google.protobuf.ByteString val
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       iamPolicyNamePrincipal_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -718,7 +695,6 @@ public Builder setIamPolicyNamePrincipalBytes(com.google.protobuf.ByteString val
      * system-assigned unique identifier (https://google.aip.dev/148#uid). If a
      * resource is deleted and recreated with the same name, the binding will not
      * be applicable to the new resource
-     *
      * Example:
      * `principal://parametermanager.googleapis.com/projects/12345/uid/locations/us-central1-a/parameters/a918fed5`
      * 

@@ -748,7 +724,6 @@ public java.lang.String getIamPolicyUidPrincipal() {
      * system-assigned unique identifier (https://google.aip.dev/148#uid). If a
      * resource is deleted and recreated with the same name, the binding will not
      * be applicable to the new resource
-     *
      * Example:
      * `principal://parametermanager.googleapis.com/projects/12345/uid/locations/us-central1-a/parameters/a918fed5`
      * 

@@ -778,7 +753,6 @@ public com.google.protobuf.ByteString getIamPolicyUidPrincipalBytes() {
      * system-assigned unique identifier (https://google.aip.dev/148#uid). If a
      * resource is deleted and recreated with the same name, the binding will not
      * be applicable to the new resource
-     *
      * Example:
      * `principal://parametermanager.googleapis.com/projects/12345/uid/locations/us-central1-a/parameters/a918fed5`
      * 

@@ -793,8 +767,8 @@ public Builder setIamPolicyUidPrincipal(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       iamPolicyUidPrincipal_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -807,7 +781,6 @@ public Builder setIamPolicyUidPrincipal(java.lang.String value) {
      * system-assigned unique identifier (https://google.aip.dev/148#uid). If a
      * resource is deleted and recreated with the same name, the binding will not
      * be applicable to the new resource
-     *
      * Example:
      * `principal://parametermanager.googleapis.com/projects/12345/uid/locations/us-central1-a/parameters/a918fed5`
      * 

@@ -818,8 +791,8 @@ public Builder setIamPolicyUidPrincipal(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearIamPolicyUidPrincipal() {
+
       iamPolicyUidPrincipal_ = getDefaultInstance().getIamPolicyUidPrincipal();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -832,7 +805,6 @@ public Builder clearIamPolicyUidPrincipal() {
      * system-assigned unique identifier (https://google.aip.dev/148#uid). If a
      * resource is deleted and recreated with the same name, the binding will not
      * be applicable to the new resource
-     *
      * Example:
      * `principal://parametermanager.googleapis.com/projects/12345/uid/locations/us-central1-a/parameters/a918fed5`
      * 

@@ -848,8 +820,8 @@ public Builder setIamPolicyUidPrincipalBytes(com.google.protobuf.ByteString valu
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       iamPolicyUidPrincipal_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/ResourcePolicyMemberOrBuilder.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/ResourcePolicyMemberOrBuilder.java
index a3ac24cb33..bd39588f88 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/ResourcePolicyMemberOrBuilder.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/ResourcePolicyMemberOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/resource_policy_member.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 public interface ResourcePolicyMemberOrBuilder
@@ -32,7 +31,6 @@ public interface ResourcePolicyMemberOrBuilder
    * user-assigned name (https://google.aip.dev/122). If a resource is deleted
    * and recreated with the same name, the binding will be applicable to the new
    * resource.
-   *
    * Example:
    * `principal://parametermanager.googleapis.com/projects/12345/name/locations/us-central1-a/parameters/my-parameter`
    * 

@@ -51,7 +49,6 @@ public interface ResourcePolicyMemberOrBuilder
    * user-assigned name (https://google.aip.dev/122). If a resource is deleted
    * and recreated with the same name, the binding will be applicable to the new
    * resource.
-   *
    * Example:
    * `principal://parametermanager.googleapis.com/projects/12345/name/locations/us-central1-a/parameters/my-parameter`
    * 

@@ -70,7 +67,6 @@ public interface ResourcePolicyMemberOrBuilder
    * system-assigned unique identifier (https://google.aip.dev/148#uid). If a
    * resource is deleted and recreated with the same name, the binding will not
    * be applicable to the new resource
-   *
    * Example:
    * `principal://parametermanager.googleapis.com/projects/12345/uid/locations/us-central1-a/parameters/a918fed5`
    * 

@@ -89,7 +85,6 @@ public interface ResourcePolicyMemberOrBuilder
    * system-assigned unique identifier (https://google.aip.dev/148#uid). If a
    * resource is deleted and recreated with the same name, the binding will not
    * be applicable to the new resource
-   *
    * Example:
    * `principal://parametermanager.googleapis.com/projects/12345/uid/locations/us-central1-a/parameters/a918fed5`
    * 

diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/ResourcePolicyMemberProto.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/ResourcePolicyMemberProto.java
index 40e28effcc..7f402771ac 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/ResourcePolicyMemberProto.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/ResourcePolicyMemberProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/resource_policy_member.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 public final class ResourcePolicyMemberProto {
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/SetIamPolicyRequest.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/SetIamPolicyRequest.java
index a52591ee34..ce9b6db2d9 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/SetIamPolicyRequest.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/SetIamPolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/iam_policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SetIamPolicyRequest();
   }
 
+  @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.iam.v1.IamPolicyProto
         .internal_static_google_iam_v1_SetIamPolicyRequest_descriptor;
@@ -64,11 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v1.SetIamPolicyRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int RESOURCE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object resource_ = "";
+  private volatile java.lang.Object resource_;
 
   /**
    *
@@ -143,7 +144,7 @@ public com.google.protobuf.ByteString getResourceBytes() {
    */
   @java.lang.Override
   public boolean hasPolicy() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return policy_ != null;
   }
 
   /**
@@ -179,7 +180,7 @@ public com.google.iam.v1.Policy getPolicy() {
    */
   @java.lang.Override
   public com.google.iam.v1.PolicyOrBuilder getPolicyOrBuilder() {
-    return policy_ == null ? com.google.iam.v1.Policy.getDefaultInstance() : policy_;
+    return getPolicy();
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 3;
@@ -192,7 +193,6 @@ public com.google.iam.v1.PolicyOrBuilder getPolicyOrBuilder() {
    * OPTIONAL: A FieldMask specifying which fields of the policy to modify. Only
    * the fields in the mask will be modified. If no mask is provided, the
    * following default mask is used:
-   *
    * `paths: "bindings, etag"`
    * 

    *
@@ -202,7 +202,7 @@ public com.google.iam.v1.PolicyOrBuilder getPolicyOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateMask() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return updateMask_ != null;
   }
 
   /**
@@ -212,7 +212,6 @@ public boolean hasUpdateMask() {
    * OPTIONAL: A FieldMask specifying which fields of the policy to modify. Only
    * the fields in the mask will be modified. If no mask is provided, the
    * following default mask is used:
-   *
    * `paths: "bindings, etag"`
    * 

    *
@@ -232,7 +231,6 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    * OPTIONAL: A FieldMask specifying which fields of the policy to modify. Only
    * the fields in the mask will be modified. If no mask is provided, the
    * following default mask is used:
-   *
    * `paths: "bindings, etag"`
    * 

    *
@@ -240,7 +238,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+    return getUpdateMask();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -260,10 +258,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(resource_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, resource_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policy_ != null) {
       output.writeMessage(2, getPolicy());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateMask_ != null) {
       output.writeMessage(3, getUpdateMask());
     }
     getUnknownFields().writeTo(output);
@@ -278,10 +276,10 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(resource_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, resource_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policy_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getPolicy());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateMask_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getUpdateMask());
     }
     size += getUnknownFields().getSerializedSize();
@@ -458,35 +456,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.SetIamPolicyRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPolicyFieldBuilder();
-        getUpdateMaskFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       resource_ = "";
-      policy_ = null;
-      if (policyBuilder_ != null) {
-        policyBuilder_.dispose();
+
+      if (policyBuilder_ == null) {
+        policy_ = null;
+      } else {
+        policy_ = null;
         policyBuilder_ = null;
       }
-      updateMask_ = null;
-      if (updateMaskBuilder_ != null) {
-        updateMaskBuilder_.dispose();
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+      } else {
+        updateMask_ = null;
         updateMaskBuilder_ = null;
       }
       return this;
@@ -516,30 +506,21 @@ public com.google.iam.v1.SetIamPolicyRequest build() {
     public com.google.iam.v1.SetIamPolicyRequest buildPartial() {
       com.google.iam.v1.SetIamPolicyRequest result =
           new com.google.iam.v1.SetIamPolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.resource_ = resource_;
+      if (policyBuilder_ == null) {
+        result.policy_ = policy_;
+      } else {
+        result.policy_ = policyBuilder_.build();
+      }
+      if (updateMaskBuilder_ == null) {
+        result.updateMask_ = updateMask_;
+      } else {
+        result.updateMask_ = updateMaskBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v1.SetIamPolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.resource_ = resource_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.policy_ = policyBuilder_ == null ? policy_ : policyBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -587,7 +568,6 @@ public Builder mergeFrom(com.google.iam.v1.SetIamPolicyRequest other) {
       if (other == com.google.iam.v1.SetIamPolicyRequest.getDefaultInstance()) return this;
       if (!other.getResource().isEmpty()) {
         resource_ = other.resource_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasPolicy()) {
@@ -625,19 +605,19 @@ public Builder mergeFrom(
             case 10:
               {
                 resource_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getPolicyFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -657,8 +637,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object resource_ = "";
 
     /**
@@ -732,8 +710,8 @@ public Builder setResource(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       resource_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -753,8 +731,8 @@ public Builder setResource(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResource() {
+
       resource_ = getDefaultInstance().getResource();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -779,8 +757,8 @@ public Builder setResourceBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       resource_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -807,7 +785,7 @@ public Builder setResourceBytes(com.google.protobuf.ByteString value) {
      * @return Whether the policy field is set.
      */
     public boolean hasPolicy() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return policyBuilder_ != null || policy_ != null;
     }
 
     /**
@@ -850,11 +828,11 @@ public Builder setPolicy(com.google.iam.v1.Policy value) {
           throw new NullPointerException();
         }
         policy_ = value;
+        onChanged();
       } else {
         policyBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -873,11 +851,11 @@ public Builder setPolicy(com.google.iam.v1.Policy value) {
     public Builder setPolicy(com.google.iam.v1.Policy.Builder builderForValue) {
       if (policyBuilder_ == null) {
         policy_ = builderForValue.build();
+        onChanged();
       } else {
         policyBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -895,20 +873,16 @@ public Builder setPolicy(com.google.iam.v1.Policy.Builder builderForValue) {
      */
     public Builder mergePolicy(com.google.iam.v1.Policy value) {
       if (policyBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && policy_ != null
-            && policy_ != com.google.iam.v1.Policy.getDefaultInstance()) {
-          getPolicyBuilder().mergeFrom(value);
+        if (policy_ != null) {
+          policy_ = com.google.iam.v1.Policy.newBuilder(policy_).mergeFrom(value).buildPartial();
         } else {
           policy_ = value;
         }
+        onChanged();
       } else {
         policyBuilder_.mergeFrom(value);
       }
-      if (policy_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -925,13 +899,14 @@ public Builder mergePolicy(com.google.iam.v1.Policy value) {
      * .google.iam.v1.Policy policy = 2 [(.google.api.field_behavior) = REQUIRED];
      */
     public Builder clearPolicy() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      policy_ = null;
-      if (policyBuilder_ != null) {
-        policyBuilder_.dispose();
+      if (policyBuilder_ == null) {
+        policy_ = null;
+        onChanged();
+      } else {
+        policy_ = null;
         policyBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -948,7 +923,7 @@ public Builder clearPolicy() {
      * .google.iam.v1.Policy policy = 2 [(.google.api.field_behavior) = REQUIRED];
      */
     public com.google.iam.v1.Policy.Builder getPolicyBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getPolicyFieldBuilder().getBuilder();
     }
@@ -1015,7 +990,6 @@ public com.google.iam.v1.PolicyOrBuilder getPolicyOrBuilder() {
      * OPTIONAL: A FieldMask specifying which fields of the policy to modify. Only
      * the fields in the mask will be modified. If no mask is provided, the
      * following default mask is used:
-     *
      * `paths: "bindings, etag"`
      * 

      *
@@ -1024,7 +998,7 @@ public com.google.iam.v1.PolicyOrBuilder getPolicyOrBuilder() {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return updateMaskBuilder_ != null || updateMask_ != null;
     }
 
     /**
@@ -1034,7 +1008,6 @@ public boolean hasUpdateMask() {
      * OPTIONAL: A FieldMask specifying which fields of the policy to modify. Only
      * the fields in the mask will be modified. If no mask is provided, the
      * following default mask is used:
-     *
      * `paths: "bindings, etag"`
      * 

      *
@@ -1059,7 +1032,6 @@ public com.google.protobuf.FieldMask getUpdateMask() {
      * OPTIONAL: A FieldMask specifying which fields of the policy to modify. Only
      * the fields in the mask will be modified. If no mask is provided, the
      * following default mask is used:
-     *
      * `paths: "bindings, etag"`
      * 

      *
@@ -1071,11 +1043,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
+        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1086,7 +1058,6 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
      * OPTIONAL: A FieldMask specifying which fields of the policy to modify. Only
      * the fields in the mask will be modified. If no mask is provided, the
      * following default mask is used:
-     *
      * `paths: "bindings, etag"`
      * 

      *
@@ -1095,11 +1066,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
+        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1110,7 +1081,6 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      * OPTIONAL: A FieldMask specifying which fields of the policy to modify. Only
      * the fields in the mask will be modified. If no mask is provided, the
      * following default mask is used:
-     *
      * `paths: "bindings, etag"`
      * 

      *
@@ -1118,20 +1088,17 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && updateMask_ != null
-            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
-          getUpdateMaskBuilder().mergeFrom(value);
+        if (updateMask_ != null) {
+          updateMask_ =
+              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
         } else {
           updateMask_ = value;
         }
+        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-      if (updateMask_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1142,20 +1109,20 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * OPTIONAL: A FieldMask specifying which fields of the policy to modify. Only
      * the fields in the mask will be modified. If no mask is provided, the
      * following default mask is used:
-     *
      * `paths: "bindings, etag"`
      * 

      *
      * .google.protobuf.FieldMask update_mask = 3;
      */
     public Builder clearUpdateMask() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      updateMask_ = null;
-      if (updateMaskBuilder_ != null) {
-        updateMaskBuilder_.dispose();
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+        onChanged();
+      } else {
+        updateMask_ = null;
         updateMaskBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1166,14 +1133,13 @@ public Builder clearUpdateMask() {
      * OPTIONAL: A FieldMask specifying which fields of the policy to modify. Only
      * the fields in the mask will be modified. If no mask is provided, the
      * following default mask is used:
-     *
      * `paths: "bindings, etag"`
      * 

      *
      * .google.protobuf.FieldMask update_mask = 3;
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
@@ -1185,7 +1151,6 @@ public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
      * OPTIONAL: A FieldMask specifying which fields of the policy to modify. Only
      * the fields in the mask will be modified. If no mask is provided, the
      * following default mask is used:
-     *
      * `paths: "bindings, etag"`
      * 

      *
@@ -1208,7 +1173,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
      * OPTIONAL: A FieldMask specifying which fields of the policy to modify. Only
      * the fields in the mask will be modified. If no mask is provided, the
      * following default mask is used:
-     *
      * `paths: "bindings, etag"`
      * 

      *
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/SetIamPolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/SetIamPolicyRequestOrBuilder.java
index 60cce667e5..868d8f08e3 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/SetIamPolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/SetIamPolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/iam_policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 public interface SetIamPolicyRequestOrBuilder
@@ -109,7 +108,6 @@ public interface SetIamPolicyRequestOrBuilder
    * OPTIONAL: A FieldMask specifying which fields of the policy to modify. Only
    * the fields in the mask will be modified. If no mask is provided, the
    * following default mask is used:
-   *
    * `paths: "bindings, etag"`
    * 

    *
@@ -126,7 +124,6 @@ public interface SetIamPolicyRequestOrBuilder
    * OPTIONAL: A FieldMask specifying which fields of the policy to modify. Only
    * the fields in the mask will be modified. If no mask is provided, the
    * following default mask is used:
-   *
    * `paths: "bindings, etag"`
    * 

    *
@@ -143,7 +140,6 @@ public interface SetIamPolicyRequestOrBuilder
    * OPTIONAL: A FieldMask specifying which fields of the policy to modify. Only
    * the fields in the mask will be modified. If no mask is provided, the
    * following default mask is used:
-   *
    * `paths: "bindings, etag"`
    * 

    *
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsRequest.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsRequest.java
index 749c37be71..f15c65312f 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsRequest.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/iam_policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 /**
@@ -41,7 +40,7 @@ private TestIamPermissionsRequest(com.google.protobuf.GeneratedMessageV3.Builder
 
   private TestIamPermissionsRequest() {
     resource_ = "";
-    permissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    permissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
   @java.lang.Override
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new TestIamPermissionsRequest();
   }
 
+  @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.iam.v1.IamPolicyProto
         .internal_static_google_iam_v1_TestIamPermissionsRequest_descriptor;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RESOURCE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object resource_ = "";
+  private volatile java.lang.Object resource_;
 
   /**
    *
@@ -125,10 +127,7 @@ public com.google.protobuf.ByteString getResourceBytes() {
   }
 
   public static final int PERMISSIONS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList permissions_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList permissions_;
 
   /**
    *
@@ -418,9 +417,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       resource_ = "";
-      permissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
+
+      permissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -448,24 +448,17 @@ public com.google.iam.v1.TestIamPermissionsRequest build() {
     public com.google.iam.v1.TestIamPermissionsRequest buildPartial() {
       com.google.iam.v1.TestIamPermissionsRequest result =
           new com.google.iam.v1.TestIamPermissionsRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      result.resource_ = resource_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        permissions_ = permissions_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
+      result.permissions_ = permissions_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v1.TestIamPermissionsRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.resource_ = resource_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        permissions_.makeImmutable();
-        result.permissions_ = permissions_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -513,13 +506,12 @@ public Builder mergeFrom(com.google.iam.v1.TestIamPermissionsRequest other) {
       if (other == com.google.iam.v1.TestIamPermissionsRequest.getDefaultInstance()) return this;
       if (!other.getResource().isEmpty()) {
         resource_ = other.resource_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.permissions_.isEmpty()) {
         if (permissions_.isEmpty()) {
           permissions_ = other.permissions_;
-          bitField0_ |= 0x00000002;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensurePermissionsIsMutable();
           permissions_.addAll(other.permissions_);
@@ -555,7 +547,7 @@ public Builder mergeFrom(
             case 10:
               {
                 resource_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -657,8 +649,8 @@ public Builder setResource(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       resource_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -678,8 +670,8 @@ public Builder setResource(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearResource() {
+
       resource_ = getDefaultInstance().getResource();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -704,20 +696,20 @@ public Builder setResourceBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       resource_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList permissions_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList permissions_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensurePermissionsIsMutable() {
-      if (!permissions_.isModifiable()) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         permissions_ = new com.google.protobuf.LazyStringArrayList(permissions_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000002;
     }
 
     /**
@@ -735,8 +727,7 @@ private void ensurePermissionsIsMutable() {
      * @return A list containing the permissions.
      */
     public com.google.protobuf.ProtocolStringList getPermissionsList() {
-      permissions_.makeImmutable();
-      return permissions_;
+      return permissions_.getUnmodifiableView();
     }
 
     /**
@@ -817,7 +808,6 @@ public Builder setPermissions(int index, java.lang.String value) {
       }
       ensurePermissionsIsMutable();
       permissions_.set(index, value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -843,7 +833,6 @@ public Builder addPermissions(java.lang.String value) {
       }
       ensurePermissionsIsMutable();
       permissions_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -866,7 +855,6 @@ public Builder addPermissions(java.lang.String value) {
     public Builder addAllPermissions(java.lang.Iterable values) {
       ensurePermissionsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, permissions_);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -886,9 +874,8 @@ public Builder addAllPermissions(java.lang.Iterable values) {
      * @return This builder for chaining.
      */
     public Builder clearPermissions() {
-      permissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000002);
-      ;
+      permissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -915,7 +902,6 @@ public Builder addPermissionsBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensurePermissionsIsMutable();
       permissions_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsRequestOrBuilder.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsRequestOrBuilder.java
index 1271cc4544..ad6864a55a 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/iam_policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 public interface TestIamPermissionsRequestOrBuilder
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsResponse.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsResponse.java
index 1c8d7eda0c..d11516f17f 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsResponse.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/iam_policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 /**
@@ -40,7 +39,7 @@ private TestIamPermissionsResponse(com.google.protobuf.GeneratedMessageV3.Builde
   }
 
   private TestIamPermissionsResponse() {
-    permissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    permissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
   @java.lang.Override
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new TestIamPermissionsResponse();
   }
 
+  @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.iam.v1.IamPolicyProto
         .internal_static_google_iam_v1_TestIamPermissionsResponse_descriptor;
@@ -65,10 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PERMISSIONS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList permissions_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList permissions_;
 
   /**
    *
@@ -341,8 +342,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      permissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      permissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -370,21 +371,16 @@ public com.google.iam.v1.TestIamPermissionsResponse build() {
     public com.google.iam.v1.TestIamPermissionsResponse buildPartial() {
       com.google.iam.v1.TestIamPermissionsResponse result =
           new com.google.iam.v1.TestIamPermissionsResponse(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        permissions_ = permissions_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
+      result.permissions_ = permissions_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v1.TestIamPermissionsResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        permissions_.makeImmutable();
-        result.permissions_ = permissions_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -433,7 +429,7 @@ public Builder mergeFrom(com.google.iam.v1.TestIamPermissionsResponse other) {
       if (!other.permissions_.isEmpty()) {
         if (permissions_.isEmpty()) {
           permissions_ = other.permissions_;
-          bitField0_ |= 0x00000001;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensurePermissionsIsMutable();
           permissions_.addAll(other.permissions_);
@@ -492,14 +488,14 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private com.google.protobuf.LazyStringArrayList permissions_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList permissions_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensurePermissionsIsMutable() {
-      if (!permissions_.isModifiable()) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         permissions_ = new com.google.protobuf.LazyStringArrayList(permissions_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000001;
     }
 
     /**
@@ -515,8 +511,7 @@ private void ensurePermissionsIsMutable() {
      * @return A list containing the permissions.
      */
     public com.google.protobuf.ProtocolStringList getPermissionsList() {
-      permissions_.makeImmutable();
-      return permissions_;
+      return permissions_.getUnmodifiableView();
     }
 
     /**
@@ -589,7 +584,6 @@ public Builder setPermissions(int index, java.lang.String value) {
       }
       ensurePermissionsIsMutable();
       permissions_.set(index, value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -613,7 +607,6 @@ public Builder addPermissions(java.lang.String value) {
       }
       ensurePermissionsIsMutable();
       permissions_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -634,7 +627,6 @@ public Builder addPermissions(java.lang.String value) {
     public Builder addAllPermissions(java.lang.Iterable values) {
       ensurePermissionsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, permissions_);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -652,9 +644,8 @@ public Builder addAllPermissions(java.lang.Iterable values) {
      * @return This builder for chaining.
      */
     public Builder clearPermissions() {
-      permissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      permissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000001);
-      ;
       onChanged();
       return this;
     }
@@ -679,7 +670,6 @@ public Builder addPermissionsBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensurePermissionsIsMutable();
       permissions_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsResponseOrBuilder.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsResponseOrBuilder.java
index c153505028..caf6471248 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsResponseOrBuilder.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/iam_policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1;
 
 public interface TestIamPermissionsResponseOrBuilder
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditData.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditData.java
index cc8e8142bc..41ed1aaa39 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditData.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditData.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/logging/audit_data.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1.logging;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new AuditData();
   }
 
+  @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.iam.v1.logging.AuditDataProto
         .internal_static_google_iam_v1_logging_AuditData_descriptor;
@@ -64,7 +68,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v1.logging.AuditData.Builder.class);
   }
 
-  private int bitField0_;
   public static final int POLICY_DELTA_FIELD_NUMBER = 2;
   private com.google.iam.v1.PolicyDelta policyDelta_;
 
@@ -81,7 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasPolicyDelta() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return policyDelta_ != null;
   }
 
   /**
@@ -111,7 +114,7 @@ public com.google.iam.v1.PolicyDelta getPolicyDelta() {
    */
   @java.lang.Override
   public com.google.iam.v1.PolicyDeltaOrBuilder getPolicyDeltaOrBuilder() {
-    return policyDelta_ == null ? com.google.iam.v1.PolicyDelta.getDefaultInstance() : policyDelta_;
+    return getPolicyDelta();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -128,7 +131,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policyDelta_ != null) {
       output.writeMessage(2, getPolicyDelta());
     }
     getUnknownFields().writeTo(output);
@@ -140,7 +143,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policyDelta_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getPolicyDelta());
     }
     size += getUnknownFields().getSerializedSize();
@@ -308,28 +311,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.logging.AuditData.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPolicyDeltaFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      policyDelta_ = null;
-      if (policyDeltaBuilder_ != null) {
-        policyDeltaBuilder_.dispose();
+      if (policyDeltaBuilder_ == null) {
+        policyDelta_ = null;
+      } else {
+        policyDelta_ = null;
         policyDeltaBuilder_ = null;
       }
       return this;
@@ -358,24 +352,15 @@ public com.google.iam.v1.logging.AuditData build() {
     @java.lang.Override
     public com.google.iam.v1.logging.AuditData buildPartial() {
       com.google.iam.v1.logging.AuditData result = new com.google.iam.v1.logging.AuditData(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (policyDeltaBuilder_ == null) {
+        result.policyDelta_ = policyDelta_;
+      } else {
+        result.policyDelta_ = policyDeltaBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v1.logging.AuditData result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.policyDelta_ =
-            policyDeltaBuilder_ == null ? policyDelta_ : policyDeltaBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -453,7 +438,7 @@ public Builder mergeFrom(
             case 18:
               {
                 input.readMessage(getPolicyDeltaFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 18
             default:
@@ -473,8 +458,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.iam.v1.PolicyDelta policyDelta_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.iam.v1.PolicyDelta,
@@ -494,7 +477,7 @@ public Builder mergeFrom(
      * @return Whether the policyDelta field is set.
      */
     public boolean hasPolicyDelta() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return policyDeltaBuilder_ != null || policyDelta_ != null;
     }
 
     /**
@@ -533,11 +516,11 @@ public Builder setPolicyDelta(com.google.iam.v1.PolicyDelta value) {
           throw new NullPointerException();
         }
         policyDelta_ = value;
+        onChanged();
       } else {
         policyDeltaBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -553,11 +536,11 @@ public Builder setPolicyDelta(com.google.iam.v1.PolicyDelta value) {
     public Builder setPolicyDelta(com.google.iam.v1.PolicyDelta.Builder builderForValue) {
       if (policyDeltaBuilder_ == null) {
         policyDelta_ = builderForValue.build();
+        onChanged();
       } else {
         policyDeltaBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -572,20 +555,19 @@ public Builder setPolicyDelta(com.google.iam.v1.PolicyDelta.Builder builderForVa
      */
     public Builder mergePolicyDelta(com.google.iam.v1.PolicyDelta value) {
       if (policyDeltaBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && policyDelta_ != null
-            && policyDelta_ != com.google.iam.v1.PolicyDelta.getDefaultInstance()) {
-          getPolicyDeltaBuilder().mergeFrom(value);
+        if (policyDelta_ != null) {
+          policyDelta_ =
+              com.google.iam.v1.PolicyDelta.newBuilder(policyDelta_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           policyDelta_ = value;
         }
+        onChanged();
       } else {
         policyDeltaBuilder_.mergeFrom(value);
       }
-      if (policyDelta_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -599,13 +581,14 @@ public Builder mergePolicyDelta(com.google.iam.v1.PolicyDelta value) {
      * .google.iam.v1.PolicyDelta policy_delta = 2;
      */
     public Builder clearPolicyDelta() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      policyDelta_ = null;
-      if (policyDeltaBuilder_ != null) {
-        policyDeltaBuilder_.dispose();
+      if (policyDeltaBuilder_ == null) {
+        policyDelta_ = null;
+        onChanged();
+      } else {
+        policyDelta_ = null;
         policyDeltaBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -619,7 +602,7 @@ public Builder clearPolicyDelta() {
      * .google.iam.v1.PolicyDelta policy_delta = 2;
      */
     public com.google.iam.v1.PolicyDelta.Builder getPolicyDeltaBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getPolicyDeltaFieldBuilder().getBuilder();
     }
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditDataOrBuilder.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditDataOrBuilder.java
index 4f25d6857c..da5f01c63d 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditDataOrBuilder.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditDataOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/logging/audit_data.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1.logging;
 
 public interface AuditDataOrBuilder
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditDataProto.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditDataProto.java
index 8572efe7e4..3647ed2c7d 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditDataProto.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditDataProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/logging/audit_data.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v1.logging;
 
 public final class AuditDataProto {
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/CreatePolicyRequest.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/CreatePolicyRequest.java
index fc0bc65181..7daa5ab842 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/CreatePolicyRequest.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/CreatePolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CreatePolicyRequest();
   }
 
+  @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.iam.v2.PolicyProto
         .internal_static_google_iam_v2_CreatePolicyRequest_descriptor;
@@ -65,11 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v2.CreatePolicyRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int PARENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -77,13 +78,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * Required. The resource that the policy is attached to, along with the kind of policy
    * to create. Format: `policies/{attachment_point}/denypolicies`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -111,13 +109,10 @@ public java.lang.String getParent() {
    * 
    * Required. The resource that the policy is attached to, along with the kind of policy
    * to create. Format: `policies/{attachment_point}/denypolicies`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -155,7 +150,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    */
   @java.lang.Override
   public boolean hasPolicy() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return policy_ != null;
   }
 
   /**
@@ -185,13 +180,11 @@ public com.google.iam.v2.Policy getPolicy() {
    */
   @java.lang.Override
   public com.google.iam.v2.PolicyOrBuilder getPolicyOrBuilder() {
-    return policy_ == null ? com.google.iam.v2.Policy.getDefaultInstance() : policy_;
+    return getPolicy();
   }
 
   public static final int POLICY_ID_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object policyId_ = "";
+  private volatile java.lang.Object policyId_;
 
   /**
    *
@@ -264,7 +257,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policy_ != null) {
       output.writeMessage(2, getPolicy());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policyId_)) {
@@ -282,7 +275,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policy_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getPolicy());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policyId_)) {
@@ -457,32 +450,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2.CreatePolicyRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPolicyFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       parent_ = "";
-      policy_ = null;
-      if (policyBuilder_ != null) {
-        policyBuilder_.dispose();
+
+      if (policyBuilder_ == null) {
+        policy_ = null;
+      } else {
+        policy_ = null;
         policyBuilder_ = null;
       }
       policyId_ = "";
+
       return this;
     }
 
@@ -510,29 +496,17 @@ public com.google.iam.v2.CreatePolicyRequest build() {
     public com.google.iam.v2.CreatePolicyRequest buildPartial() {
       com.google.iam.v2.CreatePolicyRequest result =
           new com.google.iam.v2.CreatePolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.parent_ = parent_;
+      if (policyBuilder_ == null) {
+        result.policy_ = policy_;
+      } else {
+        result.policy_ = policyBuilder_.build();
       }
+      result.policyId_ = policyId_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v2.CreatePolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.parent_ = parent_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.policy_ = policyBuilder_ == null ? policy_ : policyBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.policyId_ = policyId_;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -580,7 +554,6 @@ public Builder mergeFrom(com.google.iam.v2.CreatePolicyRequest other) {
       if (other == com.google.iam.v2.CreatePolicyRequest.getDefaultInstance()) return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasPolicy()) {
@@ -588,7 +561,6 @@ public Builder mergeFrom(com.google.iam.v2.CreatePolicyRequest other) {
       }
       if (!other.getPolicyId().isEmpty()) {
         policyId_ = other.policyId_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -620,19 +592,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getPolicyFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 policyId_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -652,8 +624,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object parent_ = "";
 
     /**
@@ -662,13 +632,10 @@ public Builder mergeFrom(
      * 
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to create. Format: `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -695,13 +662,10 @@ public java.lang.String getParent() {
      * 
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to create. Format: `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -728,13 +692,10 @@ public com.google.protobuf.ByteString getParentBytes() {
      * 
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to create. Format: `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -748,8 +709,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -760,13 +721,10 @@ public Builder setParent(java.lang.String value) {
      * 
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to create. Format: `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -776,8 +734,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -788,13 +746,10 @@ public Builder clearParent() {
      * 
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to create. Format: `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -809,8 +764,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -834,7 +789,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the policy field is set.
      */
     public boolean hasPolicy() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return policyBuilder_ != null || policy_ != null;
     }
 
     /**
@@ -871,11 +826,11 @@ public Builder setPolicy(com.google.iam.v2.Policy value) {
           throw new NullPointerException();
         }
         policy_ = value;
+        onChanged();
       } else {
         policyBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -891,11 +846,11 @@ public Builder setPolicy(com.google.iam.v2.Policy value) {
     public Builder setPolicy(com.google.iam.v2.Policy.Builder builderForValue) {
       if (policyBuilder_ == null) {
         policy_ = builderForValue.build();
+        onChanged();
       } else {
         policyBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -910,20 +865,16 @@ public Builder setPolicy(com.google.iam.v2.Policy.Builder builderForValue) {
      */
     public Builder mergePolicy(com.google.iam.v2.Policy value) {
       if (policyBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && policy_ != null
-            && policy_ != com.google.iam.v2.Policy.getDefaultInstance()) {
-          getPolicyBuilder().mergeFrom(value);
+        if (policy_ != null) {
+          policy_ = com.google.iam.v2.Policy.newBuilder(policy_).mergeFrom(value).buildPartial();
         } else {
           policy_ = value;
         }
+        onChanged();
       } else {
         policyBuilder_.mergeFrom(value);
       }
-      if (policy_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -937,13 +888,14 @@ public Builder mergePolicy(com.google.iam.v2.Policy value) {
      * .google.iam.v2.Policy policy = 2 [(.google.api.field_behavior) = REQUIRED];
      */
     public Builder clearPolicy() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      policy_ = null;
-      if (policyBuilder_ != null) {
-        policyBuilder_.dispose();
+      if (policyBuilder_ == null) {
+        policy_ = null;
+        onChanged();
+      } else {
+        policy_ = null;
         policyBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -957,7 +909,7 @@ public Builder clearPolicy() {
      * .google.iam.v2.Policy policy = 2 [(.google.api.field_behavior) = REQUIRED];
      */
     public com.google.iam.v2.Policy.Builder getPolicyBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getPolicyFieldBuilder().getBuilder();
     }
@@ -1077,8 +1029,8 @@ public Builder setPolicyId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       policyId_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1098,8 +1050,8 @@ public Builder setPolicyId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPolicyId() {
+
       policyId_ = getDefaultInstance().getPolicyId();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1124,8 +1076,8 @@ public Builder setPolicyIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       policyId_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/CreatePolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/CreatePolicyRequestOrBuilder.java
index 48751a39c9..cc7fd83930 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/CreatePolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/CreatePolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 public interface CreatePolicyRequestOrBuilder
@@ -30,13 +29,10 @@ public interface CreatePolicyRequestOrBuilder
    * 
    * Required. The resource that the policy is attached to, along with the kind of policy
    * to create. Format: `policies/{attachment_point}/denypolicies`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -53,13 +49,10 @@ public interface CreatePolicyRequestOrBuilder
    * 
    * Required. The resource that the policy is attached to, along with the kind of policy
    * to create. Format: `policies/{attachment_point}/denypolicies`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DeletePolicyRequest.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DeletePolicyRequest.java
index 3dec540a1d..8a00eefd2e 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DeletePolicyRequest.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DeletePolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DeletePolicyRequest();
   }
 
+  @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.iam.v2.PolicyProto
         .internal_static_google_iam_v2_DeletePolicyRequest_descriptor;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -76,12 +78,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * Required. The resource name of the policy to delete. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * Use the URL-encoded full resource name, which means that the forward-slash
    * character, `/`, must be written as `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -109,12 +108,9 @@ public java.lang.String getName() {
    * 
    * Required. The resource name of the policy to delete. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * Use the URL-encoded full resource name, which means that the forward-slash
    * character, `/`, must be written as `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -137,9 +133,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int ETAG_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object etag_ = "";
+  private volatile java.lang.Object etag_;
 
   /**
    *
@@ -148,7 +142,6 @@ public com.google.protobuf.ByteString getNameBytes() {
    * Optional. The expected `etag` of the policy to delete. If the value does not match
    * the value that is stored in IAM, the request fails with a `409` error code
    * and `ABORTED` status.
-   *
    * If you omit this field, the policy is deleted regardless of its current
    * `etag`.
    * 

@@ -177,7 +170,6 @@ public java.lang.String getEtag() {
    * Optional. The expected `etag` of the policy to delete. If the value does not match
    * the value that is stored in IAM, the request fails with a `409` error code
    * and `ABORTED` status.
-   *
    * If you omit this field, the policy is deleted regardless of its current
    * `etag`.
    * 

@@ -404,9 +396,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       etag_ = "";
+
       return this;
     }
 
@@ -434,23 +427,12 @@ public com.google.iam.v2.DeletePolicyRequest build() {
     public com.google.iam.v2.DeletePolicyRequest buildPartial() {
       com.google.iam.v2.DeletePolicyRequest result =
           new com.google.iam.v2.DeletePolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
+      result.etag_ = etag_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v2.DeletePolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.etag_ = etag_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -498,12 +480,10 @@ public Builder mergeFrom(com.google.iam.v2.DeletePolicyRequest other) {
       if (other == com.google.iam.v2.DeletePolicyRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getEtag().isEmpty()) {
         etag_ = other.etag_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -535,13 +515,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 etag_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -561,8 +541,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -571,12 +549,9 @@ public Builder mergeFrom(
      * 
      * Required. The resource name of the policy to delete. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -603,12 +578,9 @@ public java.lang.String getName() {
      * 
      * Required. The resource name of the policy to delete. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -635,12 +607,9 @@ public com.google.protobuf.ByteString getNameBytes() {
      * 
      * Required. The resource name of the policy to delete. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -654,8 +623,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -666,12 +635,9 @@ public Builder setName(java.lang.String value) {
      * 
      * Required. The resource name of the policy to delete. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -681,8 +647,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -693,12 +659,9 @@ public Builder clearName() {
      * 
      * Required. The resource name of the policy to delete. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -713,8 +676,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -728,7 +691,6 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * Optional. The expected `etag` of the policy to delete. If the value does not match
      * the value that is stored in IAM, the request fails with a `409` error code
      * and `ABORTED` status.
-     *
      * If you omit this field, the policy is deleted regardless of its current
      * `etag`.
      * 

@@ -756,7 +718,6 @@ public java.lang.String getEtag() {
      * Optional. The expected `etag` of the policy to delete. If the value does not match
      * the value that is stored in IAM, the request fails with a `409` error code
      * and `ABORTED` status.
-     *
      * If you omit this field, the policy is deleted regardless of its current
      * `etag`.
      * 

@@ -784,7 +745,6 @@ public com.google.protobuf.ByteString getEtagBytes() {
      * Optional. The expected `etag` of the policy to delete. If the value does not match
      * the value that is stored in IAM, the request fails with a `409` error code
      * and `ABORTED` status.
-     *
      * If you omit this field, the policy is deleted regardless of its current
      * `etag`.
      * 

@@ -798,8 +758,8 @@ public Builder setEtag(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       etag_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -811,7 +771,6 @@ public Builder setEtag(java.lang.String value) {
      * Optional. The expected `etag` of the policy to delete. If the value does not match
      * the value that is stored in IAM, the request fails with a `409` error code
      * and `ABORTED` status.
-     *
      * If you omit this field, the policy is deleted regardless of its current
      * `etag`.
      * 

@@ -821,8 +780,8 @@ public Builder setEtag(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEtag() {
+
       etag_ = getDefaultInstance().getEtag();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -834,7 +793,6 @@ public Builder clearEtag() {
      * Optional. The expected `etag` of the policy to delete. If the value does not match
      * the value that is stored in IAM, the request fails with a `409` error code
      * and `ABORTED` status.
-     *
      * If you omit this field, the policy is deleted regardless of its current
      * `etag`.
      * 

@@ -849,8 +807,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       etag_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DeletePolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DeletePolicyRequestOrBuilder.java
index 0a58e87f2c..f11f794ad5 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DeletePolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DeletePolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 public interface DeletePolicyRequestOrBuilder
@@ -30,12 +29,9 @@ public interface DeletePolicyRequestOrBuilder
    * 
    * Required. The resource name of the policy to delete. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * Use the URL-encoded full resource name, which means that the forward-slash
    * character, `/`, must be written as `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -52,12 +48,9 @@ public interface DeletePolicyRequestOrBuilder
    * 
    * Required. The resource name of the policy to delete. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * Use the URL-encoded full resource name, which means that the forward-slash
    * character, `/`, must be written as `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -75,7 +68,6 @@ public interface DeletePolicyRequestOrBuilder
    * Optional. The expected `etag` of the policy to delete. If the value does not match
    * the value that is stored in IAM, the request fails with a `409` error code
    * and `ABORTED` status.
-   *
    * If you omit this field, the policy is deleted regardless of its current
    * `etag`.
    * 

@@ -93,7 +85,6 @@ public interface DeletePolicyRequestOrBuilder
    * Optional. The expected `etag` of the policy to delete. If the value does not match
    * the value that is stored in IAM, the request fails with a `409` error code
    * and `ABORTED` status.
-   *
    * If you omit this field, the policy is deleted regardless of its current
    * `etag`.
    * 

diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRule.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRule.java
index 75e596e927..aa3ca9e158 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRule.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRule.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/deny.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 /**
@@ -40,10 +39,10 @@ private DenyRule(com.google.protobuf.GeneratedMessageV3.Builder builder) {
   }
 
   private DenyRule() {
-    deniedPrincipals_ = com.google.protobuf.LazyStringArrayList.emptyList();
-    exceptionPrincipals_ = com.google.protobuf.LazyStringArrayList.emptyList();
-    deniedPermissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
-    exceptionPermissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    deniedPrincipals_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    exceptionPrincipals_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    deniedPermissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    exceptionPermissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
   @java.lang.Override
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DenyRule();
   }
 
+  @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.iam.v2.DenyRuleProto.internal_static_google_iam_v2_DenyRule_descriptor;
   }
@@ -64,12 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v2.DenyRule.class, com.google.iam.v2.DenyRule.Builder.class);
   }
 
-  private int bitField0_;
   public static final int DENIED_PRINCIPALS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList deniedPrincipals_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList deniedPrincipals_;
 
   /**
    *
@@ -77,40 +77,32 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * The identities that are prevented from using one or more permissions on
    * Google Cloud resources. This field can contain the following values:
-   *
    * * `principalSet://goog/public:all`: A special identifier that represents
    *   any principal that is on the internet, even if they do not have a Google
    *   Account or are not logged in.
-   *
    * * `principal://goog/subject/{email_id}`: A specific Google Account.
    *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
    *   example, `principal://goog/subject/alice@example.com`.
-   *
    * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
    *   Google Account that was deleted recently. For example,
    *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
    *   the Google Account is recovered, this identifier reverts to the standard
    *   identifier for a Google Account.
-   *
    * * `principalSet://goog/group/{group_id}`: A Google group. For example,
    *   `principalSet://goog/group/admins@example.com`.
-   *
    * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
    *   that was deleted recently. For example,
    *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
    *   the Google group is restored, this identifier reverts to the standard
    *   identifier for a Google group.
-   *
    * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
    *   A Google Cloud service account. For example,
    *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-   *
    * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
    *   A Google Cloud service account that was deleted recently. For example,
    *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
    *   If the service account is undeleted, this identifier reverts to the
    *   standard identifier for a service account.
-   *
    * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
    *   principals associated with the specified Google Workspace or Cloud
    *   Identity customer ID. For example,
@@ -131,40 +123,32 @@ public com.google.protobuf.ProtocolStringList getDeniedPrincipalsList() {
    * 
    * The identities that are prevented from using one or more permissions on
    * Google Cloud resources. This field can contain the following values:
-   *
    * * `principalSet://goog/public:all`: A special identifier that represents
    *   any principal that is on the internet, even if they do not have a Google
    *   Account or are not logged in.
-   *
    * * `principal://goog/subject/{email_id}`: A specific Google Account.
    *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
    *   example, `principal://goog/subject/alice@example.com`.
-   *
    * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
    *   Google Account that was deleted recently. For example,
    *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
    *   the Google Account is recovered, this identifier reverts to the standard
    *   identifier for a Google Account.
-   *
    * * `principalSet://goog/group/{group_id}`: A Google group. For example,
    *   `principalSet://goog/group/admins@example.com`.
-   *
    * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
    *   that was deleted recently. For example,
    *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
    *   the Google group is restored, this identifier reverts to the standard
    *   identifier for a Google group.
-   *
    * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
    *   A Google Cloud service account. For example,
    *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-   *
    * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
    *   A Google Cloud service account that was deleted recently. For example,
    *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
    *   If the service account is undeleted, this identifier reverts to the
    *   standard identifier for a service account.
-   *
    * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
    *   principals associated with the specified Google Workspace or Cloud
    *   Identity customer ID. For example,
@@ -185,40 +169,32 @@ public int getDeniedPrincipalsCount() {
    * 
    * The identities that are prevented from using one or more permissions on
    * Google Cloud resources. This field can contain the following values:
-   *
    * * `principalSet://goog/public:all`: A special identifier that represents
    *   any principal that is on the internet, even if they do not have a Google
    *   Account or are not logged in.
-   *
    * * `principal://goog/subject/{email_id}`: A specific Google Account.
    *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
    *   example, `principal://goog/subject/alice@example.com`.
-   *
    * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
    *   Google Account that was deleted recently. For example,
    *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
    *   the Google Account is recovered, this identifier reverts to the standard
    *   identifier for a Google Account.
-   *
    * * `principalSet://goog/group/{group_id}`: A Google group. For example,
    *   `principalSet://goog/group/admins@example.com`.
-   *
    * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
    *   that was deleted recently. For example,
    *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
    *   the Google group is restored, this identifier reverts to the standard
    *   identifier for a Google group.
-   *
    * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
    *   A Google Cloud service account. For example,
    *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-   *
    * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
    *   A Google Cloud service account that was deleted recently. For example,
    *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
    *   If the service account is undeleted, this identifier reverts to the
    *   standard identifier for a service account.
-   *
    * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
    *   principals associated with the specified Google Workspace or Cloud
    *   Identity customer ID. For example,
@@ -240,40 +216,32 @@ public java.lang.String getDeniedPrincipals(int index) {
    * 
    * The identities that are prevented from using one or more permissions on
    * Google Cloud resources. This field can contain the following values:
-   *
    * * `principalSet://goog/public:all`: A special identifier that represents
    *   any principal that is on the internet, even if they do not have a Google
    *   Account or are not logged in.
-   *
    * * `principal://goog/subject/{email_id}`: A specific Google Account.
    *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
    *   example, `principal://goog/subject/alice@example.com`.
-   *
    * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
    *   Google Account that was deleted recently. For example,
    *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
    *   the Google Account is recovered, this identifier reverts to the standard
    *   identifier for a Google Account.
-   *
    * * `principalSet://goog/group/{group_id}`: A Google group. For example,
    *   `principalSet://goog/group/admins@example.com`.
-   *
    * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
    *   that was deleted recently. For example,
    *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
    *   the Google group is restored, this identifier reverts to the standard
    *   identifier for a Google group.
-   *
    * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
    *   A Google Cloud service account. For example,
    *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-   *
    * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
    *   A Google Cloud service account that was deleted recently. For example,
    *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
    *   If the service account is undeleted, this identifier reverts to the
    *   standard identifier for a service account.
-   *
    * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
    *   principals associated with the specified Google Workspace or Cloud
    *   Identity customer ID. For example,
@@ -290,10 +258,7 @@ public com.google.protobuf.ByteString getDeniedPrincipalsBytes(int index) {
   }
 
   public static final int EXCEPTION_PRINCIPALS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList exceptionPrincipals_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList exceptionPrincipals_;
 
   /**
    *
@@ -303,7 +268,6 @@ public com.google.protobuf.ByteString getDeniedPrincipalsBytes(int index) {
    * listed in the `denied_principals`. For example, you could add a Google
    * group to the `denied_principals`, then exclude specific users who belong to
    * that group.
-   *
    * This field can contain the same values as the `denied_principals` field,
    * excluding `principalSet://goog/public:all`, which represents all users on
    * the internet.
@@ -325,7 +289,6 @@ public com.google.protobuf.ProtocolStringList getExceptionPrincipalsList() {
    * listed in the `denied_principals`. For example, you could add a Google
    * group to the `denied_principals`, then exclude specific users who belong to
    * that group.
-   *
    * This field can contain the same values as the `denied_principals` field,
    * excluding `principalSet://goog/public:all`, which represents all users on
    * the internet.
@@ -347,7 +310,6 @@ public int getExceptionPrincipalsCount() {
    * listed in the `denied_principals`. For example, you could add a Google
    * group to the `denied_principals`, then exclude specific users who belong to
    * that group.
-   *
    * This field can contain the same values as the `denied_principals` field,
    * excluding `principalSet://goog/public:all`, which represents all users on
    * the internet.
@@ -370,7 +332,6 @@ public java.lang.String getExceptionPrincipals(int index) {
    * listed in the `denied_principals`. For example, you could add a Google
    * group to the `denied_principals`, then exclude specific users who belong to
    * that group.
-   *
    * This field can contain the same values as the `denied_principals` field,
    * excluding `principalSet://goog/public:all`, which represents all users on
    * the internet.
@@ -386,10 +347,7 @@ public com.google.protobuf.ByteString getExceptionPrincipalsBytes(int index) {
   }
 
   public static final int DENIED_PERMISSIONS_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList deniedPermissions_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList deniedPermissions_;
 
   /**
    *
@@ -466,10 +424,7 @@ public com.google.protobuf.ByteString getDeniedPermissionsBytes(int index) {
   }
 
   public static final int EXCEPTION_PERMISSIONS_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList exceptionPermissions_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList exceptionPermissions_;
 
   /**
    *
@@ -479,7 +434,6 @@ public com.google.protobuf.ByteString getDeniedPermissionsBytes(int index) {
    * permissions given by `denied_permissions`. If a permission appears in
    * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
    * denied.
-   *
    * The excluded permissions can be specified using the same syntax as
    * `denied_permissions`.
    * 

@@ -500,7 +454,6 @@ public com.google.protobuf.ProtocolStringList getExceptionPermissionsList() {
    * permissions given by `denied_permissions`. If a permission appears in
    * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
    * denied.
-   *
    * The excluded permissions can be specified using the same syntax as
    * `denied_permissions`.
    * 

@@ -521,7 +474,6 @@ public int getExceptionPermissionsCount() {
    * permissions given by `denied_permissions`. If a permission appears in
    * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
    * denied.
-   *
    * The excluded permissions can be specified using the same syntax as
    * `denied_permissions`.
    * 

@@ -543,7 +495,6 @@ public java.lang.String getExceptionPermissions(int index) {
    * permissions given by `denied_permissions`. If a permission appears in
    * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
    * denied.
-   *
    * The excluded permissions can be specified using the same syntax as
    * `denied_permissions`.
    * 

@@ -567,10 +518,8 @@ public com.google.protobuf.ByteString getExceptionPermissionsBytes(int index) {
    * The condition that determines whether this deny rule applies to a request.
    * If the condition expression evaluates to `true`, then the deny rule is
    * applied; otherwise, the deny rule is not applied.
-   *
    * Each deny rule is evaluated independently. If this deny rule does not apply
    * to a request, other deny rules might still apply.
-   *
    * The condition can use CEL functions that evaluate
    * [resource
    * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -583,7 +532,7 @@ public com.google.protobuf.ByteString getExceptionPermissionsBytes(int index) {
    */
   @java.lang.Override
   public boolean hasDenialCondition() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return denialCondition_ != null;
   }
 
   /**
@@ -593,10 +542,8 @@ public boolean hasDenialCondition() {
    * The condition that determines whether this deny rule applies to a request.
    * If the condition expression evaluates to `true`, then the deny rule is
    * applied; otherwise, the deny rule is not applied.
-   *
    * Each deny rule is evaluated independently. If this deny rule does not apply
    * to a request, other deny rules might still apply.
-   *
    * The condition can use CEL functions that evaluate
    * [resource
    * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -619,10 +566,8 @@ public com.google.type.Expr getDenialCondition() {
    * The condition that determines whether this deny rule applies to a request.
    * If the condition expression evaluates to `true`, then the deny rule is
    * applied; otherwise, the deny rule is not applied.
-   *
    * Each deny rule is evaluated independently. If this deny rule does not apply
    * to a request, other deny rules might still apply.
-   *
    * The condition can use CEL functions that evaluate
    * [resource
    * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -633,7 +578,7 @@ public com.google.type.Expr getDenialCondition() {
    */
   @java.lang.Override
   public com.google.type.ExprOrBuilder getDenialConditionOrBuilder() {
-    return denialCondition_ == null ? com.google.type.Expr.getDefaultInstance() : denialCondition_;
+    return getDenialCondition();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -663,7 +608,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       com.google.protobuf.GeneratedMessageV3.writeString(
           output, 4, exceptionPermissions_.getRaw(i));
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (denialCondition_ != null) {
       output.writeMessage(5, getDenialCondition());
     }
     getUnknownFields().writeTo(output);
@@ -707,7 +652,7 @@ public int getSerializedSize() {
       size += dataSize;
       size += 1 * getExceptionPermissionsList().size();
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (denialCondition_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getDenialCondition());
     }
     size += getUnknownFields().getSerializedSize();
@@ -891,32 +836,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2.DenyRule.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getDenialConditionFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      deniedPrincipals_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      exceptionPrincipals_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      deniedPermissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      exceptionPermissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      denialCondition_ = null;
-      if (denialConditionBuilder_ != null) {
-        denialConditionBuilder_.dispose();
+      deniedPrincipals_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      exceptionPrincipals_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      deniedPermissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      exceptionPermissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      if (denialConditionBuilder_ == null) {
+        denialCondition_ = null;
+      } else {
+        denialCondition_ = null;
         denialConditionBuilder_ = null;
       }
       return this;
@@ -944,38 +884,34 @@ public com.google.iam.v2.DenyRule build() {
     @java.lang.Override
     public com.google.iam.v2.DenyRule buildPartial() {
       com.google.iam.v2.DenyRule result = new com.google.iam.v2.DenyRule(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.iam.v2.DenyRule result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        deniedPrincipals_.makeImmutable();
-        result.deniedPrincipals_ = deniedPrincipals_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        deniedPrincipals_ = deniedPrincipals_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        exceptionPrincipals_.makeImmutable();
-        result.exceptionPrincipals_ = exceptionPrincipals_;
+      result.deniedPrincipals_ = deniedPrincipals_;
+      if (((bitField0_ & 0x00000002) != 0)) {
+        exceptionPrincipals_ = exceptionPrincipals_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
       }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        deniedPermissions_.makeImmutable();
-        result.deniedPermissions_ = deniedPermissions_;
+      result.exceptionPrincipals_ = exceptionPrincipals_;
+      if (((bitField0_ & 0x00000004) != 0)) {
+        deniedPermissions_ = deniedPermissions_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000004);
       }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        exceptionPermissions_.makeImmutable();
-        result.exceptionPermissions_ = exceptionPermissions_;
+      result.deniedPermissions_ = deniedPermissions_;
+      if (((bitField0_ & 0x00000008) != 0)) {
+        exceptionPermissions_ = exceptionPermissions_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000008);
       }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.denialCondition_ =
-            denialConditionBuilder_ == null ? denialCondition_ : denialConditionBuilder_.build();
-        to_bitField0_ |= 0x00000001;
+      result.exceptionPermissions_ = exceptionPermissions_;
+      if (denialConditionBuilder_ == null) {
+        result.denialCondition_ = denialCondition_;
+      } else {
+        result.denialCondition_ = denialConditionBuilder_.build();
       }
-      result.bitField0_ |= to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1026,7 +962,7 @@ public Builder mergeFrom(com.google.iam.v2.DenyRule other) {
       if (!other.deniedPrincipals_.isEmpty()) {
         if (deniedPrincipals_.isEmpty()) {
           deniedPrincipals_ = other.deniedPrincipals_;
-          bitField0_ |= 0x00000001;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureDeniedPrincipalsIsMutable();
           deniedPrincipals_.addAll(other.deniedPrincipals_);
@@ -1036,7 +972,7 @@ public Builder mergeFrom(com.google.iam.v2.DenyRule other) {
       if (!other.exceptionPrincipals_.isEmpty()) {
         if (exceptionPrincipals_.isEmpty()) {
           exceptionPrincipals_ = other.exceptionPrincipals_;
-          bitField0_ |= 0x00000002;
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureExceptionPrincipalsIsMutable();
           exceptionPrincipals_.addAll(other.exceptionPrincipals_);
@@ -1046,7 +982,7 @@ public Builder mergeFrom(com.google.iam.v2.DenyRule other) {
       if (!other.deniedPermissions_.isEmpty()) {
         if (deniedPermissions_.isEmpty()) {
           deniedPermissions_ = other.deniedPermissions_;
-          bitField0_ |= 0x00000004;
+          bitField0_ = (bitField0_ & ~0x00000004);
         } else {
           ensureDeniedPermissionsIsMutable();
           deniedPermissions_.addAll(other.deniedPermissions_);
@@ -1056,7 +992,7 @@ public Builder mergeFrom(com.google.iam.v2.DenyRule other) {
       if (!other.exceptionPermissions_.isEmpty()) {
         if (exceptionPermissions_.isEmpty()) {
           exceptionPermissions_ = other.exceptionPermissions_;
-          bitField0_ |= 0x00000008;
+          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
           ensureExceptionPermissionsIsMutable();
           exceptionPermissions_.addAll(other.exceptionPermissions_);
@@ -1123,7 +1059,7 @@ public Builder mergeFrom(
             case 42:
               {
                 input.readMessage(getDenialConditionFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 42
             default:
@@ -1145,14 +1081,14 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private com.google.protobuf.LazyStringArrayList deniedPrincipals_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList deniedPrincipals_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureDeniedPrincipalsIsMutable() {
-      if (!deniedPrincipals_.isModifiable()) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         deniedPrincipals_ = new com.google.protobuf.LazyStringArrayList(deniedPrincipals_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000001;
     }
 
     /**
@@ -1161,40 +1097,32 @@ private void ensureDeniedPrincipalsIsMutable() {
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1206,8 +1134,7 @@ private void ensureDeniedPrincipalsIsMutable() {
      * @return A list containing the deniedPrincipals.
      */
     public com.google.protobuf.ProtocolStringList getDeniedPrincipalsList() {
-      deniedPrincipals_.makeImmutable();
-      return deniedPrincipals_;
+      return deniedPrincipals_.getUnmodifiableView();
     }
 
     /**
@@ -1216,40 +1143,32 @@ public com.google.protobuf.ProtocolStringList getDeniedPrincipalsList() {
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1270,40 +1189,32 @@ public int getDeniedPrincipalsCount() {
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1325,40 +1236,32 @@ public java.lang.String getDeniedPrincipals(int index) {
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1380,40 +1283,32 @@ public com.google.protobuf.ByteString getDeniedPrincipalsBytes(int index) {
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1432,7 +1327,6 @@ public Builder setDeniedPrincipals(int index, java.lang.String value) {
       }
       ensureDeniedPrincipalsIsMutable();
       deniedPrincipals_.set(index, value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1443,40 +1337,32 @@ public Builder setDeniedPrincipals(int index, java.lang.String value) {
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1494,7 +1380,6 @@ public Builder addDeniedPrincipals(java.lang.String value) {
       }
       ensureDeniedPrincipalsIsMutable();
       deniedPrincipals_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1505,40 +1390,32 @@ public Builder addDeniedPrincipals(java.lang.String value) {
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1553,7 +1430,6 @@ public Builder addDeniedPrincipals(java.lang.String value) {
     public Builder addAllDeniedPrincipals(java.lang.Iterable values) {
       ensureDeniedPrincipalsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, deniedPrincipals_);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1564,40 +1440,32 @@ public Builder addAllDeniedPrincipals(java.lang.Iterable value
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1609,9 +1477,8 @@ public Builder addAllDeniedPrincipals(java.lang.Iterable value
      * @return This builder for chaining.
      */
     public Builder clearDeniedPrincipals() {
-      deniedPrincipals_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      deniedPrincipals_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000001);
-      ;
       onChanged();
       return this;
     }
@@ -1622,40 +1489,32 @@ public Builder clearDeniedPrincipals() {
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1674,19 +1533,18 @@ public Builder addDeniedPrincipalsBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureDeniedPrincipalsIsMutable();
       deniedPrincipals_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList exceptionPrincipals_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList exceptionPrincipals_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureExceptionPrincipalsIsMutable() {
-      if (!exceptionPrincipals_.isModifiable()) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         exceptionPrincipals_ = new com.google.protobuf.LazyStringArrayList(exceptionPrincipals_);
+        bitField0_ |= 0x00000002;
       }
-      bitField0_ |= 0x00000002;
     }
 
     /**
@@ -1697,7 +1555,6 @@ private void ensureExceptionPrincipalsIsMutable() {
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1708,8 +1565,7 @@ private void ensureExceptionPrincipalsIsMutable() {
      * @return A list containing the exceptionPrincipals.
      */
     public com.google.protobuf.ProtocolStringList getExceptionPrincipalsList() {
-      exceptionPrincipals_.makeImmutable();
-      return exceptionPrincipals_;
+      return exceptionPrincipals_.getUnmodifiableView();
     }
 
     /**
@@ -1720,7 +1576,6 @@ public com.google.protobuf.ProtocolStringList getExceptionPrincipalsList() {
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1742,7 +1597,6 @@ public int getExceptionPrincipalsCount() {
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1765,7 +1619,6 @@ public java.lang.String getExceptionPrincipals(int index) {
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1788,7 +1641,6 @@ public com.google.protobuf.ByteString getExceptionPrincipalsBytes(int index) {
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1806,7 +1658,6 @@ public Builder setExceptionPrincipals(int index, java.lang.String value) {
       }
       ensureExceptionPrincipalsIsMutable();
       exceptionPrincipals_.set(index, value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1819,7 +1670,6 @@ public Builder setExceptionPrincipals(int index, java.lang.String value) {
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1836,7 +1686,6 @@ public Builder addExceptionPrincipals(java.lang.String value) {
       }
       ensureExceptionPrincipalsIsMutable();
       exceptionPrincipals_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1849,7 +1698,6 @@ public Builder addExceptionPrincipals(java.lang.String value) {
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1863,7 +1711,6 @@ public Builder addExceptionPrincipals(java.lang.String value) {
     public Builder addAllExceptionPrincipals(java.lang.Iterable values) {
       ensureExceptionPrincipalsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, exceptionPrincipals_);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1876,7 +1723,6 @@ public Builder addAllExceptionPrincipals(java.lang.Iterable va
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1887,9 +1733,8 @@ public Builder addAllExceptionPrincipals(java.lang.Iterable va
      * @return This builder for chaining.
      */
     public Builder clearExceptionPrincipals() {
-      exceptionPrincipals_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      exceptionPrincipals_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000002);
-      ;
       onChanged();
       return this;
     }
@@ -1902,7 +1747,6 @@ public Builder clearExceptionPrincipals() {
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1920,19 +1764,18 @@ public Builder addExceptionPrincipalsBytes(com.google.protobuf.ByteString value)
       checkByteStringIsUtf8(value);
       ensureExceptionPrincipalsIsMutable();
       exceptionPrincipals_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList deniedPermissions_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList deniedPermissions_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureDeniedPermissionsIsMutable() {
-      if (!deniedPermissions_.isModifiable()) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         deniedPermissions_ = new com.google.protobuf.LazyStringArrayList(deniedPermissions_);
+        bitField0_ |= 0x00000004;
       }
-      bitField0_ |= 0x00000004;
     }
 
     /**
@@ -1950,8 +1793,7 @@ private void ensureDeniedPermissionsIsMutable() {
      * @return A list containing the deniedPermissions.
      */
     public com.google.protobuf.ProtocolStringList getDeniedPermissionsList() {
-      deniedPermissions_.makeImmutable();
-      return deniedPermissions_;
+      return deniedPermissions_.getUnmodifiableView();
     }
 
     /**
@@ -2032,7 +1874,6 @@ public Builder setDeniedPermissions(int index, java.lang.String value) {
       }
       ensureDeniedPermissionsIsMutable();
       deniedPermissions_.set(index, value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2058,7 +1899,6 @@ public Builder addDeniedPermissions(java.lang.String value) {
       }
       ensureDeniedPermissionsIsMutable();
       deniedPermissions_.add(value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2081,7 +1921,6 @@ public Builder addDeniedPermissions(java.lang.String value) {
     public Builder addAllDeniedPermissions(java.lang.Iterable values) {
       ensureDeniedPermissionsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, deniedPermissions_);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2101,9 +1940,8 @@ public Builder addAllDeniedPermissions(java.lang.Iterable valu
      * @return This builder for chaining.
      */
     public Builder clearDeniedPermissions() {
-      deniedPermissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      deniedPermissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000004);
-      ;
       onChanged();
       return this;
     }
@@ -2130,19 +1968,18 @@ public Builder addDeniedPermissionsBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureDeniedPermissionsIsMutable();
       deniedPermissions_.add(value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList exceptionPermissions_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList exceptionPermissions_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureExceptionPermissionsIsMutable() {
-      if (!exceptionPermissions_.isModifiable()) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         exceptionPermissions_ = new com.google.protobuf.LazyStringArrayList(exceptionPermissions_);
+        bitField0_ |= 0x00000008;
       }
-      bitField0_ |= 0x00000008;
     }
 
     /**
@@ -2153,7 +1990,6 @@ private void ensureExceptionPermissionsIsMutable() {
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2163,8 +1999,7 @@ private void ensureExceptionPermissionsIsMutable() {
      * @return A list containing the exceptionPermissions.
      */
     public com.google.protobuf.ProtocolStringList getExceptionPermissionsList() {
-      exceptionPermissions_.makeImmutable();
-      return exceptionPermissions_;
+      return exceptionPermissions_.getUnmodifiableView();
     }
 
     /**
@@ -2175,7 +2010,6 @@ public com.google.protobuf.ProtocolStringList getExceptionPermissionsList() {
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2196,7 +2030,6 @@ public int getExceptionPermissionsCount() {
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2218,7 +2051,6 @@ public java.lang.String getExceptionPermissions(int index) {
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2240,7 +2072,6 @@ public com.google.protobuf.ByteString getExceptionPermissionsBytes(int index) {
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2257,7 +2088,6 @@ public Builder setExceptionPermissions(int index, java.lang.String value) {
       }
       ensureExceptionPermissionsIsMutable();
       exceptionPermissions_.set(index, value);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2270,7 +2100,6 @@ public Builder setExceptionPermissions(int index, java.lang.String value) {
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2286,7 +2115,6 @@ public Builder addExceptionPermissions(java.lang.String value) {
       }
       ensureExceptionPermissionsIsMutable();
       exceptionPermissions_.add(value);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2299,7 +2127,6 @@ public Builder addExceptionPermissions(java.lang.String value) {
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2312,7 +2139,6 @@ public Builder addExceptionPermissions(java.lang.String value) {
     public Builder addAllExceptionPermissions(java.lang.Iterable values) {
       ensureExceptionPermissionsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, exceptionPermissions_);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2325,7 +2151,6 @@ public Builder addAllExceptionPermissions(java.lang.Iterable v
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2335,9 +2160,8 @@ public Builder addAllExceptionPermissions(java.lang.Iterable v
      * @return This builder for chaining.
      */
     public Builder clearExceptionPermissions() {
-      exceptionPermissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      exceptionPermissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000008);
-      ;
       onChanged();
       return this;
     }
@@ -2350,7 +2174,6 @@ public Builder clearExceptionPermissions() {
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2367,7 +2190,6 @@ public Builder addExceptionPermissionsBytes(com.google.protobuf.ByteString value
       checkByteStringIsUtf8(value);
       ensureExceptionPermissionsIsMutable();
       exceptionPermissions_.add(value);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2384,10 +2206,8 @@ public Builder addExceptionPermissionsBytes(com.google.protobuf.ByteString value
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -2399,7 +2219,7 @@ public Builder addExceptionPermissionsBytes(com.google.protobuf.ByteString value
      * @return Whether the denialCondition field is set.
      */
     public boolean hasDenialCondition() {
-      return ((bitField0_ & 0x00000010) != 0);
+      return denialConditionBuilder_ != null || denialCondition_ != null;
     }
 
     /**
@@ -2409,10 +2229,8 @@ public boolean hasDenialCondition() {
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -2440,10 +2258,8 @@ public com.google.type.Expr getDenialCondition() {
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -2458,11 +2274,11 @@ public Builder setDenialCondition(com.google.type.Expr value) {
           throw new NullPointerException();
         }
         denialCondition_ = value;
+        onChanged();
       } else {
         denialConditionBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -2473,10 +2289,8 @@ public Builder setDenialCondition(com.google.type.Expr value) {
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -2488,11 +2302,11 @@ public Builder setDenialCondition(com.google.type.Expr value) {
     public Builder setDenialCondition(com.google.type.Expr.Builder builderForValue) {
       if (denialConditionBuilder_ == null) {
         denialCondition_ = builderForValue.build();
+        onChanged();
       } else {
         denialConditionBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -2503,10 +2317,8 @@ public Builder setDenialCondition(com.google.type.Expr.Builder builderForValue)
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -2517,20 +2329,17 @@ public Builder setDenialCondition(com.google.type.Expr.Builder builderForValue)
      */
     public Builder mergeDenialCondition(com.google.type.Expr value) {
       if (denialConditionBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)
-            && denialCondition_ != null
-            && denialCondition_ != com.google.type.Expr.getDefaultInstance()) {
-          getDenialConditionBuilder().mergeFrom(value);
+        if (denialCondition_ != null) {
+          denialCondition_ =
+              com.google.type.Expr.newBuilder(denialCondition_).mergeFrom(value).buildPartial();
         } else {
           denialCondition_ = value;
         }
+        onChanged();
       } else {
         denialConditionBuilder_.mergeFrom(value);
       }
-      if (denialCondition_ != null) {
-        bitField0_ |= 0x00000010;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2541,10 +2350,8 @@ public Builder mergeDenialCondition(com.google.type.Expr value) {
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -2554,13 +2361,14 @@ public Builder mergeDenialCondition(com.google.type.Expr value) {
      * .google.type.Expr denial_condition = 5;
      */
     public Builder clearDenialCondition() {
-      bitField0_ = (bitField0_ & ~0x00000010);
-      denialCondition_ = null;
-      if (denialConditionBuilder_ != null) {
-        denialConditionBuilder_.dispose();
+      if (denialConditionBuilder_ == null) {
+        denialCondition_ = null;
+        onChanged();
+      } else {
+        denialCondition_ = null;
         denialConditionBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2571,10 +2379,8 @@ public Builder clearDenialCondition() {
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -2584,7 +2390,7 @@ public Builder clearDenialCondition() {
      * .google.type.Expr denial_condition = 5;
      */
     public com.google.type.Expr.Builder getDenialConditionBuilder() {
-      bitField0_ |= 0x00000010;
+
       onChanged();
       return getDenialConditionFieldBuilder().getBuilder();
     }
@@ -2596,10 +2402,8 @@ public com.google.type.Expr.Builder getDenialConditionBuilder() {
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -2625,10 +2429,8 @@ public com.google.type.ExprOrBuilder getDenialConditionOrBuilder() {
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRuleOrBuilder.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRuleOrBuilder.java
index 03030d9f3d..3040ab9b06 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRuleOrBuilder.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRuleOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/deny.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 public interface DenyRuleOrBuilder
@@ -30,40 +29,32 @@ public interface DenyRuleOrBuilder
    * 
    * The identities that are prevented from using one or more permissions on
    * Google Cloud resources. This field can contain the following values:
-   *
    * * `principalSet://goog/public:all`: A special identifier that represents
    *   any principal that is on the internet, even if they do not have a Google
    *   Account or are not logged in.
-   *
    * * `principal://goog/subject/{email_id}`: A specific Google Account.
    *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
    *   example, `principal://goog/subject/alice@example.com`.
-   *
    * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
    *   Google Account that was deleted recently. For example,
    *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
    *   the Google Account is recovered, this identifier reverts to the standard
    *   identifier for a Google Account.
-   *
    * * `principalSet://goog/group/{group_id}`: A Google group. For example,
    *   `principalSet://goog/group/admins@example.com`.
-   *
    * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
    *   that was deleted recently. For example,
    *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
    *   the Google group is restored, this identifier reverts to the standard
    *   identifier for a Google group.
-   *
    * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
    *   A Google Cloud service account. For example,
    *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-   *
    * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
    *   A Google Cloud service account that was deleted recently. For example,
    *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
    *   If the service account is undeleted, this identifier reverts to the
    *   standard identifier for a service account.
-   *
    * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
    *   principals associated with the specified Google Workspace or Cloud
    *   Identity customer ID. For example,
@@ -82,40 +73,32 @@ public interface DenyRuleOrBuilder
    * 
    * The identities that are prevented from using one or more permissions on
    * Google Cloud resources. This field can contain the following values:
-   *
    * * `principalSet://goog/public:all`: A special identifier that represents
    *   any principal that is on the internet, even if they do not have a Google
    *   Account or are not logged in.
-   *
    * * `principal://goog/subject/{email_id}`: A specific Google Account.
    *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
    *   example, `principal://goog/subject/alice@example.com`.
-   *
    * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
    *   Google Account that was deleted recently. For example,
    *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
    *   the Google Account is recovered, this identifier reverts to the standard
    *   identifier for a Google Account.
-   *
    * * `principalSet://goog/group/{group_id}`: A Google group. For example,
    *   `principalSet://goog/group/admins@example.com`.
-   *
    * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
    *   that was deleted recently. For example,
    *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
    *   the Google group is restored, this identifier reverts to the standard
    *   identifier for a Google group.
-   *
    * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
    *   A Google Cloud service account. For example,
    *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-   *
    * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
    *   A Google Cloud service account that was deleted recently. For example,
    *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
    *   If the service account is undeleted, this identifier reverts to the
    *   standard identifier for a service account.
-   *
    * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
    *   principals associated with the specified Google Workspace or Cloud
    *   Identity customer ID. For example,
@@ -134,40 +117,32 @@ public interface DenyRuleOrBuilder
    * 
    * The identities that are prevented from using one or more permissions on
    * Google Cloud resources. This field can contain the following values:
-   *
    * * `principalSet://goog/public:all`: A special identifier that represents
    *   any principal that is on the internet, even if they do not have a Google
    *   Account or are not logged in.
-   *
    * * `principal://goog/subject/{email_id}`: A specific Google Account.
    *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
    *   example, `principal://goog/subject/alice@example.com`.
-   *
    * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
    *   Google Account that was deleted recently. For example,
    *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
    *   the Google Account is recovered, this identifier reverts to the standard
    *   identifier for a Google Account.
-   *
    * * `principalSet://goog/group/{group_id}`: A Google group. For example,
    *   `principalSet://goog/group/admins@example.com`.
-   *
    * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
    *   that was deleted recently. For example,
    *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
    *   the Google group is restored, this identifier reverts to the standard
    *   identifier for a Google group.
-   *
    * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
    *   A Google Cloud service account. For example,
    *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-   *
    * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
    *   A Google Cloud service account that was deleted recently. For example,
    *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
    *   If the service account is undeleted, this identifier reverts to the
    *   standard identifier for a service account.
-   *
    * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
    *   principals associated with the specified Google Workspace or Cloud
    *   Identity customer ID. For example,
@@ -187,40 +162,32 @@ public interface DenyRuleOrBuilder
    * 
    * The identities that are prevented from using one or more permissions on
    * Google Cloud resources. This field can contain the following values:
-   *
    * * `principalSet://goog/public:all`: A special identifier that represents
    *   any principal that is on the internet, even if they do not have a Google
    *   Account or are not logged in.
-   *
    * * `principal://goog/subject/{email_id}`: A specific Google Account.
    *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
    *   example, `principal://goog/subject/alice@example.com`.
-   *
    * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
    *   Google Account that was deleted recently. For example,
    *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
    *   the Google Account is recovered, this identifier reverts to the standard
    *   identifier for a Google Account.
-   *
    * * `principalSet://goog/group/{group_id}`: A Google group. For example,
    *   `principalSet://goog/group/admins@example.com`.
-   *
    * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
    *   that was deleted recently. For example,
    *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
    *   the Google group is restored, this identifier reverts to the standard
    *   identifier for a Google group.
-   *
    * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
    *   A Google Cloud service account. For example,
    *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-   *
    * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
    *   A Google Cloud service account that was deleted recently. For example,
    *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
    *   If the service account is undeleted, this identifier reverts to the
    *   standard identifier for a service account.
-   *
    * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
    *   principals associated with the specified Google Workspace or Cloud
    *   Identity customer ID. For example,
@@ -242,7 +209,6 @@ public interface DenyRuleOrBuilder
    * listed in the `denied_principals`. For example, you could add a Google
    * group to the `denied_principals`, then exclude specific users who belong to
    * that group.
-   *
    * This field can contain the same values as the `denied_principals` field,
    * excluding `principalSet://goog/public:all`, which represents all users on
    * the internet.
@@ -262,7 +228,6 @@ public interface DenyRuleOrBuilder
    * listed in the `denied_principals`. For example, you could add a Google
    * group to the `denied_principals`, then exclude specific users who belong to
    * that group.
-   *
    * This field can contain the same values as the `denied_principals` field,
    * excluding `principalSet://goog/public:all`, which represents all users on
    * the internet.
@@ -282,7 +247,6 @@ public interface DenyRuleOrBuilder
    * listed in the `denied_principals`. For example, you could add a Google
    * group to the `denied_principals`, then exclude specific users who belong to
    * that group.
-   *
    * This field can contain the same values as the `denied_principals` field,
    * excluding `principalSet://goog/public:all`, which represents all users on
    * the internet.
@@ -303,7 +267,6 @@ public interface DenyRuleOrBuilder
    * listed in the `denied_principals`. For example, you could add a Google
    * group to the `denied_principals`, then exclude specific users who belong to
    * that group.
-   *
    * This field can contain the same values as the `denied_principals` field,
    * excluding `principalSet://goog/public:all`, which represents all users on
    * the internet.
@@ -390,7 +353,6 @@ public interface DenyRuleOrBuilder
    * permissions given by `denied_permissions`. If a permission appears in
    * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
    * denied.
-   *
    * The excluded permissions can be specified using the same syntax as
    * `denied_permissions`.
    * 

@@ -409,7 +371,6 @@ public interface DenyRuleOrBuilder
    * permissions given by `denied_permissions`. If a permission appears in
    * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
    * denied.
-   *
    * The excluded permissions can be specified using the same syntax as
    * `denied_permissions`.
    * 

@@ -428,7 +389,6 @@ public interface DenyRuleOrBuilder
    * permissions given by `denied_permissions`. If a permission appears in
    * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
    * denied.
-   *
    * The excluded permissions can be specified using the same syntax as
    * `denied_permissions`.
    * 

@@ -448,7 +408,6 @@ public interface DenyRuleOrBuilder
    * permissions given by `denied_permissions`. If a permission appears in
    * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
    * denied.
-   *
    * The excluded permissions can be specified using the same syntax as
    * `denied_permissions`.
    * 

@@ -467,10 +426,8 @@ public interface DenyRuleOrBuilder
    * The condition that determines whether this deny rule applies to a request.
    * If the condition expression evaluates to `true`, then the deny rule is
    * applied; otherwise, the deny rule is not applied.
-   *
    * Each deny rule is evaluated independently. If this deny rule does not apply
    * to a request, other deny rules might still apply.
-   *
    * The condition can use CEL functions that evaluate
    * [resource
    * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -490,10 +447,8 @@ public interface DenyRuleOrBuilder
    * The condition that determines whether this deny rule applies to a request.
    * If the condition expression evaluates to `true`, then the deny rule is
    * applied; otherwise, the deny rule is not applied.
-   *
    * Each deny rule is evaluated independently. If this deny rule does not apply
    * to a request, other deny rules might still apply.
-   *
    * The condition can use CEL functions that evaluate
    * [resource
    * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -513,10 +468,8 @@ public interface DenyRuleOrBuilder
    * The condition that determines whether this deny rule applies to a request.
    * If the condition expression evaluates to `true`, then the deny rule is
    * applied; otherwise, the deny rule is not applied.
-   *
    * Each deny rule is evaluated independently. If this deny rule does not apply
    * to a request, other deny rules might still apply.
-   *
    * The condition can use CEL functions that evaluate
    * [resource
    * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRuleProto.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRuleProto.java
index ce49ed9e9a..6538abdbf5 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRuleProto.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRuleProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/deny.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 public final class DenyRuleProto {
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/GetPolicyRequest.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/GetPolicyRequest.java
index 02e546f514..80f001a67e 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/GetPolicyRequest.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/GetPolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GetPolicyRequest();
   }
 
+  @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.iam.v2.PolicyProto.internal_static_google_iam_v2_GetPolicyRequest_descriptor;
   }
@@ -64,9 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -74,12 +76,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * Required. The resource name of the policy to retrieve. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * Use the URL-encoded full resource name, which means that the forward-slash
    * character, `/`, must be written as `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -107,12 +106,9 @@ public java.lang.String getName() {
    * 
    * Required. The resource name of the policy to retrieve. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * Use the URL-encoded full resource name, which means that the forward-slash
    * character, `/`, must be written as `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -330,8 +326,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -358,20 +354,11 @@ public com.google.iam.v2.GetPolicyRequest build() {
     @java.lang.Override
     public com.google.iam.v2.GetPolicyRequest buildPartial() {
       com.google.iam.v2.GetPolicyRequest result = new com.google.iam.v2.GetPolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v2.GetPolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -419,7 +406,6 @@ public Builder mergeFrom(com.google.iam.v2.GetPolicyRequest other) {
       if (other == com.google.iam.v2.GetPolicyRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -451,7 +437,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -471,8 +457,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -481,12 +465,9 @@ public Builder mergeFrom(
      * 
      * Required. The resource name of the policy to retrieve. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -513,12 +494,9 @@ public java.lang.String getName() {
      * 
      * Required. The resource name of the policy to retrieve. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -545,12 +523,9 @@ public com.google.protobuf.ByteString getNameBytes() {
      * 
      * Required. The resource name of the policy to retrieve. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -564,8 +539,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -576,12 +551,9 @@ public Builder setName(java.lang.String value) {
      * 
      * Required. The resource name of the policy to retrieve. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -591,8 +563,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -603,12 +575,9 @@ public Builder clearName() {
      * 
      * Required. The resource name of the policy to retrieve. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -623,8 +592,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/GetPolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/GetPolicyRequestOrBuilder.java
index d0f05816fc..1dd737f461 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/GetPolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/GetPolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 public interface GetPolicyRequestOrBuilder
@@ -30,12 +29,9 @@ public interface GetPolicyRequestOrBuilder
    * 
    * Required. The resource name of the policy to retrieve. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * Use the URL-encoded full resource name, which means that the forward-slash
    * character, `/`, must be written as `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -52,12 +48,9 @@ public interface GetPolicyRequestOrBuilder
    * 
    * Required. The resource name of the policy to retrieve. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * Use the URL-encoded full resource name, which means that the forward-slash
    * character, `/`, must be written as `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesRequest.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesRequest.java
index caa9080be8..1bba88f5ce 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesRequest.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListPoliciesRequest();
   }
 
+  @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.iam.v2.PolicyProto
         .internal_static_google_iam_v2_ListPoliciesRequest_descriptor;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -77,13 +79,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * Required. The resource that the policy is attached to, along with the kind of policy
    * to list. Format:
    * `policies/{attachment_point}/denypolicies`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -112,13 +111,10 @@ public java.lang.String getParent() {
    * Required. The resource that the policy is attached to, along with the kind of policy
    * to list. Format:
    * `policies/{attachment_point}/denypolicies`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -141,7 +137,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -161,9 +157,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -429,10 +423,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       parent_ = "";
+
       pageSize_ = 0;
+
       pageToken_ = "";
+
       return this;
     }
 
@@ -460,26 +456,13 @@ public com.google.iam.v2.ListPoliciesRequest build() {
     public com.google.iam.v2.ListPoliciesRequest buildPartial() {
       com.google.iam.v2.ListPoliciesRequest result =
           new com.google.iam.v2.ListPoliciesRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.parent_ = parent_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v2.ListPoliciesRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.parent_ = parent_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -527,7 +510,6 @@ public Builder mergeFrom(com.google.iam.v2.ListPoliciesRequest other) {
       if (other == com.google.iam.v2.ListPoliciesRequest.getDefaultInstance()) return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -535,7 +517,6 @@ public Builder mergeFrom(com.google.iam.v2.ListPoliciesRequest other) {
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -567,19 +548,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -599,8 +580,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object parent_ = "";
 
     /**
@@ -610,13 +589,10 @@ public Builder mergeFrom(
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to list. Format:
      * `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -644,13 +620,10 @@ public java.lang.String getParent() {
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to list. Format:
      * `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -678,13 +651,10 @@ public com.google.protobuf.ByteString getParentBytes() {
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to list. Format:
      * `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -698,8 +668,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -711,13 +681,10 @@ public Builder setParent(java.lang.String value) {
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to list. Format:
      * `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -727,8 +694,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -740,13 +707,10 @@ public Builder clearParent() {
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to list. Format:
      * `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -761,8 +725,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -802,7 +766,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -820,7 +783,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -893,8 +856,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -912,8 +875,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -936,8 +899,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesRequestOrBuilder.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesRequestOrBuilder.java
index 6d175995bb..d208d686a8 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 public interface ListPoliciesRequestOrBuilder
@@ -31,13 +30,10 @@ public interface ListPoliciesRequestOrBuilder
    * Required. The resource that the policy is attached to, along with the kind of policy
    * to list. Format:
    * `policies/{attachment_point}/denypolicies`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -55,13 +51,10 @@ public interface ListPoliciesRequestOrBuilder
    * Required. The resource that the policy is attached to, along with the kind of policy
    * to list. Format:
    * `policies/{attachment_point}/denypolicies`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesResponse.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesResponse.java
index 92f6f8c838..eb2f0178ac 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesResponse.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListPoliciesResponse();
   }
 
+  @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.iam.v2.PolicyProto
         .internal_static_google_iam_v2_ListPoliciesResponse_descriptor;
@@ -66,8 +70,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int POLICIES_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List policies_;
 
   /**
@@ -141,9 +143,7 @@ public com.google.iam.v2.PolicyOrBuilder getPoliciesOrBuilder(int index) {
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -403,7 +403,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (policiesBuilder_ == null) {
         policies_ = java.util.Collections.emptyList();
       } else {
@@ -412,6 +411,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -439,15 +439,7 @@ public com.google.iam.v2.ListPoliciesResponse build() {
     public com.google.iam.v2.ListPoliciesResponse buildPartial() {
       com.google.iam.v2.ListPoliciesResponse result =
           new com.google.iam.v2.ListPoliciesResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.iam.v2.ListPoliciesResponse result) {
+      int from_bitField0_ = bitField0_;
       if (policiesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           policies_ = java.util.Collections.unmodifiableList(policies_);
@@ -457,13 +449,9 @@ private void buildPartialRepeatedFields(com.google.iam.v2.ListPoliciesResponse r
       } else {
         result.policies_ = policiesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.iam.v2.ListPoliciesResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -540,7 +528,6 @@ public Builder mergeFrom(com.google.iam.v2.ListPoliciesResponse other) {
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -584,7 +571,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1032,8 +1019,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1051,8 +1038,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1075,8 +1062,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesResponseOrBuilder.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesResponseOrBuilder.java
index e0c039eebf..b916552a6d 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesResponseOrBuilder.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 public interface ListPoliciesResponseOrBuilder
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/Policy.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/Policy.java
index d5208eed0d..9d708a159c 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/Policy.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/Policy.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 /**
@@ -55,14 +54,18 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Policy();
   }
 
+  @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.iam.v2.PolicyProto.internal_static_google_iam_v2_Policy_descriptor;
   }
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 5:
         return internalGetAnnotations();
@@ -79,11 +82,8 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
             com.google.iam.v2.Policy.class, com.google.iam.v2.Policy.Builder.class);
   }
 
-  private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -91,13 +91,10 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
    * 
    * Immutable. The resource name of the `Policy`, which must be unique. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, requests can use the alphanumeric or the numeric ID.
    * Responses always contain the numeric ID.
@@ -126,13 +123,10 @@ public java.lang.String getName() {
    * 
    * Immutable. The resource name of the `Policy`, which must be unique. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, requests can use the alphanumeric or the numeric ID.
    * Responses always contain the numeric ID.
@@ -156,9 +150,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int UID_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object uid_ = "";
+  private volatile java.lang.Object uid_;
 
   /**
    *
@@ -211,9 +203,7 @@ public com.google.protobuf.ByteString getUidBytes() {
   }
 
   public static final int KIND_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object kind_ = "";
+  private volatile java.lang.Object kind_;
 
   /**
    *
@@ -264,9 +254,7 @@ public com.google.protobuf.ByteString getKindBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object displayName_ = "";
+  private volatile java.lang.Object displayName_;
 
   /**
    *
@@ -331,7 +319,6 @@ private static final class AnnotationsDefaultEntryHolder {
             "");
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField annotations_;
 
   private com.google.protobuf.MapField
@@ -397,10 +384,8 @@ public java.util.Map getAnnotationsMap() {
    * map<string, string> annotations = 5;
    */
   @java.lang.Override
-  public /* nullable */ java.lang.String getAnnotationsOrDefault(
-      java.lang.String key,
-      /* nullable */
-      java.lang.String defaultValue) {
+  public java.lang.String getAnnotationsOrDefault(
+      java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -431,9 +416,7 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
   }
 
   public static final int ETAG_FIELD_NUMBER = 6;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object etag_ = "";
+  private volatile java.lang.Object etag_;
 
   /**
    *
@@ -442,7 +425,6 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
    * An opaque tag that identifies the current version of the `Policy`. IAM uses
    * this value to help manage concurrent updates, so they do not cause one
    * update to be overwritten by another.
-   *
    * If this field is present in a [CreatePolicy][] request, the value is
    * ignored.
    * 

@@ -471,7 +453,6 @@ public java.lang.String getEtag() {
    * An opaque tag that identifies the current version of the `Policy`. IAM uses
    * this value to help manage concurrent updates, so they do not cause one
    * update to be overwritten by another.
-   *
    * If this field is present in a [CreatePolicy][] request, the value is
    * ignored.
    * 

@@ -510,7 +491,7 @@ public com.google.protobuf.ByteString getEtagBytes() {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return createTime_ != null;
   }
 
   /**
@@ -542,7 +523,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+    return getCreateTime();
   }
 
   public static final int UPDATE_TIME_FIELD_NUMBER = 8;
@@ -562,7 +543,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateTime() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return updateTime_ != null;
   }
 
   /**
@@ -594,7 +575,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+    return getUpdateTime();
   }
 
   public static final int DELETE_TIME_FIELD_NUMBER = 9;
@@ -614,7 +595,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasDeleteTime() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return deleteTime_ != null;
   }
 
   /**
@@ -646,12 +627,10 @@ public com.google.protobuf.Timestamp getDeleteTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getDeleteTimeOrBuilder() {
-    return deleteTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : deleteTime_;
+    return getDeleteTime();
   }
 
   public static final int RULES_FIELD_NUMBER = 10;
-
-  @SuppressWarnings("serial")
   private java.util.List rules_;
 
   /**
@@ -730,9 +709,7 @@ public com.google.iam.v2.PolicyRuleOrBuilder getRulesOrBuilder(int index) {
   }
 
   public static final int MANAGING_AUTHORITY_FIELD_NUMBER = 11;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object managingAuthority_ = "";
+  private volatile java.lang.Object managingAuthority_;
 
   /**
    *
@@ -815,13 +792,13 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(etag_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 6, etag_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       output.writeMessage(7, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateTime_ != null) {
       output.writeMessage(8, getUpdateTime());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (deleteTime_ != null) {
       output.writeMessage(9, getDeleteTime());
     }
     for (int i = 0; i < rules_.size(); i++) {
@@ -864,13 +841,13 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(etag_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, etag_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getUpdateTime());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (deleteTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getDeleteTime());
     }
     for (int i = 0; i < rules_.size(); i++) {
@@ -1075,8 +1052,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 5:
           return internalGetAnnotations();
@@ -1086,8 +1062,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 5:
           return internalGetMutableAnnotations();
@@ -1105,47 +1080,42 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     }
 
     // Construct using com.google.iam.v2.Policy.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCreateTimeFieldBuilder();
-        getUpdateTimeFieldBuilder();
-        getDeleteTimeFieldBuilder();
-        getRulesFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       uid_ = "";
+
       kind_ = "";
+
       displayName_ = "";
+
       internalGetMutableAnnotations().clear();
       etag_ = "";
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
-      deleteTime_ = null;
-      if (deleteTimeBuilder_ != null) {
-        deleteTimeBuilder_.dispose();
+      if (deleteTimeBuilder_ == null) {
+        deleteTime_ = null;
+      } else {
+        deleteTime_ = null;
         deleteTimeBuilder_ = null;
       }
       if (rulesBuilder_ == null) {
@@ -1154,8 +1124,9 @@ public Builder clear() {
         rules_ = null;
         rulesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000200);
+      bitField0_ = (bitField0_ & ~0x00000002);
       managingAuthority_ = "";
+
       return this;
     }
 
@@ -1181,64 +1152,41 @@ public com.google.iam.v2.Policy build() {
     @java.lang.Override
     public com.google.iam.v2.Policy buildPartial() {
       com.google.iam.v2.Policy result = new com.google.iam.v2.Policy(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      result.name_ = name_;
+      result.uid_ = uid_;
+      result.kind_ = kind_;
+      result.displayName_ = displayName_;
+      result.annotations_ = internalGetAnnotations();
+      result.annotations_.makeImmutable();
+      result.etag_ = etag_;
+      if (createTimeBuilder_ == null) {
+        result.createTime_ = createTime_;
+      } else {
+        result.createTime_ = createTimeBuilder_.build();
+      }
+      if (updateTimeBuilder_ == null) {
+        result.updateTime_ = updateTime_;
+      } else {
+        result.updateTime_ = updateTimeBuilder_.build();
+      }
+      if (deleteTimeBuilder_ == null) {
+        result.deleteTime_ = deleteTime_;
+      } else {
+        result.deleteTime_ = deleteTimeBuilder_.build();
       }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.iam.v2.Policy result) {
       if (rulesBuilder_ == null) {
-        if (((bitField0_ & 0x00000200) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
-          bitField0_ = (bitField0_ & ~0x00000200);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.rules_ = rules_;
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.iam.v2.Policy result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.uid_ = uid_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.kind_ = kind_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.displayName_ = displayName_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.annotations_ = internalGetAnnotations();
-        result.annotations_.makeImmutable();
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.etag_ = etag_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      if (((from_bitField0_ & 0x00000100) != 0)) {
-        result.deleteTime_ = deleteTimeBuilder_ == null ? deleteTime_ : deleteTimeBuilder_.build();
-        to_bitField0_ |= 0x00000004;
-      }
-      if (((from_bitField0_ & 0x00000400) != 0)) {
-        result.managingAuthority_ = managingAuthority_;
-      }
-      result.bitField0_ |= to_bitField0_;
+      result.managingAuthority_ = managingAuthority_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1288,29 +1236,23 @@ public Builder mergeFrom(com.google.iam.v2.Policy other) {
       if (other == com.google.iam.v2.Policy.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getUid().isEmpty()) {
         uid_ = other.uid_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getKind().isEmpty()) {
         kind_ = other.kind_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       internalGetMutableAnnotations().mergeFrom(other.internalGetAnnotations());
-      bitField0_ |= 0x00000010;
       if (!other.getEtag().isEmpty()) {
         etag_ = other.etag_;
-        bitField0_ |= 0x00000020;
         onChanged();
       }
       if (other.hasCreateTime()) {
@@ -1326,7 +1268,7 @@ public Builder mergeFrom(com.google.iam.v2.Policy other) {
         if (!other.rules_.isEmpty()) {
           if (rules_.isEmpty()) {
             rules_ = other.rules_;
-            bitField0_ = (bitField0_ & ~0x00000200);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureRulesIsMutable();
             rules_.addAll(other.rules_);
@@ -1339,7 +1281,7 @@ public Builder mergeFrom(com.google.iam.v2.Policy other) {
             rulesBuilder_.dispose();
             rulesBuilder_ = null;
             rules_ = other.rules_;
-            bitField0_ = (bitField0_ & ~0x00000200);
+            bitField0_ = (bitField0_ & ~0x00000002);
             rulesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getRulesFieldBuilder()
@@ -1351,7 +1293,6 @@ public Builder mergeFrom(com.google.iam.v2.Policy other) {
       }
       if (!other.getManagingAuthority().isEmpty()) {
         managingAuthority_ = other.managingAuthority_;
-        bitField0_ |= 0x00000400;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -1383,25 +1324,25 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 uid_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 kind_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 displayName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             case 42:
@@ -1413,31 +1354,30 @@ public Builder mergeFrom(
                 internalGetMutableAnnotations()
                     .getMutableMap()
                     .put(annotations__.getKey(), annotations__.getValue());
-                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 50:
               {
                 etag_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 50
             case 58:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 58
             case 66:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 66
             case 74:
               {
                 input.readMessage(getDeleteTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000100;
+
                 break;
               } // case 74
             case 82:
@@ -1455,7 +1395,7 @@ public Builder mergeFrom(
             case 90:
               {
                 managingAuthority_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000400;
+
                 break;
               } // case 90
             default:
@@ -1485,13 +1425,10 @@ public Builder mergeFrom(
      * 
      * Immutable. The resource name of the `Policy`, which must be unique. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, requests can use the alphanumeric or the numeric ID.
      * Responses always contain the numeric ID.
@@ -1519,13 +1456,10 @@ public java.lang.String getName() {
      * 
      * Immutable. The resource name of the `Policy`, which must be unique. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, requests can use the alphanumeric or the numeric ID.
      * Responses always contain the numeric ID.
@@ -1553,13 +1487,10 @@ public com.google.protobuf.ByteString getNameBytes() {
      * 
      * Immutable. The resource name of the `Policy`, which must be unique. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, requests can use the alphanumeric or the numeric ID.
      * Responses always contain the numeric ID.
@@ -1574,8 +1505,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1586,13 +1517,10 @@ public Builder setName(java.lang.String value) {
      * 
      * Immutable. The resource name of the `Policy`, which must be unique. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, requests can use the alphanumeric or the numeric ID.
      * Responses always contain the numeric ID.
@@ -1603,8 +1531,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1615,13 +1543,10 @@ public Builder clearName() {
      * 
      * Immutable. The resource name of the `Policy`, which must be unique. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, requests can use the alphanumeric or the numeric ID.
      * Responses always contain the numeric ID.
@@ -1637,8 +1562,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1710,8 +1635,8 @@ public Builder setUid(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       uid_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1729,8 +1654,8 @@ public Builder setUid(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearUid() {
+
       uid_ = getDefaultInstance().getUid();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1753,8 +1678,8 @@ public Builder setUidBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       uid_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1823,8 +1748,8 @@ public Builder setKind(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       kind_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1841,8 +1766,8 @@ public Builder setKind(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearKind() {
+
       kind_ = getDefaultInstance().getKind();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1864,8 +1789,8 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       kind_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1937,8 +1862,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       displayName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1956,8 +1881,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
+
       displayName_ = getDefaultInstance().getDisplayName();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1980,8 +1905,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       displayName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1999,6 +1924,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
 
     private com.google.protobuf.MapField
         internalGetMutableAnnotations() {
+      onChanged();
+      ;
       if (annotations_ == null) {
         annotations_ =
             com.google.protobuf.MapField.newMapField(AnnotationsDefaultEntryHolder.defaultEntry);
@@ -2006,8 +1933,6 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
       if (!annotations_.isMutable()) {
         annotations_ = annotations_.copy();
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
       return annotations_;
     }
 
@@ -2066,10 +1991,8 @@ public java.util.Map getAnnotationsMap() {
      * map<string, string> annotations = 5;
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getAnnotationsOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getAnnotationsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -2100,7 +2023,6 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
     }
 
     public Builder clearAnnotations() {
-      bitField0_ = (bitField0_ & ~0x00000010);
       internalGetMutableAnnotations().getMutableMap().clear();
       return this;
     }
@@ -2126,7 +2048,6 @@ public Builder removeAnnotations(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableAnnotations() {
-      bitField0_ |= 0x00000010;
       return internalGetMutableAnnotations().getMutableMap();
     }
 
@@ -2147,8 +2068,8 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
+
       internalGetMutableAnnotations().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000010;
       return this;
     }
 
@@ -2164,7 +2085,6 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllAnnotations(java.util.Map values) {
       internalGetMutableAnnotations().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000010;
       return this;
     }
 
@@ -2177,7 +2097,6 @@ public Builder putAllAnnotations(java.util.Map
@@ -2205,7 +2124,6 @@ public java.lang.String getEtag() {
      * An opaque tag that identifies the current version of the `Policy`. IAM uses
      * this value to help manage concurrent updates, so they do not cause one
      * update to be overwritten by another.
-     *
      * If this field is present in a [CreatePolicy][] request, the value is
      * ignored.
      * 

@@ -2233,7 +2151,6 @@ public com.google.protobuf.ByteString getEtagBytes() {
      * An opaque tag that identifies the current version of the `Policy`. IAM uses
      * this value to help manage concurrent updates, so they do not cause one
      * update to be overwritten by another.
-     *
      * If this field is present in a [CreatePolicy][] request, the value is
      * ignored.
      * 

@@ -2247,8 +2164,8 @@ public Builder setEtag(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       etag_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2260,7 +2177,6 @@ public Builder setEtag(java.lang.String value) {
      * An opaque tag that identifies the current version of the `Policy`. IAM uses
      * this value to help manage concurrent updates, so they do not cause one
      * update to be overwritten by another.
-     *
      * If this field is present in a [CreatePolicy][] request, the value is
      * ignored.
      * 

@@ -2270,8 +2186,8 @@ public Builder setEtag(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEtag() {
+
       etag_ = getDefaultInstance().getEtag();
-      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -2283,7 +2199,6 @@ public Builder clearEtag() {
      * An opaque tag that identifies the current version of the `Policy`. IAM uses
      * this value to help manage concurrent updates, so they do not cause one
      * update to be overwritten by another.
-     *
      * If this field is present in a [CreatePolicy][] request, the value is
      * ignored.
      * 

@@ -2298,8 +2213,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       etag_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2325,7 +2240,7 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return ((bitField0_ & 0x00000040) != 0);
+      return createTimeBuilder_ != null || createTime_ != null;
     }
 
     /**
@@ -2368,11 +2283,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -2390,11 +2305,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -2411,20 +2326,17 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000040) != 0)
-            && createTime_ != null
-            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getCreateTimeBuilder().mergeFrom(value);
+        if (createTime_ != null) {
+          createTime_ =
+              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
         } else {
           createTime_ = value;
         }
+        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-      if (createTime_ != null) {
-        bitField0_ |= 0x00000040;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2440,13 +2352,14 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearCreateTime() {
-      bitField0_ = (bitField0_ & ~0x00000040);
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+        onChanged();
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2462,7 +2375,7 @@ public Builder clearCreateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-      bitField0_ |= 0x00000040;
+
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -2537,7 +2450,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      * @return Whether the updateTime field is set.
      */
     public boolean hasUpdateTime() {
-      return ((bitField0_ & 0x00000080) != 0);
+      return updateTimeBuilder_ != null || updateTime_ != null;
     }
 
     /**
@@ -2580,11 +2493,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         updateTime_ = value;
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -2602,11 +2515,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
     public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (updateTimeBuilder_ == null) {
         updateTime_ = builderForValue.build();
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -2623,20 +2536,17 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       if (updateTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000080) != 0)
-            && updateTime_ != null
-            && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getUpdateTimeBuilder().mergeFrom(value);
+        if (updateTime_ != null) {
+          updateTime_ =
+              com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
         } else {
           updateTime_ = value;
         }
+        onChanged();
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-      if (updateTime_ != null) {
-        bitField0_ |= 0x00000080;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2652,13 +2562,14 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearUpdateTime() {
-      bitField0_ = (bitField0_ & ~0x00000080);
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+        onChanged();
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2674,7 +2585,7 @@ public Builder clearUpdateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-      bitField0_ |= 0x00000080;
+
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
@@ -2749,7 +2660,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
      * @return Whether the deleteTime field is set.
      */
     public boolean hasDeleteTime() {
-      return ((bitField0_ & 0x00000100) != 0);
+      return deleteTimeBuilder_ != null || deleteTime_ != null;
     }
 
     /**
@@ -2792,11 +2703,11 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         deleteTime_ = value;
+        onChanged();
       } else {
         deleteTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000100;
-      onChanged();
+
       return this;
     }
 
@@ -2814,11 +2725,11 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp value) {
     public Builder setDeleteTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (deleteTimeBuilder_ == null) {
         deleteTime_ = builderForValue.build();
+        onChanged();
       } else {
         deleteTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000100;
-      onChanged();
+
       return this;
     }
 
@@ -2835,20 +2746,17 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeDeleteTime(com.google.protobuf.Timestamp value) {
       if (deleteTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000100) != 0)
-            && deleteTime_ != null
-            && deleteTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getDeleteTimeBuilder().mergeFrom(value);
+        if (deleteTime_ != null) {
+          deleteTime_ =
+              com.google.protobuf.Timestamp.newBuilder(deleteTime_).mergeFrom(value).buildPartial();
         } else {
           deleteTime_ = value;
         }
+        onChanged();
       } else {
         deleteTimeBuilder_.mergeFrom(value);
       }
-      if (deleteTime_ != null) {
-        bitField0_ |= 0x00000100;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2864,13 +2772,14 @@ public Builder mergeDeleteTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearDeleteTime() {
-      bitField0_ = (bitField0_ & ~0x00000100);
-      deleteTime_ = null;
-      if (deleteTimeBuilder_ != null) {
-        deleteTimeBuilder_.dispose();
+      if (deleteTimeBuilder_ == null) {
+        deleteTime_ = null;
+        onChanged();
+      } else {
+        deleteTime_ = null;
         deleteTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2886,7 +2795,7 @@ public Builder clearDeleteTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getDeleteTimeBuilder() {
-      bitField0_ |= 0x00000100;
+
       onChanged();
       return getDeleteTimeFieldBuilder().getBuilder();
     }
@@ -2943,9 +2852,9 @@ public com.google.protobuf.TimestampOrBuilder getDeleteTimeOrBuilder() {
     private java.util.List rules_ = java.util.Collections.emptyList();
 
     private void ensureRulesIsMutable() {
-      if (!((bitField0_ & 0x00000200) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         rules_ = new java.util.ArrayList(rules_);
-        bitField0_ |= 0x00000200;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -3178,7 +3087,7 @@ public Builder addAllRules(java.lang.Iterable getRulesBuilderList(
                 com.google.iam.v2.PolicyRule,
                 com.google.iam.v2.PolicyRule.Builder,
                 com.google.iam.v2.PolicyRuleOrBuilder>(
-                rules_, ((bitField0_ & 0x00000200) != 0), getParentForChildren(), isClean());
+                rules_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         rules_ = null;
       }
       return rulesBuilder_;
@@ -3384,8 +3293,8 @@ public Builder setManagingAuthority(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       managingAuthority_ = value;
-      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -3403,8 +3312,8 @@ public Builder setManagingAuthority(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearManagingAuthority() {
+
       managingAuthority_ = getDefaultInstance().getManagingAuthority();
-      bitField0_ = (bitField0_ & ~0x00000400);
       onChanged();
       return this;
     }
@@ -3427,8 +3336,8 @@ public Builder setManagingAuthorityBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       managingAuthority_ = value;
-      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOperationMetadata.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOperationMetadata.java
index 634f27d9c5..b6eac3bb8b 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOperationMetadata.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOperationMetadata.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 /**
@@ -47,6 +46,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PolicyOperationMetadata();
   }
 
+  @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.iam.v2.PolicyProto
         .internal_static_google_iam_v2_PolicyOperationMetadata_descriptor;
@@ -62,7 +66,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v2.PolicyOperationMetadata.Builder.class);
   }
 
-  private int bitField0_;
   public static final int CREATE_TIME_FIELD_NUMBER = 1;
   private com.google.protobuf.Timestamp createTime_;
 
@@ -79,7 +82,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return createTime_ != null;
   }
 
   /**
@@ -109,7 +112,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+    return getCreateTime();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -126,7 +129,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       output.writeMessage(1, getCreateTime());
     }
     getUnknownFields().writeTo(output);
@@ -138,7 +141,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCreateTime());
     }
     size += getUnknownFields().getSerializedSize();
@@ -306,28 +309,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2.PolicyOperationMetadata.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCreateTimeFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
       return this;
@@ -357,23 +351,15 @@ public com.google.iam.v2.PolicyOperationMetadata build() {
     public com.google.iam.v2.PolicyOperationMetadata buildPartial() {
       com.google.iam.v2.PolicyOperationMetadata result =
           new com.google.iam.v2.PolicyOperationMetadata(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (createTimeBuilder_ == null) {
+        result.createTime_ = createTime_;
+      } else {
+        result.createTime_ = createTimeBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v2.PolicyOperationMetadata result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -451,7 +437,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -471,8 +457,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.protobuf.Timestamp createTime_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.protobuf.Timestamp,
@@ -492,7 +476,7 @@ public Builder mergeFrom(
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return createTimeBuilder_ != null || createTime_ != null;
     }
 
     /**
@@ -531,11 +515,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -551,11 +535,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -570,20 +554,17 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && createTime_ != null
-            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getCreateTimeBuilder().mergeFrom(value);
+        if (createTime_ != null) {
+          createTime_ =
+              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
         } else {
           createTime_ = value;
         }
+        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-      if (createTime_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -597,13 +578,14 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * .google.protobuf.Timestamp create_time = 1;
      */
     public Builder clearCreateTime() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+        onChanged();
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -617,7 +599,7 @@ public Builder clearCreateTime() {
      * .google.protobuf.Timestamp create_time = 1;
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOperationMetadataOrBuilder.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOperationMetadataOrBuilder.java
index 7a389462e0..0bd10c9d2f 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOperationMetadataOrBuilder.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOperationMetadataOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 public interface PolicyOperationMetadataOrBuilder
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOrBuilder.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOrBuilder.java
index 9fc0baa6a3..65f257b583 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOrBuilder.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 public interface PolicyOrBuilder
@@ -30,13 +29,10 @@ public interface PolicyOrBuilder
    * 
    * Immutable. The resource name of the `Policy`, which must be unique. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, requests can use the alphanumeric or the numeric ID.
    * Responses always contain the numeric ID.
@@ -54,13 +50,10 @@ public interface PolicyOrBuilder
    * 
    * Immutable. The resource name of the `Policy`, which must be unique. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, requests can use the alphanumeric or the numeric ID.
    * Responses always contain the numeric ID.
@@ -204,6 +197,7 @@ public interface PolicyOrBuilder
    *
    * map<string, string> annotations = 5;
    */
+
   /* nullable */
   java.lang.String getAnnotationsOrDefault(
       java.lang.String key,
@@ -229,7 +223,6 @@ java.lang.String getAnnotationsOrDefault(
    * An opaque tag that identifies the current version of the `Policy`. IAM uses
    * this value to help manage concurrent updates, so they do not cause one
    * update to be overwritten by another.
-   *
    * If this field is present in a [CreatePolicy][] request, the value is
    * ignored.
    * 

@@ -247,7 +240,6 @@ java.lang.String getAnnotationsOrDefault(
    * An opaque tag that identifies the current version of the `Policy`. IAM uses
    * this value to help manage concurrent updates, so they do not cause one
    * update to be overwritten by another.
-   *
    * If this field is present in a [CreatePolicy][] request, the value is
    * ignored.
    * 

diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyProto.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyProto.java
index b8e78e8dba..94afb50ebd 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyProto.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 public final class PolicyProto {
@@ -125,22 +124,21 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\013create_time\030\001 \001(\0132\032.google.protobuf.Timestamp2\320\006\n"
           + "\010Policies\022\203\001\n"
           + "\014ListPolicies\022\".google.iam.v2.ListPoliciesRequest\032#"
-          + ".google.iam.v2.ListPoliciesResponse\"*\332A\006"
-          + "parent\202\323\344\223\002\033\022\031/v2/{parent=policies/*/*}\022m\n"
+          + ".google.iam.v2.ListPoliciesResponse\"*\202\323\344"
+          + "\223\002\033\022\031/v2/{parent=policies/*/*}\332A\006parent\022m\n"
           + "\tGetPolicy\022\037.google.iam.v2.GetPolicyRe"
-          + "quest\032\025.google.iam.v2.Policy\"(\332A\004name\202\323\344\223\002\033\022\031/v2/{name=policies/*/*/*}\022\272\001\n"
-          + "\014Creat"
-          + "ePolicy\022\".google.iam.v2.CreatePolicyRequest\032\035.google.longrunning.Operation\"g\312A!\n"
-          + "\006Policy\022\027PolicyOperationMetadata\332A\027paren"
-          + "t,policy,policy_id\202\323\344\223\002#\"\031/v2/{parent=policies/*/*}:\006policy\022\247\001\n"
+          + "quest\032\025.google.iam.v2.Policy\"(\202\323\344\223\002\033\022\031/v2/{name=policies/*/*/*}\332A\004name\022\272\001\n"
+          + "\014CreatePolicy\022\".google.iam.v2.CreatePolicyRequ"
+          + "est\032\035.google.longrunning.Operation\"g\202\323\344\223"
+          + "\002#\"\031/v2/{parent=policies/*/*}:\006policy\332A\027parent,policy,policy_id\312A!\n"
+          + "\006Policy\022\027PolicyOperationMetadata\022\247\001\n"
           + "\014UpdatePolicy\022\".g"
-          + "oogle.iam.v2.UpdatePolicyRequest\032\035.google.longrunning.Operation\"T\312A!\n"
-          + "\006Policy\022\027PolicyOperationMetadata\202\323\344\223\002*\032"
-          + " /v2/{policy.name=policies/*/*/*}:\006policy\022\237\001\n"
-          + "\014Delete"
-          + "Policy\022\".google.iam.v2.DeletePolicyRequest\032\035.google.longrunning.Operation\"L\312A!\n"
-          + "\006Policy\022\027PolicyOperationMetadata\332A\004name\202\323"
-          + "\344\223\002\033*\031/v2/{name=policies/*/*/*}\032F\312A\022iam."
+          + "oogle.iam.v2.UpdatePolicyRequest\032\035.google.longrunning.Operation\"T\202\323\344\223\002*\032"
+          + " /v2/{policy.name=policies/*/*/*}:\006policy\312A!\n"
+          + "\006Policy\022\027PolicyOperationMetadata\022\237\001\n"
+          + "\014DeletePolicy\022\".google.iam.v2.DeletePolicyReque"
+          + "st\032\035.google.longrunning.Operation\"L\202\323\344\223\002\033*\031/v2/{name=policies/*/*/*}\332A\004name\312A!\n"
+          + "\006Policy\022\027PolicyOperationMetadata\032F\312A\022iam."
           + "googleapis.com\322A.https://www.googleapis.com/auth/cloud-platformBy\n"
           + "\021com.google.iam.v2B\013PolicyProtoP\001Z)cloud.google.com/go"
           + "/iam/apiv2/iampb;iampb\252\002\023Google.Cloud.Ia"
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyRule.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyRule.java
index 4ad7526b33..821a743f8d 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyRule.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyRule.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PolicyRule();
   }
 
+  @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.iam.v2.PolicyProto.internal_static_google_iam_v2_PolicyRule_descriptor;
   }
@@ -62,8 +66,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   private int kindCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object kind_;
 
   public enum KindCase
@@ -163,9 +165,7 @@ public com.google.iam.v2.DenyRuleOrBuilder getDenyRuleOrBuilder() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object description_ = "";
+  private volatile java.lang.Object description_;
 
   /**
    *
@@ -435,11 +435,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (denyRuleBuilder_ != null) {
         denyRuleBuilder_.clear();
       }
       description_ = "";
+
       kindCase_ = 0;
       kind_ = null;
       return this;
@@ -467,29 +467,19 @@ public com.google.iam.v2.PolicyRule build() {
     @java.lang.Override
     public com.google.iam.v2.PolicyRule buildPartial() {
       com.google.iam.v2.PolicyRule result = new com.google.iam.v2.PolicyRule(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (kindCase_ == 2) {
+        if (denyRuleBuilder_ == null) {
+          result.kind_ = kind_;
+        } else {
+          result.kind_ = denyRuleBuilder_.build();
+        }
       }
-      buildPartialOneofs(result);
+      result.description_ = description_;
+      result.kindCase_ = kindCase_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v2.PolicyRule result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.description_ = description_;
-      }
-    }
-
-    private void buildPartialOneofs(com.google.iam.v2.PolicyRule result) {
-      result.kindCase_ = kindCase_;
-      result.kind_ = this.kind_;
-      if (kindCase_ == 2 && denyRuleBuilder_ != null) {
-        result.kind_ = denyRuleBuilder_.build();
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -537,7 +527,6 @@ public Builder mergeFrom(com.google.iam.v2.PolicyRule other) {
       if (other == com.google.iam.v2.PolicyRule.getDefaultInstance()) return this;
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       switch (other.getKindCase()) {
@@ -580,7 +569,7 @@ public Builder mergeFrom(
             case 10:
               {
                 description_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 10
             case 18:
@@ -620,8 +609,6 @@ public Builder clearKind() {
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.iam.v2.DenyRule,
             com.google.iam.v2.DenyRule.Builder,
@@ -832,6 +819,7 @@ public com.google.iam.v2.DenyRuleOrBuilder getDenyRuleOrBuilder() {
       }
       kindCase_ = 2;
       onChanged();
+      ;
       return denyRuleBuilder_;
     }
 
@@ -902,8 +890,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       description_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -921,8 +909,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
+
       description_ = getDefaultInstance().getDescription();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -945,8 +933,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       description_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyRuleOrBuilder.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyRuleOrBuilder.java
index a408e8bdfd..c3eb02a331 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyRuleOrBuilder.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyRuleOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 public interface PolicyRuleOrBuilder
@@ -89,5 +88,5 @@ public interface PolicyRuleOrBuilder
    */
   com.google.protobuf.ByteString getDescriptionBytes();
 
-  com.google.iam.v2.PolicyRule.KindCase getKindCase();
+  public com.google.iam.v2.PolicyRule.KindCase getKindCase();
 }
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/UpdatePolicyRequest.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/UpdatePolicyRequest.java
index 5f2262ee54..c260b88c3e 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/UpdatePolicyRequest.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/UpdatePolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 /**
@@ -47,6 +46,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new UpdatePolicyRequest();
   }
 
+  @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.iam.v2.PolicyProto
         .internal_static_google_iam_v2_UpdatePolicyRequest_descriptor;
@@ -62,7 +66,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v2.UpdatePolicyRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int POLICY_FIELD_NUMBER = 1;
   private com.google.iam.v2.Policy policy_;
 
@@ -71,7 +74,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * Required. The policy to update.
-   *
    * To prevent conflicting updates, the `etag` value must match the value that
    * is stored in IAM. If the `etag` values do not match, the request fails with
    * a `409` error code and `ABORTED` status.
@@ -83,7 +85,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasPolicy() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return policy_ != null;
   }
 
   /**
@@ -91,7 +93,6 @@ public boolean hasPolicy() {
    *
    * 
    * Required. The policy to update.
-   *
    * To prevent conflicting updates, the `etag` value must match the value that
    * is stored in IAM. If the `etag` values do not match, the request fails with
    * a `409` error code and `ABORTED` status.
@@ -111,7 +112,6 @@ public com.google.iam.v2.Policy getPolicy() {
    *
    * 
    * Required. The policy to update.
-   *
    * To prevent conflicting updates, the `etag` value must match the value that
    * is stored in IAM. If the `etag` values do not match, the request fails with
    * a `409` error code and `ABORTED` status.
@@ -121,7 +121,7 @@ public com.google.iam.v2.Policy getPolicy() {
    */
   @java.lang.Override
   public com.google.iam.v2.PolicyOrBuilder getPolicyOrBuilder() {
-    return policy_ == null ? com.google.iam.v2.Policy.getDefaultInstance() : policy_;
+    return getPolicy();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -138,7 +138,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policy_ != null) {
       output.writeMessage(1, getPolicy());
     }
     getUnknownFields().writeTo(output);
@@ -150,7 +150,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policy_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getPolicy());
     }
     size += getUnknownFields().getSerializedSize();
@@ -316,28 +316,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2.UpdatePolicyRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPolicyFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      policy_ = null;
-      if (policyBuilder_ != null) {
-        policyBuilder_.dispose();
+      if (policyBuilder_ == null) {
+        policy_ = null;
+      } else {
+        policy_ = null;
         policyBuilder_ = null;
       }
       return this;
@@ -367,23 +358,15 @@ public com.google.iam.v2.UpdatePolicyRequest build() {
     public com.google.iam.v2.UpdatePolicyRequest buildPartial() {
       com.google.iam.v2.UpdatePolicyRequest result =
           new com.google.iam.v2.UpdatePolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (policyBuilder_ == null) {
+        result.policy_ = policy_;
+      } else {
+        result.policy_ = policyBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v2.UpdatePolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.policy_ = policyBuilder_ == null ? policy_ : policyBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -461,7 +444,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getPolicyFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -481,8 +464,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.iam.v2.Policy policy_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.iam.v2.Policy,
@@ -495,7 +476,6 @@ public Builder mergeFrom(
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
@@ -506,7 +486,7 @@ public Builder mergeFrom(
      * @return Whether the policy field is set.
      */
     public boolean hasPolicy() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return policyBuilder_ != null || policy_ != null;
     }
 
     /**
@@ -514,7 +494,6 @@ public boolean hasPolicy() {
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
@@ -537,7 +516,6 @@ public com.google.iam.v2.Policy getPolicy() {
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
@@ -551,11 +529,11 @@ public Builder setPolicy(com.google.iam.v2.Policy value) {
           throw new NullPointerException();
         }
         policy_ = value;
+        onChanged();
       } else {
         policyBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -564,7 +542,6 @@ public Builder setPolicy(com.google.iam.v2.Policy value) {
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
@@ -575,11 +552,11 @@ public Builder setPolicy(com.google.iam.v2.Policy value) {
     public Builder setPolicy(com.google.iam.v2.Policy.Builder builderForValue) {
       if (policyBuilder_ == null) {
         policy_ = builderForValue.build();
+        onChanged();
       } else {
         policyBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -588,7 +565,6 @@ public Builder setPolicy(com.google.iam.v2.Policy.Builder builderForValue) {
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
@@ -598,20 +574,16 @@ public Builder setPolicy(com.google.iam.v2.Policy.Builder builderForValue) {
      */
     public Builder mergePolicy(com.google.iam.v2.Policy value) {
       if (policyBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && policy_ != null
-            && policy_ != com.google.iam.v2.Policy.getDefaultInstance()) {
-          getPolicyBuilder().mergeFrom(value);
+        if (policy_ != null) {
+          policy_ = com.google.iam.v2.Policy.newBuilder(policy_).mergeFrom(value).buildPartial();
         } else {
           policy_ = value;
         }
+        onChanged();
       } else {
         policyBuilder_.mergeFrom(value);
       }
-      if (policy_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -620,7 +592,6 @@ public Builder mergePolicy(com.google.iam.v2.Policy value) {
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
@@ -629,13 +600,14 @@ public Builder mergePolicy(com.google.iam.v2.Policy value) {
      * .google.iam.v2.Policy policy = 1 [(.google.api.field_behavior) = REQUIRED];
      */
     public Builder clearPolicy() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      policy_ = null;
-      if (policyBuilder_ != null) {
-        policyBuilder_.dispose();
+      if (policyBuilder_ == null) {
+        policy_ = null;
+        onChanged();
+      } else {
+        policy_ = null;
         policyBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -644,7 +616,6 @@ public Builder clearPolicy() {
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
@@ -653,7 +624,7 @@ public Builder clearPolicy() {
      * .google.iam.v2.Policy policy = 1 [(.google.api.field_behavior) = REQUIRED];
      */
     public com.google.iam.v2.Policy.Builder getPolicyBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getPolicyFieldBuilder().getBuilder();
     }
@@ -663,7 +634,6 @@ public com.google.iam.v2.Policy.Builder getPolicyBuilder() {
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
@@ -684,7 +654,6 @@ public com.google.iam.v2.PolicyOrBuilder getPolicyOrBuilder() {
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/UpdatePolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/UpdatePolicyRequestOrBuilder.java
index 3ac450da05..61b9c2e874 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/UpdatePolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/UpdatePolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2;
 
 public interface UpdatePolicyRequestOrBuilder
@@ -29,7 +28,6 @@ public interface UpdatePolicyRequestOrBuilder
    *
    * 
    * Required. The policy to update.
-   *
    * To prevent conflicting updates, the `etag` value must match the value that
    * is stored in IAM. If the `etag` values do not match, the request fails with
    * a `409` error code and `ABORTED` status.
@@ -46,7 +44,6 @@ public interface UpdatePolicyRequestOrBuilder
    *
    * 
    * Required. The policy to update.
-   *
    * To prevent conflicting updates, the `etag` value must match the value that
    * is stored in IAM. If the `etag` values do not match, the request fails with
    * a `409` error code and `ABORTED` status.
@@ -63,7 +60,6 @@ public interface UpdatePolicyRequestOrBuilder
    *
    * 
    * Required. The policy to update.
-   *
    * To prevent conflicting updates, the `etag` value must match the value that
    * is stored in IAM. If the `etag` values do not match, the request fails with
    * a `409` error code and `ABORTED` status.
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/CreatePolicyRequest.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/CreatePolicyRequest.java
index cd0661d7fb..ef7ee120f6 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/CreatePolicyRequest.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/CreatePolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CreatePolicyRequest();
   }
 
+  @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.iam.v2beta.PolicyProto
         .internal_static_google_iam_v2beta_CreatePolicyRequest_descriptor;
@@ -65,11 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v2beta.CreatePolicyRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int PARENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -77,13 +78,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * Required. The resource that the policy is attached to, along with the kind of policy
    * to create. Format: `policies/{attachment_point}/denypolicies`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -111,13 +109,10 @@ public java.lang.String getParent() {
    * 
    * Required. The resource that the policy is attached to, along with the kind of policy
    * to create. Format: `policies/{attachment_point}/denypolicies`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -155,7 +150,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    */
   @java.lang.Override
   public boolean hasPolicy() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return policy_ != null;
   }
 
   /**
@@ -185,13 +180,11 @@ public com.google.iam.v2beta.Policy getPolicy() {
    */
   @java.lang.Override
   public com.google.iam.v2beta.PolicyOrBuilder getPolicyOrBuilder() {
-    return policy_ == null ? com.google.iam.v2beta.Policy.getDefaultInstance() : policy_;
+    return getPolicy();
   }
 
   public static final int POLICY_ID_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object policyId_ = "";
+  private volatile java.lang.Object policyId_;
 
   /**
    *
@@ -264,7 +257,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policy_ != null) {
       output.writeMessage(2, getPolicy());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policyId_)) {
@@ -282,7 +275,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policy_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getPolicy());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policyId_)) {
@@ -459,32 +452,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2beta.CreatePolicyRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPolicyFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       parent_ = "";
-      policy_ = null;
-      if (policyBuilder_ != null) {
-        policyBuilder_.dispose();
+
+      if (policyBuilder_ == null) {
+        policy_ = null;
+      } else {
+        policy_ = null;
         policyBuilder_ = null;
       }
       policyId_ = "";
+
       return this;
     }
 
@@ -512,29 +498,17 @@ public com.google.iam.v2beta.CreatePolicyRequest build() {
     public com.google.iam.v2beta.CreatePolicyRequest buildPartial() {
       com.google.iam.v2beta.CreatePolicyRequest result =
           new com.google.iam.v2beta.CreatePolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.parent_ = parent_;
+      if (policyBuilder_ == null) {
+        result.policy_ = policy_;
+      } else {
+        result.policy_ = policyBuilder_.build();
       }
+      result.policyId_ = policyId_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v2beta.CreatePolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.parent_ = parent_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.policy_ = policyBuilder_ == null ? policy_ : policyBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.policyId_ = policyId_;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -582,7 +556,6 @@ public Builder mergeFrom(com.google.iam.v2beta.CreatePolicyRequest other) {
       if (other == com.google.iam.v2beta.CreatePolicyRequest.getDefaultInstance()) return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasPolicy()) {
@@ -590,7 +563,6 @@ public Builder mergeFrom(com.google.iam.v2beta.CreatePolicyRequest other) {
       }
       if (!other.getPolicyId().isEmpty()) {
         policyId_ = other.policyId_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -622,19 +594,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getPolicyFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 policyId_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -654,8 +626,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object parent_ = "";
 
     /**
@@ -664,13 +634,10 @@ public Builder mergeFrom(
      * 
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to create. Format: `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -697,13 +664,10 @@ public java.lang.String getParent() {
      * 
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to create. Format: `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -730,13 +694,10 @@ public com.google.protobuf.ByteString getParentBytes() {
      * 
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to create. Format: `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -750,8 +711,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -762,13 +723,10 @@ public Builder setParent(java.lang.String value) {
      * 
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to create. Format: `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -778,8 +736,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -790,13 +748,10 @@ public Builder clearParent() {
      * 
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to create. Format: `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -811,8 +766,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -836,7 +791,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the policy field is set.
      */
     public boolean hasPolicy() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return policyBuilder_ != null || policy_ != null;
     }
 
     /**
@@ -873,11 +828,11 @@ public Builder setPolicy(com.google.iam.v2beta.Policy value) {
           throw new NullPointerException();
         }
         policy_ = value;
+        onChanged();
       } else {
         policyBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -893,11 +848,11 @@ public Builder setPolicy(com.google.iam.v2beta.Policy value) {
     public Builder setPolicy(com.google.iam.v2beta.Policy.Builder builderForValue) {
       if (policyBuilder_ == null) {
         policy_ = builderForValue.build();
+        onChanged();
       } else {
         policyBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -912,20 +867,17 @@ public Builder setPolicy(com.google.iam.v2beta.Policy.Builder builderForValue) {
      */
     public Builder mergePolicy(com.google.iam.v2beta.Policy value) {
       if (policyBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && policy_ != null
-            && policy_ != com.google.iam.v2beta.Policy.getDefaultInstance()) {
-          getPolicyBuilder().mergeFrom(value);
+        if (policy_ != null) {
+          policy_ =
+              com.google.iam.v2beta.Policy.newBuilder(policy_).mergeFrom(value).buildPartial();
         } else {
           policy_ = value;
         }
+        onChanged();
       } else {
         policyBuilder_.mergeFrom(value);
       }
-      if (policy_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -939,13 +891,14 @@ public Builder mergePolicy(com.google.iam.v2beta.Policy value) {
      * .google.iam.v2beta.Policy policy = 2 [(.google.api.field_behavior) = REQUIRED];
      */
     public Builder clearPolicy() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      policy_ = null;
-      if (policyBuilder_ != null) {
-        policyBuilder_.dispose();
+      if (policyBuilder_ == null) {
+        policy_ = null;
+        onChanged();
+      } else {
+        policy_ = null;
         policyBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -959,7 +912,7 @@ public Builder clearPolicy() {
      * .google.iam.v2beta.Policy policy = 2 [(.google.api.field_behavior) = REQUIRED];
      */
     public com.google.iam.v2beta.Policy.Builder getPolicyBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getPolicyFieldBuilder().getBuilder();
     }
@@ -1080,8 +1033,8 @@ public Builder setPolicyId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       policyId_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1101,8 +1054,8 @@ public Builder setPolicyId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPolicyId() {
+
       policyId_ = getDefaultInstance().getPolicyId();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1127,8 +1080,8 @@ public Builder setPolicyIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       policyId_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/CreatePolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/CreatePolicyRequestOrBuilder.java
index 8ee5037d9b..ae6c9bc610 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/CreatePolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/CreatePolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 public interface CreatePolicyRequestOrBuilder
@@ -30,13 +29,10 @@ public interface CreatePolicyRequestOrBuilder
    * 
    * Required. The resource that the policy is attached to, along with the kind of policy
    * to create. Format: `policies/{attachment_point}/denypolicies`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -53,13 +49,10 @@ public interface CreatePolicyRequestOrBuilder
    * 
    * Required. The resource that the policy is attached to, along with the kind of policy
    * to create. Format: `policies/{attachment_point}/denypolicies`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DeletePolicyRequest.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DeletePolicyRequest.java
index 2d46229f05..b3a769bac7 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DeletePolicyRequest.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DeletePolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DeletePolicyRequest();
   }
 
+  @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.iam.v2beta.PolicyProto
         .internal_static_google_iam_v2beta_DeletePolicyRequest_descriptor;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -76,12 +78,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * Required. The resource name of the policy to delete. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * Use the URL-encoded full resource name, which means that the forward-slash
    * character, `/`, must be written as `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -109,12 +108,9 @@ public java.lang.String getName() {
    * 
    * Required. The resource name of the policy to delete. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * Use the URL-encoded full resource name, which means that the forward-slash
    * character, `/`, must be written as `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -137,9 +133,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int ETAG_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object etag_ = "";
+  private volatile java.lang.Object etag_;
 
   /**
    *
@@ -148,7 +142,6 @@ public com.google.protobuf.ByteString getNameBytes() {
    * Optional. The expected `etag` of the policy to delete. If the value does not match
    * the value that is stored in IAM, the request fails with a `409` error code
    * and `ABORTED` status.
-   *
    * If you omit this field, the policy is deleted regardless of its current
    * `etag`.
    * 

@@ -177,7 +170,6 @@ public java.lang.String getEtag() {
    * Optional. The expected `etag` of the policy to delete. If the value does not match
    * the value that is stored in IAM, the request fails with a `409` error code
    * and `ABORTED` status.
-   *
    * If you omit this field, the policy is deleted regardless of its current
    * `etag`.
    * 

@@ -406,9 +398,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       etag_ = "";
+
       return this;
     }
 
@@ -436,23 +429,12 @@ public com.google.iam.v2beta.DeletePolicyRequest build() {
     public com.google.iam.v2beta.DeletePolicyRequest buildPartial() {
       com.google.iam.v2beta.DeletePolicyRequest result =
           new com.google.iam.v2beta.DeletePolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
+      result.etag_ = etag_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v2beta.DeletePolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.etag_ = etag_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -500,12 +482,10 @@ public Builder mergeFrom(com.google.iam.v2beta.DeletePolicyRequest other) {
       if (other == com.google.iam.v2beta.DeletePolicyRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getEtag().isEmpty()) {
         etag_ = other.etag_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -537,13 +517,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 etag_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -563,8 +543,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -573,12 +551,9 @@ public Builder mergeFrom(
      * 
      * Required. The resource name of the policy to delete. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -605,12 +580,9 @@ public java.lang.String getName() {
      * 
      * Required. The resource name of the policy to delete. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -637,12 +609,9 @@ public com.google.protobuf.ByteString getNameBytes() {
      * 
      * Required. The resource name of the policy to delete. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -656,8 +625,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -668,12 +637,9 @@ public Builder setName(java.lang.String value) {
      * 
      * Required. The resource name of the policy to delete. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -683,8 +649,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -695,12 +661,9 @@ public Builder clearName() {
      * 
      * Required. The resource name of the policy to delete. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -715,8 +678,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -730,7 +693,6 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * Optional. The expected `etag` of the policy to delete. If the value does not match
      * the value that is stored in IAM, the request fails with a `409` error code
      * and `ABORTED` status.
-     *
      * If you omit this field, the policy is deleted regardless of its current
      * `etag`.
      * 

@@ -758,7 +720,6 @@ public java.lang.String getEtag() {
      * Optional. The expected `etag` of the policy to delete. If the value does not match
      * the value that is stored in IAM, the request fails with a `409` error code
      * and `ABORTED` status.
-     *
      * If you omit this field, the policy is deleted regardless of its current
      * `etag`.
      * 

@@ -786,7 +747,6 @@ public com.google.protobuf.ByteString getEtagBytes() {
      * Optional. The expected `etag` of the policy to delete. If the value does not match
      * the value that is stored in IAM, the request fails with a `409` error code
      * and `ABORTED` status.
-     *
      * If you omit this field, the policy is deleted regardless of its current
      * `etag`.
      * 

@@ -800,8 +760,8 @@ public Builder setEtag(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       etag_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -813,7 +773,6 @@ public Builder setEtag(java.lang.String value) {
      * Optional. The expected `etag` of the policy to delete. If the value does not match
      * the value that is stored in IAM, the request fails with a `409` error code
      * and `ABORTED` status.
-     *
      * If you omit this field, the policy is deleted regardless of its current
      * `etag`.
      * 

@@ -823,8 +782,8 @@ public Builder setEtag(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEtag() {
+
       etag_ = getDefaultInstance().getEtag();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -836,7 +795,6 @@ public Builder clearEtag() {
      * Optional. The expected `etag` of the policy to delete. If the value does not match
      * the value that is stored in IAM, the request fails with a `409` error code
      * and `ABORTED` status.
-     *
      * If you omit this field, the policy is deleted regardless of its current
      * `etag`.
      * 

@@ -851,8 +809,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       etag_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DeletePolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DeletePolicyRequestOrBuilder.java
index 884824fdde..e54ba5a351 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DeletePolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DeletePolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 public interface DeletePolicyRequestOrBuilder
@@ -30,12 +29,9 @@ public interface DeletePolicyRequestOrBuilder
    * 
    * Required. The resource name of the policy to delete. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * Use the URL-encoded full resource name, which means that the forward-slash
    * character, `/`, must be written as `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -52,12 +48,9 @@ public interface DeletePolicyRequestOrBuilder
    * 
    * Required. The resource name of the policy to delete. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * Use the URL-encoded full resource name, which means that the forward-slash
    * character, `/`, must be written as `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -75,7 +68,6 @@ public interface DeletePolicyRequestOrBuilder
    * Optional. The expected `etag` of the policy to delete. If the value does not match
    * the value that is stored in IAM, the request fails with a `409` error code
    * and `ABORTED` status.
-   *
    * If you omit this field, the policy is deleted regardless of its current
    * `etag`.
    * 

@@ -93,7 +85,6 @@ public interface DeletePolicyRequestOrBuilder
    * Optional. The expected `etag` of the policy to delete. If the value does not match
    * the value that is stored in IAM, the request fails with a `409` error code
    * and `ABORTED` status.
-   *
    * If you omit this field, the policy is deleted regardless of its current
    * `etag`.
    * 

diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRule.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRule.java
index f423cdfe02..c84cde411f 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRule.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRule.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/deny.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 /**
@@ -40,10 +39,10 @@ private DenyRule(com.google.protobuf.GeneratedMessageV3.Builder builder) {
   }
 
   private DenyRule() {
-    deniedPrincipals_ = com.google.protobuf.LazyStringArrayList.emptyList();
-    exceptionPrincipals_ = com.google.protobuf.LazyStringArrayList.emptyList();
-    deniedPermissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
-    exceptionPermissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    deniedPrincipals_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    exceptionPrincipals_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    deniedPermissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    exceptionPermissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
   @java.lang.Override
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DenyRule();
   }
 
+  @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.iam.v2beta.DenyRuleProto
         .internal_static_google_iam_v2beta_DenyRule_descriptor;
@@ -66,12 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v2beta.DenyRule.class, com.google.iam.v2beta.DenyRule.Builder.class);
   }
 
-  private int bitField0_;
   public static final int DENIED_PRINCIPALS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList deniedPrincipals_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList deniedPrincipals_;
 
   /**
    *
@@ -79,40 +79,32 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * The identities that are prevented from using one or more permissions on
    * Google Cloud resources. This field can contain the following values:
-   *
    * * `principalSet://goog/public:all`: A special identifier that represents
    *   any principal that is on the internet, even if they do not have a Google
    *   Account or are not logged in.
-   *
    * * `principal://goog/subject/{email_id}`: A specific Google Account.
    *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
    *   example, `principal://goog/subject/alice@example.com`.
-   *
    * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
    *   Google Account that was deleted recently. For example,
    *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
    *   the Google Account is recovered, this identifier reverts to the standard
    *   identifier for a Google Account.
-   *
    * * `principalSet://goog/group/{group_id}`: A Google group. For example,
    *   `principalSet://goog/group/admins@example.com`.
-   *
    * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
    *   that was deleted recently. For example,
    *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
    *   the Google group is restored, this identifier reverts to the standard
    *   identifier for a Google group.
-   *
    * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
    *   A Google Cloud service account. For example,
    *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-   *
    * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
    *   A Google Cloud service account that was deleted recently. For example,
    *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
    *   If the service account is undeleted, this identifier reverts to the
    *   standard identifier for a service account.
-   *
    * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
    *   principals associated with the specified Google Workspace or Cloud
    *   Identity customer ID. For example,
@@ -133,40 +125,32 @@ public com.google.protobuf.ProtocolStringList getDeniedPrincipalsList() {
    * 
    * The identities that are prevented from using one or more permissions on
    * Google Cloud resources. This field can contain the following values:
-   *
    * * `principalSet://goog/public:all`: A special identifier that represents
    *   any principal that is on the internet, even if they do not have a Google
    *   Account or are not logged in.
-   *
    * * `principal://goog/subject/{email_id}`: A specific Google Account.
    *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
    *   example, `principal://goog/subject/alice@example.com`.
-   *
    * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
    *   Google Account that was deleted recently. For example,
    *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
    *   the Google Account is recovered, this identifier reverts to the standard
    *   identifier for a Google Account.
-   *
    * * `principalSet://goog/group/{group_id}`: A Google group. For example,
    *   `principalSet://goog/group/admins@example.com`.
-   *
    * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
    *   that was deleted recently. For example,
    *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
    *   the Google group is restored, this identifier reverts to the standard
    *   identifier for a Google group.
-   *
    * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
    *   A Google Cloud service account. For example,
    *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-   *
    * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
    *   A Google Cloud service account that was deleted recently. For example,
    *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
    *   If the service account is undeleted, this identifier reverts to the
    *   standard identifier for a service account.
-   *
    * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
    *   principals associated with the specified Google Workspace or Cloud
    *   Identity customer ID. For example,
@@ -187,40 +171,32 @@ public int getDeniedPrincipalsCount() {
    * 
    * The identities that are prevented from using one or more permissions on
    * Google Cloud resources. This field can contain the following values:
-   *
    * * `principalSet://goog/public:all`: A special identifier that represents
    *   any principal that is on the internet, even if they do not have a Google
    *   Account or are not logged in.
-   *
    * * `principal://goog/subject/{email_id}`: A specific Google Account.
    *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
    *   example, `principal://goog/subject/alice@example.com`.
-   *
    * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
    *   Google Account that was deleted recently. For example,
    *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
    *   the Google Account is recovered, this identifier reverts to the standard
    *   identifier for a Google Account.
-   *
    * * `principalSet://goog/group/{group_id}`: A Google group. For example,
    *   `principalSet://goog/group/admins@example.com`.
-   *
    * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
    *   that was deleted recently. For example,
    *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
    *   the Google group is restored, this identifier reverts to the standard
    *   identifier for a Google group.
-   *
    * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
    *   A Google Cloud service account. For example,
    *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-   *
    * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
    *   A Google Cloud service account that was deleted recently. For example,
    *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
    *   If the service account is undeleted, this identifier reverts to the
    *   standard identifier for a service account.
-   *
    * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
    *   principals associated with the specified Google Workspace or Cloud
    *   Identity customer ID. For example,
@@ -242,40 +218,32 @@ public java.lang.String getDeniedPrincipals(int index) {
    * 
    * The identities that are prevented from using one or more permissions on
    * Google Cloud resources. This field can contain the following values:
-   *
    * * `principalSet://goog/public:all`: A special identifier that represents
    *   any principal that is on the internet, even if they do not have a Google
    *   Account or are not logged in.
-   *
    * * `principal://goog/subject/{email_id}`: A specific Google Account.
    *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
    *   example, `principal://goog/subject/alice@example.com`.
-   *
    * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
    *   Google Account that was deleted recently. For example,
    *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
    *   the Google Account is recovered, this identifier reverts to the standard
    *   identifier for a Google Account.
-   *
    * * `principalSet://goog/group/{group_id}`: A Google group. For example,
    *   `principalSet://goog/group/admins@example.com`.
-   *
    * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
    *   that was deleted recently. For example,
    *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
    *   the Google group is restored, this identifier reverts to the standard
    *   identifier for a Google group.
-   *
    * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
    *   A Google Cloud service account. For example,
    *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-   *
    * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
    *   A Google Cloud service account that was deleted recently. For example,
    *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
    *   If the service account is undeleted, this identifier reverts to the
    *   standard identifier for a service account.
-   *
    * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
    *   principals associated with the specified Google Workspace or Cloud
    *   Identity customer ID. For example,
@@ -292,10 +260,7 @@ public com.google.protobuf.ByteString getDeniedPrincipalsBytes(int index) {
   }
 
   public static final int EXCEPTION_PRINCIPALS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList exceptionPrincipals_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList exceptionPrincipals_;
 
   /**
    *
@@ -305,7 +270,6 @@ public com.google.protobuf.ByteString getDeniedPrincipalsBytes(int index) {
    * listed in the `denied_principals`. For example, you could add a Google
    * group to the `denied_principals`, then exclude specific users who belong to
    * that group.
-   *
    * This field can contain the same values as the `denied_principals` field,
    * excluding `principalSet://goog/public:all`, which represents all users on
    * the internet.
@@ -327,7 +291,6 @@ public com.google.protobuf.ProtocolStringList getExceptionPrincipalsList() {
    * listed in the `denied_principals`. For example, you could add a Google
    * group to the `denied_principals`, then exclude specific users who belong to
    * that group.
-   *
    * This field can contain the same values as the `denied_principals` field,
    * excluding `principalSet://goog/public:all`, which represents all users on
    * the internet.
@@ -349,7 +312,6 @@ public int getExceptionPrincipalsCount() {
    * listed in the `denied_principals`. For example, you could add a Google
    * group to the `denied_principals`, then exclude specific users who belong to
    * that group.
-   *
    * This field can contain the same values as the `denied_principals` field,
    * excluding `principalSet://goog/public:all`, which represents all users on
    * the internet.
@@ -372,7 +334,6 @@ public java.lang.String getExceptionPrincipals(int index) {
    * listed in the `denied_principals`. For example, you could add a Google
    * group to the `denied_principals`, then exclude specific users who belong to
    * that group.
-   *
    * This field can contain the same values as the `denied_principals` field,
    * excluding `principalSet://goog/public:all`, which represents all users on
    * the internet.
@@ -388,10 +349,7 @@ public com.google.protobuf.ByteString getExceptionPrincipalsBytes(int index) {
   }
 
   public static final int DENIED_PERMISSIONS_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList deniedPermissions_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList deniedPermissions_;
 
   /**
    *
@@ -468,10 +426,7 @@ public com.google.protobuf.ByteString getDeniedPermissionsBytes(int index) {
   }
 
   public static final int EXCEPTION_PERMISSIONS_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList exceptionPermissions_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList exceptionPermissions_;
 
   /**
    *
@@ -481,7 +436,6 @@ public com.google.protobuf.ByteString getDeniedPermissionsBytes(int index) {
    * permissions given by `denied_permissions`. If a permission appears in
    * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
    * denied.
-   *
    * The excluded permissions can be specified using the same syntax as
    * `denied_permissions`.
    * 

@@ -502,7 +456,6 @@ public com.google.protobuf.ProtocolStringList getExceptionPermissionsList() {
    * permissions given by `denied_permissions`. If a permission appears in
    * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
    * denied.
-   *
    * The excluded permissions can be specified using the same syntax as
    * `denied_permissions`.
    * 

@@ -523,7 +476,6 @@ public int getExceptionPermissionsCount() {
    * permissions given by `denied_permissions`. If a permission appears in
    * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
    * denied.
-   *
    * The excluded permissions can be specified using the same syntax as
    * `denied_permissions`.
    * 

@@ -545,7 +497,6 @@ public java.lang.String getExceptionPermissions(int index) {
    * permissions given by `denied_permissions`. If a permission appears in
    * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
    * denied.
-   *
    * The excluded permissions can be specified using the same syntax as
    * `denied_permissions`.
    * 

@@ -569,10 +520,8 @@ public com.google.protobuf.ByteString getExceptionPermissionsBytes(int index) {
    * The condition that determines whether this deny rule applies to a request.
    * If the condition expression evaluates to `true`, then the deny rule is
    * applied; otherwise, the deny rule is not applied.
-   *
    * Each deny rule is evaluated independently. If this deny rule does not apply
    * to a request, other deny rules might still apply.
-   *
    * The condition can use CEL functions that evaluate
    * [resource
    * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -585,7 +534,7 @@ public com.google.protobuf.ByteString getExceptionPermissionsBytes(int index) {
    */
   @java.lang.Override
   public boolean hasDenialCondition() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return denialCondition_ != null;
   }
 
   /**
@@ -595,10 +544,8 @@ public boolean hasDenialCondition() {
    * The condition that determines whether this deny rule applies to a request.
    * If the condition expression evaluates to `true`, then the deny rule is
    * applied; otherwise, the deny rule is not applied.
-   *
    * Each deny rule is evaluated independently. If this deny rule does not apply
    * to a request, other deny rules might still apply.
-   *
    * The condition can use CEL functions that evaluate
    * [resource
    * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -621,10 +568,8 @@ public com.google.type.Expr getDenialCondition() {
    * The condition that determines whether this deny rule applies to a request.
    * If the condition expression evaluates to `true`, then the deny rule is
    * applied; otherwise, the deny rule is not applied.
-   *
    * Each deny rule is evaluated independently. If this deny rule does not apply
    * to a request, other deny rules might still apply.
-   *
    * The condition can use CEL functions that evaluate
    * [resource
    * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -635,7 +580,7 @@ public com.google.type.Expr getDenialCondition() {
    */
   @java.lang.Override
   public com.google.type.ExprOrBuilder getDenialConditionOrBuilder() {
-    return denialCondition_ == null ? com.google.type.Expr.getDefaultInstance() : denialCondition_;
+    return getDenialCondition();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -665,7 +610,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       com.google.protobuf.GeneratedMessageV3.writeString(
           output, 4, exceptionPermissions_.getRaw(i));
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (denialCondition_ != null) {
       output.writeMessage(5, getDenialCondition());
     }
     getUnknownFields().writeTo(output);
@@ -709,7 +654,7 @@ public int getSerializedSize() {
       size += dataSize;
       size += 1 * getExceptionPermissionsList().size();
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (denialCondition_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getDenialCondition());
     }
     size += getUnknownFields().getSerializedSize();
@@ -894,32 +839,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2beta.DenyRule.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getDenialConditionFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      deniedPrincipals_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      exceptionPrincipals_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      deniedPermissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      exceptionPermissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      denialCondition_ = null;
-      if (denialConditionBuilder_ != null) {
-        denialConditionBuilder_.dispose();
+      deniedPrincipals_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      exceptionPrincipals_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
+      deniedPermissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      exceptionPermissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      if (denialConditionBuilder_ == null) {
+        denialCondition_ = null;
+      } else {
+        denialCondition_ = null;
         denialConditionBuilder_ = null;
       }
       return this;
@@ -948,38 +888,34 @@ public com.google.iam.v2beta.DenyRule build() {
     @java.lang.Override
     public com.google.iam.v2beta.DenyRule buildPartial() {
       com.google.iam.v2beta.DenyRule result = new com.google.iam.v2beta.DenyRule(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.iam.v2beta.DenyRule result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        deniedPrincipals_.makeImmutable();
-        result.deniedPrincipals_ = deniedPrincipals_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        deniedPrincipals_ = deniedPrincipals_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        exceptionPrincipals_.makeImmutable();
-        result.exceptionPrincipals_ = exceptionPrincipals_;
+      result.deniedPrincipals_ = deniedPrincipals_;
+      if (((bitField0_ & 0x00000002) != 0)) {
+        exceptionPrincipals_ = exceptionPrincipals_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
       }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        deniedPermissions_.makeImmutable();
-        result.deniedPermissions_ = deniedPermissions_;
+      result.exceptionPrincipals_ = exceptionPrincipals_;
+      if (((bitField0_ & 0x00000004) != 0)) {
+        deniedPermissions_ = deniedPermissions_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000004);
       }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        exceptionPermissions_.makeImmutable();
-        result.exceptionPermissions_ = exceptionPermissions_;
+      result.deniedPermissions_ = deniedPermissions_;
+      if (((bitField0_ & 0x00000008) != 0)) {
+        exceptionPermissions_ = exceptionPermissions_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000008);
       }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.denialCondition_ =
-            denialConditionBuilder_ == null ? denialCondition_ : denialConditionBuilder_.build();
-        to_bitField0_ |= 0x00000001;
+      result.exceptionPermissions_ = exceptionPermissions_;
+      if (denialConditionBuilder_ == null) {
+        result.denialCondition_ = denialCondition_;
+      } else {
+        result.denialCondition_ = denialConditionBuilder_.build();
       }
-      result.bitField0_ |= to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1030,7 +966,7 @@ public Builder mergeFrom(com.google.iam.v2beta.DenyRule other) {
       if (!other.deniedPrincipals_.isEmpty()) {
         if (deniedPrincipals_.isEmpty()) {
           deniedPrincipals_ = other.deniedPrincipals_;
-          bitField0_ |= 0x00000001;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureDeniedPrincipalsIsMutable();
           deniedPrincipals_.addAll(other.deniedPrincipals_);
@@ -1040,7 +976,7 @@ public Builder mergeFrom(com.google.iam.v2beta.DenyRule other) {
       if (!other.exceptionPrincipals_.isEmpty()) {
         if (exceptionPrincipals_.isEmpty()) {
           exceptionPrincipals_ = other.exceptionPrincipals_;
-          bitField0_ |= 0x00000002;
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           ensureExceptionPrincipalsIsMutable();
           exceptionPrincipals_.addAll(other.exceptionPrincipals_);
@@ -1050,7 +986,7 @@ public Builder mergeFrom(com.google.iam.v2beta.DenyRule other) {
       if (!other.deniedPermissions_.isEmpty()) {
         if (deniedPermissions_.isEmpty()) {
           deniedPermissions_ = other.deniedPermissions_;
-          bitField0_ |= 0x00000004;
+          bitField0_ = (bitField0_ & ~0x00000004);
         } else {
           ensureDeniedPermissionsIsMutable();
           deniedPermissions_.addAll(other.deniedPermissions_);
@@ -1060,7 +996,7 @@ public Builder mergeFrom(com.google.iam.v2beta.DenyRule other) {
       if (!other.exceptionPermissions_.isEmpty()) {
         if (exceptionPermissions_.isEmpty()) {
           exceptionPermissions_ = other.exceptionPermissions_;
-          bitField0_ |= 0x00000008;
+          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
           ensureExceptionPermissionsIsMutable();
           exceptionPermissions_.addAll(other.exceptionPermissions_);
@@ -1127,7 +1063,7 @@ public Builder mergeFrom(
             case 42:
               {
                 input.readMessage(getDenialConditionFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 42
             default:
@@ -1149,14 +1085,14 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private com.google.protobuf.LazyStringArrayList deniedPrincipals_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList deniedPrincipals_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureDeniedPrincipalsIsMutable() {
-      if (!deniedPrincipals_.isModifiable()) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         deniedPrincipals_ = new com.google.protobuf.LazyStringArrayList(deniedPrincipals_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000001;
     }
 
     /**
@@ -1165,40 +1101,32 @@ private void ensureDeniedPrincipalsIsMutable() {
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1210,8 +1138,7 @@ private void ensureDeniedPrincipalsIsMutable() {
      * @return A list containing the deniedPrincipals.
      */
     public com.google.protobuf.ProtocolStringList getDeniedPrincipalsList() {
-      deniedPrincipals_.makeImmutable();
-      return deniedPrincipals_;
+      return deniedPrincipals_.getUnmodifiableView();
     }
 
     /**
@@ -1220,40 +1147,32 @@ public com.google.protobuf.ProtocolStringList getDeniedPrincipalsList() {
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1274,40 +1193,32 @@ public int getDeniedPrincipalsCount() {
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1329,40 +1240,32 @@ public java.lang.String getDeniedPrincipals(int index) {
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1384,40 +1287,32 @@ public com.google.protobuf.ByteString getDeniedPrincipalsBytes(int index) {
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1436,7 +1331,6 @@ public Builder setDeniedPrincipals(int index, java.lang.String value) {
       }
       ensureDeniedPrincipalsIsMutable();
       deniedPrincipals_.set(index, value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1447,40 +1341,32 @@ public Builder setDeniedPrincipals(int index, java.lang.String value) {
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1498,7 +1384,6 @@ public Builder addDeniedPrincipals(java.lang.String value) {
       }
       ensureDeniedPrincipalsIsMutable();
       deniedPrincipals_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1509,40 +1394,32 @@ public Builder addDeniedPrincipals(java.lang.String value) {
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1557,7 +1434,6 @@ public Builder addDeniedPrincipals(java.lang.String value) {
     public Builder addAllDeniedPrincipals(java.lang.Iterable values) {
       ensureDeniedPrincipalsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, deniedPrincipals_);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1568,40 +1444,32 @@ public Builder addAllDeniedPrincipals(java.lang.Iterable value
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1613,9 +1481,8 @@ public Builder addAllDeniedPrincipals(java.lang.Iterable value
      * @return This builder for chaining.
      */
     public Builder clearDeniedPrincipals() {
-      deniedPrincipals_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      deniedPrincipals_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000001);
-      ;
       onChanged();
       return this;
     }
@@ -1626,40 +1493,32 @@ public Builder clearDeniedPrincipals() {
      * 
      * The identities that are prevented from using one or more permissions on
      * Google Cloud resources. This field can contain the following values:
-     *
      * * `principalSet://goog/public:all`: A special identifier that represents
      *   any principal that is on the internet, even if they do not have a Google
      *   Account or are not logged in.
-     *
      * * `principal://goog/subject/{email_id}`: A specific Google Account.
      *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
      *   example, `principal://goog/subject/alice@example.com`.
-     *
      * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
      *   Google Account that was deleted recently. For example,
      *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
      *   the Google Account is recovered, this identifier reverts to the standard
      *   identifier for a Google Account.
-     *
      * * `principalSet://goog/group/{group_id}`: A Google group. For example,
      *   `principalSet://goog/group/admins@example.com`.
-     *
      * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
      *   that was deleted recently. For example,
      *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
      *   the Google group is restored, this identifier reverts to the standard
      *   identifier for a Google group.
-     *
      * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
      *   A Google Cloud service account. For example,
      *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-     *
      * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
      *   A Google Cloud service account that was deleted recently. For example,
      *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
      *   If the service account is undeleted, this identifier reverts to the
      *   standard identifier for a service account.
-     *
      * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
      *   principals associated with the specified Google Workspace or Cloud
      *   Identity customer ID. For example,
@@ -1678,19 +1537,18 @@ public Builder addDeniedPrincipalsBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureDeniedPrincipalsIsMutable();
       deniedPrincipals_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList exceptionPrincipals_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList exceptionPrincipals_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureExceptionPrincipalsIsMutable() {
-      if (!exceptionPrincipals_.isModifiable()) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         exceptionPrincipals_ = new com.google.protobuf.LazyStringArrayList(exceptionPrincipals_);
+        bitField0_ |= 0x00000002;
       }
-      bitField0_ |= 0x00000002;
     }
 
     /**
@@ -1701,7 +1559,6 @@ private void ensureExceptionPrincipalsIsMutable() {
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1712,8 +1569,7 @@ private void ensureExceptionPrincipalsIsMutable() {
      * @return A list containing the exceptionPrincipals.
      */
     public com.google.protobuf.ProtocolStringList getExceptionPrincipalsList() {
-      exceptionPrincipals_.makeImmutable();
-      return exceptionPrincipals_;
+      return exceptionPrincipals_.getUnmodifiableView();
     }
 
     /**
@@ -1724,7 +1580,6 @@ public com.google.protobuf.ProtocolStringList getExceptionPrincipalsList() {
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1746,7 +1601,6 @@ public int getExceptionPrincipalsCount() {
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1769,7 +1623,6 @@ public java.lang.String getExceptionPrincipals(int index) {
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1792,7 +1645,6 @@ public com.google.protobuf.ByteString getExceptionPrincipalsBytes(int index) {
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1810,7 +1662,6 @@ public Builder setExceptionPrincipals(int index, java.lang.String value) {
       }
       ensureExceptionPrincipalsIsMutable();
       exceptionPrincipals_.set(index, value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1823,7 +1674,6 @@ public Builder setExceptionPrincipals(int index, java.lang.String value) {
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1840,7 +1690,6 @@ public Builder addExceptionPrincipals(java.lang.String value) {
       }
       ensureExceptionPrincipalsIsMutable();
       exceptionPrincipals_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1853,7 +1702,6 @@ public Builder addExceptionPrincipals(java.lang.String value) {
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1867,7 +1715,6 @@ public Builder addExceptionPrincipals(java.lang.String value) {
     public Builder addAllExceptionPrincipals(java.lang.Iterable values) {
       ensureExceptionPrincipalsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, exceptionPrincipals_);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1880,7 +1727,6 @@ public Builder addAllExceptionPrincipals(java.lang.Iterable va
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1891,9 +1737,8 @@ public Builder addAllExceptionPrincipals(java.lang.Iterable va
      * @return This builder for chaining.
      */
     public Builder clearExceptionPrincipals() {
-      exceptionPrincipals_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      exceptionPrincipals_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000002);
-      ;
       onChanged();
       return this;
     }
@@ -1906,7 +1751,6 @@ public Builder clearExceptionPrincipals() {
      * listed in the `denied_principals`. For example, you could add a Google
      * group to the `denied_principals`, then exclude specific users who belong to
      * that group.
-     *
      * This field can contain the same values as the `denied_principals` field,
      * excluding `principalSet://goog/public:all`, which represents all users on
      * the internet.
@@ -1924,19 +1768,18 @@ public Builder addExceptionPrincipalsBytes(com.google.protobuf.ByteString value)
       checkByteStringIsUtf8(value);
       ensureExceptionPrincipalsIsMutable();
       exceptionPrincipals_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList deniedPermissions_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList deniedPermissions_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureDeniedPermissionsIsMutable() {
-      if (!deniedPermissions_.isModifiable()) {
+      if (!((bitField0_ & 0x00000004) != 0)) {
         deniedPermissions_ = new com.google.protobuf.LazyStringArrayList(deniedPermissions_);
+        bitField0_ |= 0x00000004;
       }
-      bitField0_ |= 0x00000004;
     }
 
     /**
@@ -1954,8 +1797,7 @@ private void ensureDeniedPermissionsIsMutable() {
      * @return A list containing the deniedPermissions.
      */
     public com.google.protobuf.ProtocolStringList getDeniedPermissionsList() {
-      deniedPermissions_.makeImmutable();
-      return deniedPermissions_;
+      return deniedPermissions_.getUnmodifiableView();
     }
 
     /**
@@ -2036,7 +1878,6 @@ public Builder setDeniedPermissions(int index, java.lang.String value) {
       }
       ensureDeniedPermissionsIsMutable();
       deniedPermissions_.set(index, value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2062,7 +1903,6 @@ public Builder addDeniedPermissions(java.lang.String value) {
       }
       ensureDeniedPermissionsIsMutable();
       deniedPermissions_.add(value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2085,7 +1925,6 @@ public Builder addDeniedPermissions(java.lang.String value) {
     public Builder addAllDeniedPermissions(java.lang.Iterable values) {
       ensureDeniedPermissionsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, deniedPermissions_);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -2105,9 +1944,8 @@ public Builder addAllDeniedPermissions(java.lang.Iterable valu
      * @return This builder for chaining.
      */
     public Builder clearDeniedPermissions() {
-      deniedPermissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      deniedPermissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000004);
-      ;
       onChanged();
       return this;
     }
@@ -2134,19 +1972,18 @@ public Builder addDeniedPermissionsBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureDeniedPermissionsIsMutable();
       deniedPermissions_.add(value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList exceptionPermissions_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList exceptionPermissions_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureExceptionPermissionsIsMutable() {
-      if (!exceptionPermissions_.isModifiable()) {
+      if (!((bitField0_ & 0x00000008) != 0)) {
         exceptionPermissions_ = new com.google.protobuf.LazyStringArrayList(exceptionPermissions_);
+        bitField0_ |= 0x00000008;
       }
-      bitField0_ |= 0x00000008;
     }
 
     /**
@@ -2157,7 +1994,6 @@ private void ensureExceptionPermissionsIsMutable() {
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2167,8 +2003,7 @@ private void ensureExceptionPermissionsIsMutable() {
      * @return A list containing the exceptionPermissions.
      */
     public com.google.protobuf.ProtocolStringList getExceptionPermissionsList() {
-      exceptionPermissions_.makeImmutable();
-      return exceptionPermissions_;
+      return exceptionPermissions_.getUnmodifiableView();
     }
 
     /**
@@ -2179,7 +2014,6 @@ public com.google.protobuf.ProtocolStringList getExceptionPermissionsList() {
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2200,7 +2034,6 @@ public int getExceptionPermissionsCount() {
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2222,7 +2055,6 @@ public java.lang.String getExceptionPermissions(int index) {
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2244,7 +2076,6 @@ public com.google.protobuf.ByteString getExceptionPermissionsBytes(int index) {
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2261,7 +2092,6 @@ public Builder setExceptionPermissions(int index, java.lang.String value) {
       }
       ensureExceptionPermissionsIsMutable();
       exceptionPermissions_.set(index, value);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2274,7 +2104,6 @@ public Builder setExceptionPermissions(int index, java.lang.String value) {
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2290,7 +2119,6 @@ public Builder addExceptionPermissions(java.lang.String value) {
       }
       ensureExceptionPermissionsIsMutable();
       exceptionPermissions_.add(value);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2303,7 +2131,6 @@ public Builder addExceptionPermissions(java.lang.String value) {
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2316,7 +2143,6 @@ public Builder addExceptionPermissions(java.lang.String value) {
     public Builder addAllExceptionPermissions(java.lang.Iterable values) {
       ensureExceptionPermissionsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, exceptionPermissions_);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2329,7 +2155,6 @@ public Builder addAllExceptionPermissions(java.lang.Iterable v
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2339,9 +2164,8 @@ public Builder addAllExceptionPermissions(java.lang.Iterable v
      * @return This builder for chaining.
      */
     public Builder clearExceptionPermissions() {
-      exceptionPermissions_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      exceptionPermissions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000008);
-      ;
       onChanged();
       return this;
     }
@@ -2354,7 +2178,6 @@ public Builder clearExceptionPermissions() {
      * permissions given by `denied_permissions`. If a permission appears in
      * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
      * denied.
-     *
      * The excluded permissions can be specified using the same syntax as
      * `denied_permissions`.
      * 

@@ -2371,7 +2194,6 @@ public Builder addExceptionPermissionsBytes(com.google.protobuf.ByteString value
       checkByteStringIsUtf8(value);
       ensureExceptionPermissionsIsMutable();
       exceptionPermissions_.add(value);
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -2388,10 +2210,8 @@ public Builder addExceptionPermissionsBytes(com.google.protobuf.ByteString value
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -2403,7 +2223,7 @@ public Builder addExceptionPermissionsBytes(com.google.protobuf.ByteString value
      * @return Whether the denialCondition field is set.
      */
     public boolean hasDenialCondition() {
-      return ((bitField0_ & 0x00000010) != 0);
+      return denialConditionBuilder_ != null || denialCondition_ != null;
     }
 
     /**
@@ -2413,10 +2233,8 @@ public boolean hasDenialCondition() {
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -2444,10 +2262,8 @@ public com.google.type.Expr getDenialCondition() {
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -2462,11 +2278,11 @@ public Builder setDenialCondition(com.google.type.Expr value) {
           throw new NullPointerException();
         }
         denialCondition_ = value;
+        onChanged();
       } else {
         denialConditionBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -2477,10 +2293,8 @@ public Builder setDenialCondition(com.google.type.Expr value) {
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -2492,11 +2306,11 @@ public Builder setDenialCondition(com.google.type.Expr value) {
     public Builder setDenialCondition(com.google.type.Expr.Builder builderForValue) {
       if (denialConditionBuilder_ == null) {
         denialCondition_ = builderForValue.build();
+        onChanged();
       } else {
         denialConditionBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -2507,10 +2321,8 @@ public Builder setDenialCondition(com.google.type.Expr.Builder builderForValue)
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -2521,20 +2333,17 @@ public Builder setDenialCondition(com.google.type.Expr.Builder builderForValue)
      */
     public Builder mergeDenialCondition(com.google.type.Expr value) {
       if (denialConditionBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)
-            && denialCondition_ != null
-            && denialCondition_ != com.google.type.Expr.getDefaultInstance()) {
-          getDenialConditionBuilder().mergeFrom(value);
+        if (denialCondition_ != null) {
+          denialCondition_ =
+              com.google.type.Expr.newBuilder(denialCondition_).mergeFrom(value).buildPartial();
         } else {
           denialCondition_ = value;
         }
+        onChanged();
       } else {
         denialConditionBuilder_.mergeFrom(value);
       }
-      if (denialCondition_ != null) {
-        bitField0_ |= 0x00000010;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2545,10 +2354,8 @@ public Builder mergeDenialCondition(com.google.type.Expr value) {
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -2558,13 +2365,14 @@ public Builder mergeDenialCondition(com.google.type.Expr value) {
      * .google.type.Expr denial_condition = 5;
      */
     public Builder clearDenialCondition() {
-      bitField0_ = (bitField0_ & ~0x00000010);
-      denialCondition_ = null;
-      if (denialConditionBuilder_ != null) {
-        denialConditionBuilder_.dispose();
+      if (denialConditionBuilder_ == null) {
+        denialCondition_ = null;
+        onChanged();
+      } else {
+        denialCondition_ = null;
         denialConditionBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2575,10 +2383,8 @@ public Builder clearDenialCondition() {
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -2588,7 +2394,7 @@ public Builder clearDenialCondition() {
      * .google.type.Expr denial_condition = 5;
      */
     public com.google.type.Expr.Builder getDenialConditionBuilder() {
-      bitField0_ |= 0x00000010;
+
       onChanged();
       return getDenialConditionFieldBuilder().getBuilder();
     }
@@ -2600,10 +2406,8 @@ public com.google.type.Expr.Builder getDenialConditionBuilder() {
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -2629,10 +2433,8 @@ public com.google.type.ExprOrBuilder getDenialConditionOrBuilder() {
      * The condition that determines whether this deny rule applies to a request.
      * If the condition expression evaluates to `true`, then the deny rule is
      * applied; otherwise, the deny rule is not applied.
-     *
      * Each deny rule is evaluated independently. If this deny rule does not apply
      * to a request, other deny rules might still apply.
-     *
      * The condition can use CEL functions that evaluate
      * [resource
      * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRuleOrBuilder.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRuleOrBuilder.java
index c126f539ff..de45e89c87 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRuleOrBuilder.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRuleOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/deny.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 public interface DenyRuleOrBuilder
@@ -30,40 +29,32 @@ public interface DenyRuleOrBuilder
    * 
    * The identities that are prevented from using one or more permissions on
    * Google Cloud resources. This field can contain the following values:
-   *
    * * `principalSet://goog/public:all`: A special identifier that represents
    *   any principal that is on the internet, even if they do not have a Google
    *   Account or are not logged in.
-   *
    * * `principal://goog/subject/{email_id}`: A specific Google Account.
    *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
    *   example, `principal://goog/subject/alice@example.com`.
-   *
    * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
    *   Google Account that was deleted recently. For example,
    *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
    *   the Google Account is recovered, this identifier reverts to the standard
    *   identifier for a Google Account.
-   *
    * * `principalSet://goog/group/{group_id}`: A Google group. For example,
    *   `principalSet://goog/group/admins@example.com`.
-   *
    * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
    *   that was deleted recently. For example,
    *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
    *   the Google group is restored, this identifier reverts to the standard
    *   identifier for a Google group.
-   *
    * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
    *   A Google Cloud service account. For example,
    *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-   *
    * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
    *   A Google Cloud service account that was deleted recently. For example,
    *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
    *   If the service account is undeleted, this identifier reverts to the
    *   standard identifier for a service account.
-   *
    * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
    *   principals associated with the specified Google Workspace or Cloud
    *   Identity customer ID. For example,
@@ -82,40 +73,32 @@ public interface DenyRuleOrBuilder
    * 
    * The identities that are prevented from using one or more permissions on
    * Google Cloud resources. This field can contain the following values:
-   *
    * * `principalSet://goog/public:all`: A special identifier that represents
    *   any principal that is on the internet, even if they do not have a Google
    *   Account or are not logged in.
-   *
    * * `principal://goog/subject/{email_id}`: A specific Google Account.
    *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
    *   example, `principal://goog/subject/alice@example.com`.
-   *
    * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
    *   Google Account that was deleted recently. For example,
    *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
    *   the Google Account is recovered, this identifier reverts to the standard
    *   identifier for a Google Account.
-   *
    * * `principalSet://goog/group/{group_id}`: A Google group. For example,
    *   `principalSet://goog/group/admins@example.com`.
-   *
    * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
    *   that was deleted recently. For example,
    *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
    *   the Google group is restored, this identifier reverts to the standard
    *   identifier for a Google group.
-   *
    * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
    *   A Google Cloud service account. For example,
    *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-   *
    * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
    *   A Google Cloud service account that was deleted recently. For example,
    *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
    *   If the service account is undeleted, this identifier reverts to the
    *   standard identifier for a service account.
-   *
    * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
    *   principals associated with the specified Google Workspace or Cloud
    *   Identity customer ID. For example,
@@ -134,40 +117,32 @@ public interface DenyRuleOrBuilder
    * 
    * The identities that are prevented from using one or more permissions on
    * Google Cloud resources. This field can contain the following values:
-   *
    * * `principalSet://goog/public:all`: A special identifier that represents
    *   any principal that is on the internet, even if they do not have a Google
    *   Account or are not logged in.
-   *
    * * `principal://goog/subject/{email_id}`: A specific Google Account.
    *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
    *   example, `principal://goog/subject/alice@example.com`.
-   *
    * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
    *   Google Account that was deleted recently. For example,
    *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
    *   the Google Account is recovered, this identifier reverts to the standard
    *   identifier for a Google Account.
-   *
    * * `principalSet://goog/group/{group_id}`: A Google group. For example,
    *   `principalSet://goog/group/admins@example.com`.
-   *
    * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
    *   that was deleted recently. For example,
    *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
    *   the Google group is restored, this identifier reverts to the standard
    *   identifier for a Google group.
-   *
    * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
    *   A Google Cloud service account. For example,
    *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-   *
    * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
    *   A Google Cloud service account that was deleted recently. For example,
    *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
    *   If the service account is undeleted, this identifier reverts to the
    *   standard identifier for a service account.
-   *
    * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
    *   principals associated with the specified Google Workspace or Cloud
    *   Identity customer ID. For example,
@@ -187,40 +162,32 @@ public interface DenyRuleOrBuilder
    * 
    * The identities that are prevented from using one or more permissions on
    * Google Cloud resources. This field can contain the following values:
-   *
    * * `principalSet://goog/public:all`: A special identifier that represents
    *   any principal that is on the internet, even if they do not have a Google
    *   Account or are not logged in.
-   *
    * * `principal://goog/subject/{email_id}`: A specific Google Account.
    *   Includes Gmail, Cloud Identity, and Google Workspace user accounts. For
    *   example, `principal://goog/subject/alice@example.com`.
-   *
    * * `deleted:principal://goog/subject/{email_id}?uid={uid}`: A specific
    *   Google Account that was deleted recently. For example,
    *   `deleted:principal://goog/subject/alice@example.com?uid=1234567890`. If
    *   the Google Account is recovered, this identifier reverts to the standard
    *   identifier for a Google Account.
-   *
    * * `principalSet://goog/group/{group_id}`: A Google group. For example,
    *   `principalSet://goog/group/admins@example.com`.
-   *
    * * `deleted:principalSet://goog/group/{group_id}?uid={uid}`: A Google group
    *   that was deleted recently. For example,
    *   `deleted:principalSet://goog/group/admins@example.com?uid=1234567890`. If
    *   the Google group is restored, this identifier reverts to the standard
    *   identifier for a Google group.
-   *
    * * `principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}`:
    *   A Google Cloud service account. For example,
    *   `principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com`.
-   *
    * * `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/{service_account_id}?uid={uid}`:
    *   A Google Cloud service account that was deleted recently. For example,
    *   `deleted:principal://iam.googleapis.com/projects/-/serviceAccounts/my-service-account@iam.gserviceaccount.com?uid=1234567890`.
    *   If the service account is undeleted, this identifier reverts to the
    *   standard identifier for a service account.
-   *
    * * `principalSet://goog/cloudIdentityCustomerId/{customer_id}`: All of the
    *   principals associated with the specified Google Workspace or Cloud
    *   Identity customer ID. For example,
@@ -242,7 +209,6 @@ public interface DenyRuleOrBuilder
    * listed in the `denied_principals`. For example, you could add a Google
    * group to the `denied_principals`, then exclude specific users who belong to
    * that group.
-   *
    * This field can contain the same values as the `denied_principals` field,
    * excluding `principalSet://goog/public:all`, which represents all users on
    * the internet.
@@ -262,7 +228,6 @@ public interface DenyRuleOrBuilder
    * listed in the `denied_principals`. For example, you could add a Google
    * group to the `denied_principals`, then exclude specific users who belong to
    * that group.
-   *
    * This field can contain the same values as the `denied_principals` field,
    * excluding `principalSet://goog/public:all`, which represents all users on
    * the internet.
@@ -282,7 +247,6 @@ public interface DenyRuleOrBuilder
    * listed in the `denied_principals`. For example, you could add a Google
    * group to the `denied_principals`, then exclude specific users who belong to
    * that group.
-   *
    * This field can contain the same values as the `denied_principals` field,
    * excluding `principalSet://goog/public:all`, which represents all users on
    * the internet.
@@ -303,7 +267,6 @@ public interface DenyRuleOrBuilder
    * listed in the `denied_principals`. For example, you could add a Google
    * group to the `denied_principals`, then exclude specific users who belong to
    * that group.
-   *
    * This field can contain the same values as the `denied_principals` field,
    * excluding `principalSet://goog/public:all`, which represents all users on
    * the internet.
@@ -390,7 +353,6 @@ public interface DenyRuleOrBuilder
    * permissions given by `denied_permissions`. If a permission appears in
    * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
    * denied.
-   *
    * The excluded permissions can be specified using the same syntax as
    * `denied_permissions`.
    * 

@@ -409,7 +371,6 @@ public interface DenyRuleOrBuilder
    * permissions given by `denied_permissions`. If a permission appears in
    * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
    * denied.
-   *
    * The excluded permissions can be specified using the same syntax as
    * `denied_permissions`.
    * 

@@ -428,7 +389,6 @@ public interface DenyRuleOrBuilder
    * permissions given by `denied_permissions`. If a permission appears in
    * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
    * denied.
-   *
    * The excluded permissions can be specified using the same syntax as
    * `denied_permissions`.
    * 

@@ -448,7 +408,6 @@ public interface DenyRuleOrBuilder
    * permissions given by `denied_permissions`. If a permission appears in
    * `denied_permissions` _and_ in `exception_permissions` then it will _not_ be
    * denied.
-   *
    * The excluded permissions can be specified using the same syntax as
    * `denied_permissions`.
    * 

@@ -467,10 +426,8 @@ public interface DenyRuleOrBuilder
    * The condition that determines whether this deny rule applies to a request.
    * If the condition expression evaluates to `true`, then the deny rule is
    * applied; otherwise, the deny rule is not applied.
-   *
    * Each deny rule is evaluated independently. If this deny rule does not apply
    * to a request, other deny rules might still apply.
-   *
    * The condition can use CEL functions that evaluate
    * [resource
    * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -490,10 +447,8 @@ public interface DenyRuleOrBuilder
    * The condition that determines whether this deny rule applies to a request.
    * If the condition expression evaluates to `true`, then the deny rule is
    * applied; otherwise, the deny rule is not applied.
-   *
    * Each deny rule is evaluated independently. If this deny rule does not apply
    * to a request, other deny rules might still apply.
-   *
    * The condition can use CEL functions that evaluate
    * [resource
    * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
@@ -513,10 +468,8 @@ public interface DenyRuleOrBuilder
    * The condition that determines whether this deny rule applies to a request.
    * If the condition expression evaluates to `true`, then the deny rule is
    * applied; otherwise, the deny rule is not applied.
-   *
    * Each deny rule is evaluated independently. If this deny rule does not apply
    * to a request, other deny rules might still apply.
-   *
    * The condition can use CEL functions that evaluate
    * [resource
    * tags](https://cloud.google.com/iam/help/conditions/resource-tags). Other
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRuleProto.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRuleProto.java
index a45f1d1b5b..969dc873fc 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRuleProto.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRuleProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/deny.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 public final class DenyRuleProto {
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/GetPolicyRequest.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/GetPolicyRequest.java
index c139017599..6374d5c704 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/GetPolicyRequest.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/GetPolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GetPolicyRequest();
   }
 
+  @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.iam.v2beta.PolicyProto
         .internal_static_google_iam_v2beta_GetPolicyRequest_descriptor;
@@ -65,9 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -75,12 +77,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * Required. The resource name of the policy to retrieve. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * Use the URL-encoded full resource name, which means that the forward-slash
    * character, `/`, must be written as `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -108,12 +107,9 @@ public java.lang.String getName() {
    * 
    * Required. The resource name of the policy to retrieve. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * Use the URL-encoded full resource name, which means that the forward-slash
    * character, `/`, must be written as `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -332,8 +328,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -361,20 +357,11 @@ public com.google.iam.v2beta.GetPolicyRequest build() {
     public com.google.iam.v2beta.GetPolicyRequest buildPartial() {
       com.google.iam.v2beta.GetPolicyRequest result =
           new com.google.iam.v2beta.GetPolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v2beta.GetPolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -422,7 +409,6 @@ public Builder mergeFrom(com.google.iam.v2beta.GetPolicyRequest other) {
       if (other == com.google.iam.v2beta.GetPolicyRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -454,7 +440,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -474,8 +460,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -484,12 +468,9 @@ public Builder mergeFrom(
      * 
      * Required. The resource name of the policy to retrieve. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -516,12 +497,9 @@ public java.lang.String getName() {
      * 
      * Required. The resource name of the policy to retrieve. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -548,12 +526,9 @@ public com.google.protobuf.ByteString getNameBytes() {
      * 
      * Required. The resource name of the policy to retrieve. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -567,8 +542,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -579,12 +554,9 @@ public Builder setName(java.lang.String value) {
      * 
      * Required. The resource name of the policy to retrieve. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -594,8 +566,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -606,12 +578,9 @@ public Builder clearName() {
      * 
      * Required. The resource name of the policy to retrieve. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * Use the URL-encoded full resource name, which means that the forward-slash
      * character, `/`, must be written as `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -626,8 +595,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/GetPolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/GetPolicyRequestOrBuilder.java
index 39efb38847..11a9f8eea2 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/GetPolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/GetPolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 public interface GetPolicyRequestOrBuilder
@@ -30,12 +29,9 @@ public interface GetPolicyRequestOrBuilder
    * 
    * Required. The resource name of the policy to retrieve. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * Use the URL-encoded full resource name, which means that the forward-slash
    * character, `/`, must be written as `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -52,12 +48,9 @@ public interface GetPolicyRequestOrBuilder
    * 
    * Required. The resource name of the policy to retrieve. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * Use the URL-encoded full resource name, which means that the forward-slash
    * character, `/`, must be written as `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesRequest.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesRequest.java
index 025253c218..7bf25e6f17 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesRequest.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListPoliciesRequest();
   }
 
+  @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.iam.v2beta.PolicyProto
         .internal_static_google_iam_v2beta_ListPoliciesRequest_descriptor;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -77,13 +79,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * Required. The resource that the policy is attached to, along with the kind of policy
    * to list. Format:
    * `policies/{attachment_point}/denypolicies`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -112,13 +111,10 @@ public java.lang.String getParent() {
    * Required. The resource that the policy is attached to, along with the kind of policy
    * to list. Format:
    * `policies/{attachment_point}/denypolicies`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -141,7 +137,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -161,9 +157,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -431,10 +425,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       parent_ = "";
+
       pageSize_ = 0;
+
       pageToken_ = "";
+
       return this;
     }
 
@@ -462,26 +458,13 @@ public com.google.iam.v2beta.ListPoliciesRequest build() {
     public com.google.iam.v2beta.ListPoliciesRequest buildPartial() {
       com.google.iam.v2beta.ListPoliciesRequest result =
           new com.google.iam.v2beta.ListPoliciesRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.parent_ = parent_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v2beta.ListPoliciesRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.parent_ = parent_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -529,7 +512,6 @@ public Builder mergeFrom(com.google.iam.v2beta.ListPoliciesRequest other) {
       if (other == com.google.iam.v2beta.ListPoliciesRequest.getDefaultInstance()) return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -537,7 +519,6 @@ public Builder mergeFrom(com.google.iam.v2beta.ListPoliciesRequest other) {
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -569,19 +550,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -601,8 +582,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object parent_ = "";
 
     /**
@@ -612,13 +591,10 @@ public Builder mergeFrom(
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to list. Format:
      * `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -646,13 +622,10 @@ public java.lang.String getParent() {
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to list. Format:
      * `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -680,13 +653,10 @@ public com.google.protobuf.ByteString getParentBytes() {
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to list. Format:
      * `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -700,8 +670,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -713,13 +683,10 @@ public Builder setParent(java.lang.String value) {
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to list. Format:
      * `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -729,8 +696,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -742,13 +709,10 @@ public Builder clearParent() {
      * Required. The resource that the policy is attached to, along with the kind of policy
      * to list. Format:
      * `policies/{attachment_point}/denypolicies`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, you can use the alphanumeric or the numeric ID.
      * 

@@ -763,8 +727,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -804,7 +768,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -822,7 +785,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -895,8 +858,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -914,8 +877,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -938,8 +901,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesRequestOrBuilder.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesRequestOrBuilder.java
index 795e2d1011..95c12169c5 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 public interface ListPoliciesRequestOrBuilder
@@ -31,13 +30,10 @@ public interface ListPoliciesRequestOrBuilder
    * Required. The resource that the policy is attached to, along with the kind of policy
    * to list. Format:
    * `policies/{attachment_point}/denypolicies`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

@@ -55,13 +51,10 @@ public interface ListPoliciesRequestOrBuilder
    * Required. The resource that the policy is attached to, along with the kind of policy
    * to list. Format:
    * `policies/{attachment_point}/denypolicies`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, you can use the alphanumeric or the numeric ID.
    * 

diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesResponse.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesResponse.java
index 3cd3d20000..e8c9fa875e 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesResponse.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListPoliciesResponse();
   }
 
+  @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.iam.v2beta.PolicyProto
         .internal_static_google_iam_v2beta_ListPoliciesResponse_descriptor;
@@ -66,8 +70,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int POLICIES_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List policies_;
 
   /**
@@ -142,9 +144,7 @@ public com.google.iam.v2beta.PolicyOrBuilder getPoliciesOrBuilder(int index) {
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -405,7 +405,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (policiesBuilder_ == null) {
         policies_ = java.util.Collections.emptyList();
       } else {
@@ -414,6 +413,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -441,15 +441,7 @@ public com.google.iam.v2beta.ListPoliciesResponse build() {
     public com.google.iam.v2beta.ListPoliciesResponse buildPartial() {
       com.google.iam.v2beta.ListPoliciesResponse result =
           new com.google.iam.v2beta.ListPoliciesResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.iam.v2beta.ListPoliciesResponse result) {
+      int from_bitField0_ = bitField0_;
       if (policiesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           policies_ = java.util.Collections.unmodifiableList(policies_);
@@ -459,13 +451,9 @@ private void buildPartialRepeatedFields(com.google.iam.v2beta.ListPoliciesRespon
       } else {
         result.policies_ = policiesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.iam.v2beta.ListPoliciesResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -542,7 +530,6 @@ public Builder mergeFrom(com.google.iam.v2beta.ListPoliciesResponse other) {
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -586,7 +573,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1038,8 +1025,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1057,8 +1044,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1081,8 +1068,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesResponseOrBuilder.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesResponseOrBuilder.java
index 7900f051e1..b5eb651a12 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesResponseOrBuilder.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 public interface ListPoliciesResponseOrBuilder
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/Policy.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/Policy.java
index 3985a8c2a5..a3b7b6ec85 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/Policy.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/Policy.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 /**
@@ -54,14 +53,18 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Policy();
   }
 
+  @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.iam.v2beta.PolicyProto.internal_static_google_iam_v2beta_Policy_descriptor;
   }
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 5:
         return internalGetAnnotations();
@@ -79,11 +82,8 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
             com.google.iam.v2beta.Policy.class, com.google.iam.v2beta.Policy.Builder.class);
   }
 
-  private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -91,13 +91,10 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
    * 
    * Immutable. The resource name of the `Policy`, which must be unique. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, requests can use the alphanumeric or the numeric ID.
    * Responses always contain the numeric ID.
@@ -126,13 +123,10 @@ public java.lang.String getName() {
    * 
    * Immutable. The resource name of the `Policy`, which must be unique. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, requests can use the alphanumeric or the numeric ID.
    * Responses always contain the numeric ID.
@@ -156,9 +150,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int UID_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object uid_ = "";
+  private volatile java.lang.Object uid_;
 
   /**
    *
@@ -211,9 +203,7 @@ public com.google.protobuf.ByteString getUidBytes() {
   }
 
   public static final int KIND_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object kind_ = "";
+  private volatile java.lang.Object kind_;
 
   /**
    *
@@ -264,9 +254,7 @@ public com.google.protobuf.ByteString getKindBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object displayName_ = "";
+  private volatile java.lang.Object displayName_;
 
   /**
    *
@@ -331,7 +319,6 @@ private static final class AnnotationsDefaultEntryHolder {
             "");
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField annotations_;
 
   private com.google.protobuf.MapField
@@ -397,10 +384,8 @@ public java.util.Map getAnnotationsMap() {
    * map<string, string> annotations = 5;
    */
   @java.lang.Override
-  public /* nullable */ java.lang.String getAnnotationsOrDefault(
-      java.lang.String key,
-      /* nullable */
-      java.lang.String defaultValue) {
+  public java.lang.String getAnnotationsOrDefault(
+      java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -431,9 +416,7 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
   }
 
   public static final int ETAG_FIELD_NUMBER = 6;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object etag_ = "";
+  private volatile java.lang.Object etag_;
 
   /**
    *
@@ -442,7 +425,6 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
    * An opaque tag that identifies the current version of the `Policy`. IAM uses
    * this value to help manage concurrent updates, so they do not cause one
    * update to be overwritten by another.
-   *
    * If this field is present in a [CreatePolicy][] request, the value is
    * ignored.
    * 

@@ -471,7 +453,6 @@ public java.lang.String getEtag() {
    * An opaque tag that identifies the current version of the `Policy`. IAM uses
    * this value to help manage concurrent updates, so they do not cause one
    * update to be overwritten by another.
-   *
    * If this field is present in a [CreatePolicy][] request, the value is
    * ignored.
    * 

@@ -510,7 +491,7 @@ public com.google.protobuf.ByteString getEtagBytes() {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return createTime_ != null;
   }
 
   /**
@@ -542,7 +523,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+    return getCreateTime();
   }
 
   public static final int UPDATE_TIME_FIELD_NUMBER = 8;
@@ -562,7 +543,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateTime() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return updateTime_ != null;
   }
 
   /**
@@ -594,7 +575,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+    return getUpdateTime();
   }
 
   public static final int DELETE_TIME_FIELD_NUMBER = 9;
@@ -614,7 +595,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasDeleteTime() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return deleteTime_ != null;
   }
 
   /**
@@ -646,12 +627,10 @@ public com.google.protobuf.Timestamp getDeleteTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getDeleteTimeOrBuilder() {
-    return deleteTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : deleteTime_;
+    return getDeleteTime();
   }
 
   public static final int RULES_FIELD_NUMBER = 10;
-
-  @SuppressWarnings("serial")
   private java.util.List rules_;
 
   /**
@@ -761,13 +740,13 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(etag_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 6, etag_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       output.writeMessage(7, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateTime_ != null) {
       output.writeMessage(8, getUpdateTime());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (deleteTime_ != null) {
       output.writeMessage(9, getDeleteTime());
     }
     for (int i = 0; i < rules_.size(); i++) {
@@ -807,13 +786,13 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(etag_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, etag_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getUpdateTime());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (deleteTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getDeleteTime());
     }
     for (int i = 0; i < rules_.size(); i++) {
@@ -1012,8 +991,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 5:
           return internalGetAnnotations();
@@ -1023,8 +1001,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 5:
           return internalGetMutableAnnotations();
@@ -1043,47 +1020,42 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     }
 
     // Construct using com.google.iam.v2beta.Policy.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCreateTimeFieldBuilder();
-        getUpdateTimeFieldBuilder();
-        getDeleteTimeFieldBuilder();
-        getRulesFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       uid_ = "";
+
       kind_ = "";
+
       displayName_ = "";
+
       internalGetMutableAnnotations().clear();
       etag_ = "";
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
-      deleteTime_ = null;
-      if (deleteTimeBuilder_ != null) {
-        deleteTimeBuilder_.dispose();
+      if (deleteTimeBuilder_ == null) {
+        deleteTime_ = null;
+      } else {
+        deleteTime_ = null;
         deleteTimeBuilder_ = null;
       }
       if (rulesBuilder_ == null) {
@@ -1092,7 +1064,7 @@ public Builder clear() {
         rules_ = null;
         rulesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000200);
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -1118,61 +1090,40 @@ public com.google.iam.v2beta.Policy build() {
     @java.lang.Override
     public com.google.iam.v2beta.Policy buildPartial() {
       com.google.iam.v2beta.Policy result = new com.google.iam.v2beta.Policy(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      result.name_ = name_;
+      result.uid_ = uid_;
+      result.kind_ = kind_;
+      result.displayName_ = displayName_;
+      result.annotations_ = internalGetAnnotations();
+      result.annotations_.makeImmutable();
+      result.etag_ = etag_;
+      if (createTimeBuilder_ == null) {
+        result.createTime_ = createTime_;
+      } else {
+        result.createTime_ = createTimeBuilder_.build();
+      }
+      if (updateTimeBuilder_ == null) {
+        result.updateTime_ = updateTime_;
+      } else {
+        result.updateTime_ = updateTimeBuilder_.build();
+      }
+      if (deleteTimeBuilder_ == null) {
+        result.deleteTime_ = deleteTime_;
+      } else {
+        result.deleteTime_ = deleteTimeBuilder_.build();
       }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.iam.v2beta.Policy result) {
       if (rulesBuilder_ == null) {
-        if (((bitField0_ & 0x00000200) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
-          bitField0_ = (bitField0_ & ~0x00000200);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.rules_ = rules_;
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.iam.v2beta.Policy result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.uid_ = uid_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.kind_ = kind_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.displayName_ = displayName_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.annotations_ = internalGetAnnotations();
-        result.annotations_.makeImmutable();
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.etag_ = etag_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      if (((from_bitField0_ & 0x00000100) != 0)) {
-        result.deleteTime_ = deleteTimeBuilder_ == null ? deleteTime_ : deleteTimeBuilder_.build();
-        to_bitField0_ |= 0x00000004;
-      }
-      result.bitField0_ |= to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1222,29 +1173,23 @@ public Builder mergeFrom(com.google.iam.v2beta.Policy other) {
       if (other == com.google.iam.v2beta.Policy.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getUid().isEmpty()) {
         uid_ = other.uid_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getKind().isEmpty()) {
         kind_ = other.kind_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       internalGetMutableAnnotations().mergeFrom(other.internalGetAnnotations());
-      bitField0_ |= 0x00000010;
       if (!other.getEtag().isEmpty()) {
         etag_ = other.etag_;
-        bitField0_ |= 0x00000020;
         onChanged();
       }
       if (other.hasCreateTime()) {
@@ -1260,7 +1205,7 @@ public Builder mergeFrom(com.google.iam.v2beta.Policy other) {
         if (!other.rules_.isEmpty()) {
           if (rules_.isEmpty()) {
             rules_ = other.rules_;
-            bitField0_ = (bitField0_ & ~0x00000200);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureRulesIsMutable();
             rules_.addAll(other.rules_);
@@ -1273,7 +1218,7 @@ public Builder mergeFrom(com.google.iam.v2beta.Policy other) {
             rulesBuilder_.dispose();
             rulesBuilder_ = null;
             rules_ = other.rules_;
-            bitField0_ = (bitField0_ & ~0x00000200);
+            bitField0_ = (bitField0_ & ~0x00000002);
             rulesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getRulesFieldBuilder()
@@ -1312,25 +1257,25 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 uid_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 kind_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 displayName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             case 42:
@@ -1342,31 +1287,30 @@ public Builder mergeFrom(
                 internalGetMutableAnnotations()
                     .getMutableMap()
                     .put(annotations__.getKey(), annotations__.getValue());
-                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 50:
               {
                 etag_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 50
             case 58:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 58
             case 66:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 66
             case 74:
               {
                 input.readMessage(getDeleteTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000100;
+
                 break;
               } // case 74
             case 82:
@@ -1408,13 +1352,10 @@ public Builder mergeFrom(
      * 
      * Immutable. The resource name of the `Policy`, which must be unique. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, requests can use the alphanumeric or the numeric ID.
      * Responses always contain the numeric ID.
@@ -1442,13 +1383,10 @@ public java.lang.String getName() {
      * 
      * Immutable. The resource name of the `Policy`, which must be unique. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, requests can use the alphanumeric or the numeric ID.
      * Responses always contain the numeric ID.
@@ -1476,13 +1414,10 @@ public com.google.protobuf.ByteString getNameBytes() {
      * 
      * Immutable. The resource name of the `Policy`, which must be unique. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, requests can use the alphanumeric or the numeric ID.
      * Responses always contain the numeric ID.
@@ -1497,8 +1432,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1509,13 +1444,10 @@ public Builder setName(java.lang.String value) {
      * 
      * Immutable. The resource name of the `Policy`, which must be unique. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, requests can use the alphanumeric or the numeric ID.
      * Responses always contain the numeric ID.
@@ -1526,8 +1458,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1538,13 +1470,10 @@ public Builder clearName() {
      * 
      * Immutable. The resource name of the `Policy`, which must be unique. Format:
      * `policies/{attachment_point}/denypolicies/{policy_id}`
-     *
-     *
      * The attachment point is identified by its URL-encoded full resource name,
      * which means that the forward-slash character, `/`, must be written as
      * `%2F`. For example,
      * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-     *
      * For organizations and folders, use the numeric ID in the full resource
      * name. For projects, requests can use the alphanumeric or the numeric ID.
      * Responses always contain the numeric ID.
@@ -1560,8 +1489,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1633,8 +1562,8 @@ public Builder setUid(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       uid_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1652,8 +1581,8 @@ public Builder setUid(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearUid() {
+
       uid_ = getDefaultInstance().getUid();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1676,8 +1605,8 @@ public Builder setUidBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       uid_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1746,8 +1675,8 @@ public Builder setKind(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       kind_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1764,8 +1693,8 @@ public Builder setKind(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearKind() {
+
       kind_ = getDefaultInstance().getKind();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1787,8 +1716,8 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       kind_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1860,8 +1789,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       displayName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1879,8 +1808,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
+
       displayName_ = getDefaultInstance().getDisplayName();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1903,8 +1832,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       displayName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1922,6 +1851,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
 
     private com.google.protobuf.MapField
         internalGetMutableAnnotations() {
+      onChanged();
+      ;
       if (annotations_ == null) {
         annotations_ =
             com.google.protobuf.MapField.newMapField(AnnotationsDefaultEntryHolder.defaultEntry);
@@ -1929,8 +1860,6 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
       if (!annotations_.isMutable()) {
         annotations_ = annotations_.copy();
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
       return annotations_;
     }
 
@@ -1989,10 +1918,8 @@ public java.util.Map getAnnotationsMap() {
      * map<string, string> annotations = 5;
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getAnnotationsOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getAnnotationsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -2023,7 +1950,6 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
     }
 
     public Builder clearAnnotations() {
-      bitField0_ = (bitField0_ & ~0x00000010);
       internalGetMutableAnnotations().getMutableMap().clear();
       return this;
     }
@@ -2049,7 +1975,6 @@ public Builder removeAnnotations(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableAnnotations() {
-      bitField0_ |= 0x00000010;
       return internalGetMutableAnnotations().getMutableMap();
     }
 
@@ -2070,8 +1995,8 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
+
       internalGetMutableAnnotations().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000010;
       return this;
     }
 
@@ -2087,7 +2012,6 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllAnnotations(java.util.Map values) {
       internalGetMutableAnnotations().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000010;
       return this;
     }
 
@@ -2100,7 +2024,6 @@ public Builder putAllAnnotations(java.util.Map
@@ -2128,7 +2051,6 @@ public java.lang.String getEtag() {
      * An opaque tag that identifies the current version of the `Policy`. IAM uses
      * this value to help manage concurrent updates, so they do not cause one
      * update to be overwritten by another.
-     *
      * If this field is present in a [CreatePolicy][] request, the value is
      * ignored.
      * 

@@ -2156,7 +2078,6 @@ public com.google.protobuf.ByteString getEtagBytes() {
      * An opaque tag that identifies the current version of the `Policy`. IAM uses
      * this value to help manage concurrent updates, so they do not cause one
      * update to be overwritten by another.
-     *
      * If this field is present in a [CreatePolicy][] request, the value is
      * ignored.
      * 

@@ -2170,8 +2091,8 @@ public Builder setEtag(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       etag_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2183,7 +2104,6 @@ public Builder setEtag(java.lang.String value) {
      * An opaque tag that identifies the current version of the `Policy`. IAM uses
      * this value to help manage concurrent updates, so they do not cause one
      * update to be overwritten by another.
-     *
      * If this field is present in a [CreatePolicy][] request, the value is
      * ignored.
      * 

@@ -2193,8 +2113,8 @@ public Builder setEtag(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEtag() {
+
       etag_ = getDefaultInstance().getEtag();
-      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -2206,7 +2126,6 @@ public Builder clearEtag() {
      * An opaque tag that identifies the current version of the `Policy`. IAM uses
      * this value to help manage concurrent updates, so they do not cause one
      * update to be overwritten by another.
-     *
      * If this field is present in a [CreatePolicy][] request, the value is
      * ignored.
      * 

@@ -2221,8 +2140,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       etag_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -2248,7 +2167,7 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return ((bitField0_ & 0x00000040) != 0);
+      return createTimeBuilder_ != null || createTime_ != null;
     }
 
     /**
@@ -2291,11 +2210,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -2313,11 +2232,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -2334,20 +2253,17 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000040) != 0)
-            && createTime_ != null
-            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getCreateTimeBuilder().mergeFrom(value);
+        if (createTime_ != null) {
+          createTime_ =
+              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
         } else {
           createTime_ = value;
         }
+        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-      if (createTime_ != null) {
-        bitField0_ |= 0x00000040;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2363,13 +2279,14 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearCreateTime() {
-      bitField0_ = (bitField0_ & ~0x00000040);
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+        onChanged();
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2385,7 +2302,7 @@ public Builder clearCreateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-      bitField0_ |= 0x00000040;
+
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -2460,7 +2377,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      * @return Whether the updateTime field is set.
      */
     public boolean hasUpdateTime() {
-      return ((bitField0_ & 0x00000080) != 0);
+      return updateTimeBuilder_ != null || updateTime_ != null;
     }
 
     /**
@@ -2503,11 +2420,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         updateTime_ = value;
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -2525,11 +2442,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
     public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (updateTimeBuilder_ == null) {
         updateTime_ = builderForValue.build();
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -2546,20 +2463,17 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       if (updateTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000080) != 0)
-            && updateTime_ != null
-            && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getUpdateTimeBuilder().mergeFrom(value);
+        if (updateTime_ != null) {
+          updateTime_ =
+              com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
         } else {
           updateTime_ = value;
         }
+        onChanged();
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-      if (updateTime_ != null) {
-        bitField0_ |= 0x00000080;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2575,13 +2489,14 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearUpdateTime() {
-      bitField0_ = (bitField0_ & ~0x00000080);
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+        onChanged();
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2597,7 +2512,7 @@ public Builder clearUpdateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-      bitField0_ |= 0x00000080;
+
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
@@ -2672,7 +2587,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
      * @return Whether the deleteTime field is set.
      */
     public boolean hasDeleteTime() {
-      return ((bitField0_ & 0x00000100) != 0);
+      return deleteTimeBuilder_ != null || deleteTime_ != null;
     }
 
     /**
@@ -2715,11 +2630,11 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         deleteTime_ = value;
+        onChanged();
       } else {
         deleteTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000100;
-      onChanged();
+
       return this;
     }
 
@@ -2737,11 +2652,11 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp value) {
     public Builder setDeleteTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (deleteTimeBuilder_ == null) {
         deleteTime_ = builderForValue.build();
+        onChanged();
       } else {
         deleteTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000100;
-      onChanged();
+
       return this;
     }
 
@@ -2758,20 +2673,17 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeDeleteTime(com.google.protobuf.Timestamp value) {
       if (deleteTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000100) != 0)
-            && deleteTime_ != null
-            && deleteTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getDeleteTimeBuilder().mergeFrom(value);
+        if (deleteTime_ != null) {
+          deleteTime_ =
+              com.google.protobuf.Timestamp.newBuilder(deleteTime_).mergeFrom(value).buildPartial();
         } else {
           deleteTime_ = value;
         }
+        onChanged();
       } else {
         deleteTimeBuilder_.mergeFrom(value);
       }
-      if (deleteTime_ != null) {
-        bitField0_ |= 0x00000100;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2787,13 +2699,14 @@ public Builder mergeDeleteTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearDeleteTime() {
-      bitField0_ = (bitField0_ & ~0x00000100);
-      deleteTime_ = null;
-      if (deleteTimeBuilder_ != null) {
-        deleteTimeBuilder_.dispose();
+      if (deleteTimeBuilder_ == null) {
+        deleteTime_ = null;
+        onChanged();
+      } else {
+        deleteTime_ = null;
         deleteTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2809,7 +2722,7 @@ public Builder clearDeleteTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getDeleteTimeBuilder() {
-      bitField0_ |= 0x00000100;
+
       onChanged();
       return getDeleteTimeFieldBuilder().getBuilder();
     }
@@ -2867,9 +2780,9 @@ public com.google.protobuf.TimestampOrBuilder getDeleteTimeOrBuilder() {
         java.util.Collections.emptyList();
 
     private void ensureRulesIsMutable() {
-      if (!((bitField0_ & 0x00000200) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         rules_ = new java.util.ArrayList(rules_);
-        bitField0_ |= 0x00000200;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -3103,7 +3016,7 @@ public Builder addAllRules(
     public Builder clearRules() {
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000200);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         rulesBuilder_.clear();
@@ -3238,7 +3151,7 @@ public java.util.List getRulesBuilderL
                 com.google.iam.v2beta.PolicyRule,
                 com.google.iam.v2beta.PolicyRule.Builder,
                 com.google.iam.v2beta.PolicyRuleOrBuilder>(
-                rules_, ((bitField0_ & 0x00000200) != 0), getParentForChildren(), isClean());
+                rules_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         rules_ = null;
       }
       return rulesBuilder_;
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOperationMetadata.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOperationMetadata.java
index 0f5c754171..ea1246fe85 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOperationMetadata.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOperationMetadata.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 /**
@@ -47,6 +46,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PolicyOperationMetadata();
   }
 
+  @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.iam.v2beta.PolicyProto
         .internal_static_google_iam_v2beta_PolicyOperationMetadata_descriptor;
@@ -62,7 +66,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v2beta.PolicyOperationMetadata.Builder.class);
   }
 
-  private int bitField0_;
   public static final int CREATE_TIME_FIELD_NUMBER = 1;
   private com.google.protobuf.Timestamp createTime_;
 
@@ -79,7 +82,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return createTime_ != null;
   }
 
   /**
@@ -109,7 +112,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+    return getCreateTime();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -126,7 +129,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       output.writeMessage(1, getCreateTime());
     }
     getUnknownFields().writeTo(output);
@@ -138,7 +141,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCreateTime());
     }
     size += getUnknownFields().getSerializedSize();
@@ -306,28 +309,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2beta.PolicyOperationMetadata.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCreateTimeFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
       return this;
@@ -357,23 +351,15 @@ public com.google.iam.v2beta.PolicyOperationMetadata build() {
     public com.google.iam.v2beta.PolicyOperationMetadata buildPartial() {
       com.google.iam.v2beta.PolicyOperationMetadata result =
           new com.google.iam.v2beta.PolicyOperationMetadata(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (createTimeBuilder_ == null) {
+        result.createTime_ = createTime_;
+      } else {
+        result.createTime_ = createTimeBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v2beta.PolicyOperationMetadata result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -451,7 +437,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -471,8 +457,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.protobuf.Timestamp createTime_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.protobuf.Timestamp,
@@ -492,7 +476,7 @@ public Builder mergeFrom(
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return createTimeBuilder_ != null || createTime_ != null;
     }
 
     /**
@@ -531,11 +515,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -551,11 +535,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -570,20 +554,17 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && createTime_ != null
-            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getCreateTimeBuilder().mergeFrom(value);
+        if (createTime_ != null) {
+          createTime_ =
+              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
         } else {
           createTime_ = value;
         }
+        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-      if (createTime_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -597,13 +578,14 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * .google.protobuf.Timestamp create_time = 1;
      */
     public Builder clearCreateTime() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+        onChanged();
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -617,7 +599,7 @@ public Builder clearCreateTime() {
      * .google.protobuf.Timestamp create_time = 1;
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOperationMetadataOrBuilder.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOperationMetadataOrBuilder.java
index 4c48574813..fbbb07a491 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOperationMetadataOrBuilder.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOperationMetadataOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 public interface PolicyOperationMetadataOrBuilder
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOrBuilder.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOrBuilder.java
index 18c86f6bdb..fe599140c3 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOrBuilder.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 public interface PolicyOrBuilder
@@ -30,13 +29,10 @@ public interface PolicyOrBuilder
    * 
    * Immutable. The resource name of the `Policy`, which must be unique. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, requests can use the alphanumeric or the numeric ID.
    * Responses always contain the numeric ID.
@@ -54,13 +50,10 @@ public interface PolicyOrBuilder
    * 
    * Immutable. The resource name of the `Policy`, which must be unique. Format:
    * `policies/{attachment_point}/denypolicies/{policy_id}`
-   *
-   *
    * The attachment point is identified by its URL-encoded full resource name,
    * which means that the forward-slash character, `/`, must be written as
    * `%2F`. For example,
    * `policies/cloudresourcemanager.googleapis.com%2Fprojects%2Fmy-project/denypolicies/my-deny-policy`.
-   *
    * For organizations and folders, use the numeric ID in the full resource
    * name. For projects, requests can use the alphanumeric or the numeric ID.
    * Responses always contain the numeric ID.
@@ -204,6 +197,7 @@ public interface PolicyOrBuilder
    *
    * map<string, string> annotations = 5;
    */
+
   /* nullable */
   java.lang.String getAnnotationsOrDefault(
       java.lang.String key,
@@ -229,7 +223,6 @@ java.lang.String getAnnotationsOrDefault(
    * An opaque tag that identifies the current version of the `Policy`. IAM uses
    * this value to help manage concurrent updates, so they do not cause one
    * update to be overwritten by another.
-   *
    * If this field is present in a [CreatePolicy][] request, the value is
    * ignored.
    * 

@@ -247,7 +240,6 @@ java.lang.String getAnnotationsOrDefault(
    * An opaque tag that identifies the current version of the `Policy`. IAM uses
    * this value to help manage concurrent updates, so they do not cause one
    * update to be overwritten by another.
-   *
    * If this field is present in a [CreatePolicy][] request, the value is
    * ignored.
    * 

diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyProto.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyProto.java
index 645f0fc194..8b3b0e7685 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyProto.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 public final class PolicyProto {
@@ -127,22 +126,21 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\010Policies\022\217\001\n"
           + "\014ListPolicies\022&.google.iam.v2beta.ListPoliciesRe"
           + "quest\032\'.google.iam.v2beta.ListPoliciesRe"
-          + "sponse\".\332A\006parent\202\323\344\223\002\037\022\035/v2beta/{parent=policies/*/*}\022y\n"
+          + "sponse\".\202\323\344\223\002\037\022\035/v2beta/{parent=policies/*/*}\332A\006parent\022y\n"
           + "\tGetPolicy\022#.google.iam.v2beta.GetPolicyRequest\032\031.google.iam.v2"
-          + "beta.Policy\",\332A\004name\202\323\344\223\002\037\022\035/v2beta/{name=policies/*/*/*}\022\302\001\n"
-          + "\014CreatePolicy\022&.goo"
-          + "gle.iam.v2beta.CreatePolicyRequest\032\035.google.longrunning.Operation\"k\312A!\n"
-          + "\006Policy\022\027PolicyOperationMetadata\332A\027parent,policy,"
-          + "policy_id\202\323\344\223\002\'\"\035/v2beta/{parent=policies/*/*}:\006policy\022\257\001\n"
-          + "\014UpdatePolicy\022&.google"
-          + ".iam.v2beta.UpdatePolicyRequest\032\035.google.longrunning.Operation\"X\312A!\n"
-          + "\006Policy\022\027Pol"
-          + "icyOperationMetadata\202\323\344\223\002.\032$/v2beta/{policy.name=policies/*/*/*}:\006policy\022\247\001\n"
+          + "beta.Policy\",\202\323\344\223\002\037\022\035/v2beta/{name=policies/*/*/*}\332A\004name\022\302\001\n"
+          + "\014CreatePolicy\022&.google.iam.v2beta.CreatePolicyRequest\032\035.goo"
+          + "gle.longrunning.Operation\"k\202\323\344\223\002\'\"\035/v2be"
+          + "ta/{parent=policies/*/*}:\006policy\332A\027parent,policy,policy_id\312A!\n"
+          + "\006Policy\022\027PolicyOperationMetadata\022\257\001\n"
+          + "\014UpdatePolicy\022&.google.iam.v2beta.UpdatePolicyRequest\032\035.google"
+          + ".longrunning.Operation\"X\202\323\344\223\002.\032$/v2beta/{policy.name=policies/*/*/*}:\006policy\312A!\n"
+          + "\006Policy\022\027PolicyOperationMetadata\022\247\001\n"
           + "\014DeletePolicy\022&.google.iam.v2beta.DeletePoli"
-          + "cyRequest\032\035.google.longrunning.Operation\"P\312A!\n"
-          + "\006Policy\022\027PolicyOperationMetadata\332A"
-          + "\004name\202\323\344\223\002\037*\035/v2beta/{name=policies/*/*/"
-          + "*}\032F\312A\022iam.googleapis.com\322A.https://www.googleapis.com/auth/cloud-platformB\211\001\n"
+          + "cyRequest\032\035.google.longrunning.Operation"
+          + "\"P\202\323\344\223\002\037*\035/v2beta/{name=policies/*/*/*}\332A\004name\312A!\n"
+          + "\006Policy\022\027PolicyOperationMetada"
+          + "ta\032F\312A\022iam.googleapis.com\322A.https://www.googleapis.com/auth/cloud-platformB\211\001\n"
           + "\025com.google.iam.v2betaB\013PolicyProtoP\001Z-clo"
           + "ud.google.com/go/iam/apiv2beta/iampb;iam"
           + "pb\252\002\027Google.Cloud.Iam.V2Beta\312\002\027Google\\Cloud\\Iam\\V2betab\006proto3"
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyRule.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyRule.java
index efbc90141a..75d23f327a 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyRule.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyRule.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PolicyRule();
   }
 
+  @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.iam.v2beta.PolicyProto
         .internal_static_google_iam_v2beta_PolicyRule_descriptor;
@@ -64,8 +68,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   private int kindCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object kind_;
 
   public enum KindCase
@@ -165,9 +167,7 @@ public com.google.iam.v2beta.DenyRuleOrBuilder getDenyRuleOrBuilder() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object description_ = "";
+  private volatile java.lang.Object description_;
 
   /**
    *
@@ -439,11 +439,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (denyRuleBuilder_ != null) {
         denyRuleBuilder_.clear();
       }
       description_ = "";
+
       kindCase_ = 0;
       kind_ = null;
       return this;
@@ -472,29 +472,19 @@ public com.google.iam.v2beta.PolicyRule build() {
     @java.lang.Override
     public com.google.iam.v2beta.PolicyRule buildPartial() {
       com.google.iam.v2beta.PolicyRule result = new com.google.iam.v2beta.PolicyRule(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (kindCase_ == 2) {
+        if (denyRuleBuilder_ == null) {
+          result.kind_ = kind_;
+        } else {
+          result.kind_ = denyRuleBuilder_.build();
+        }
       }
-      buildPartialOneofs(result);
+      result.description_ = description_;
+      result.kindCase_ = kindCase_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v2beta.PolicyRule result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.description_ = description_;
-      }
-    }
-
-    private void buildPartialOneofs(com.google.iam.v2beta.PolicyRule result) {
-      result.kindCase_ = kindCase_;
-      result.kind_ = this.kind_;
-      if (kindCase_ == 2 && denyRuleBuilder_ != null) {
-        result.kind_ = denyRuleBuilder_.build();
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -542,7 +532,6 @@ public Builder mergeFrom(com.google.iam.v2beta.PolicyRule other) {
       if (other == com.google.iam.v2beta.PolicyRule.getDefaultInstance()) return this;
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       switch (other.getKindCase()) {
@@ -585,7 +574,7 @@ public Builder mergeFrom(
             case 10:
               {
                 description_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 10
             case 18:
@@ -625,8 +614,6 @@ public Builder clearKind() {
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.iam.v2beta.DenyRule,
             com.google.iam.v2beta.DenyRule.Builder,
@@ -837,6 +824,7 @@ public com.google.iam.v2beta.DenyRuleOrBuilder getDenyRuleOrBuilder() {
       }
       kindCase_ = 2;
       onChanged();
+      ;
       return denyRuleBuilder_;
     }
 
@@ -907,8 +895,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       description_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -926,8 +914,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
+
       description_ = getDefaultInstance().getDescription();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -950,8 +938,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       description_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyRuleOrBuilder.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyRuleOrBuilder.java
index fa2d84cb2a..9d7e1861bc 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyRuleOrBuilder.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyRuleOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 public interface PolicyRuleOrBuilder
@@ -89,5 +88,5 @@ public interface PolicyRuleOrBuilder
    */
   com.google.protobuf.ByteString getDescriptionBytes();
 
-  com.google.iam.v2beta.PolicyRule.KindCase getKindCase();
+  public com.google.iam.v2beta.PolicyRule.KindCase getKindCase();
 }
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/UpdatePolicyRequest.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/UpdatePolicyRequest.java
index 7075126cab..61beef8a21 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/UpdatePolicyRequest.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/UpdatePolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 /**
@@ -47,6 +46,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new UpdatePolicyRequest();
   }
 
+  @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.iam.v2beta.PolicyProto
         .internal_static_google_iam_v2beta_UpdatePolicyRequest_descriptor;
@@ -62,7 +66,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v2beta.UpdatePolicyRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int POLICY_FIELD_NUMBER = 1;
   private com.google.iam.v2beta.Policy policy_;
 
@@ -71,7 +74,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * Required. The policy to update.
-   *
    * To prevent conflicting updates, the `etag` value must match the value that
    * is stored in IAM. If the `etag` values do not match, the request fails with
    * a `409` error code and `ABORTED` status.
@@ -83,7 +85,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasPolicy() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return policy_ != null;
   }
 
   /**
@@ -91,7 +93,6 @@ public boolean hasPolicy() {
    *
    * 
    * Required. The policy to update.
-   *
    * To prevent conflicting updates, the `etag` value must match the value that
    * is stored in IAM. If the `etag` values do not match, the request fails with
    * a `409` error code and `ABORTED` status.
@@ -111,7 +112,6 @@ public com.google.iam.v2beta.Policy getPolicy() {
    *
    * 
    * Required. The policy to update.
-   *
    * To prevent conflicting updates, the `etag` value must match the value that
    * is stored in IAM. If the `etag` values do not match, the request fails with
    * a `409` error code and `ABORTED` status.
@@ -121,7 +121,7 @@ public com.google.iam.v2beta.Policy getPolicy() {
    */
   @java.lang.Override
   public com.google.iam.v2beta.PolicyOrBuilder getPolicyOrBuilder() {
-    return policy_ == null ? com.google.iam.v2beta.Policy.getDefaultInstance() : policy_;
+    return getPolicy();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -138,7 +138,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policy_ != null) {
       output.writeMessage(1, getPolicy());
     }
     getUnknownFields().writeTo(output);
@@ -150,7 +150,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policy_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getPolicy());
     }
     size += getUnknownFields().getSerializedSize();
@@ -318,28 +318,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2beta.UpdatePolicyRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPolicyFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      policy_ = null;
-      if (policyBuilder_ != null) {
-        policyBuilder_.dispose();
+      if (policyBuilder_ == null) {
+        policy_ = null;
+      } else {
+        policy_ = null;
         policyBuilder_ = null;
       }
       return this;
@@ -369,23 +360,15 @@ public com.google.iam.v2beta.UpdatePolicyRequest build() {
     public com.google.iam.v2beta.UpdatePolicyRequest buildPartial() {
       com.google.iam.v2beta.UpdatePolicyRequest result =
           new com.google.iam.v2beta.UpdatePolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (policyBuilder_ == null) {
+        result.policy_ = policy_;
+      } else {
+        result.policy_ = policyBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v2beta.UpdatePolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.policy_ = policyBuilder_ == null ? policy_ : policyBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -463,7 +446,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getPolicyFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -483,8 +466,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.iam.v2beta.Policy policy_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.iam.v2beta.Policy,
@@ -497,7 +478,6 @@ public Builder mergeFrom(
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
@@ -508,7 +488,7 @@ public Builder mergeFrom(
      * @return Whether the policy field is set.
      */
     public boolean hasPolicy() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return policyBuilder_ != null || policy_ != null;
     }
 
     /**
@@ -516,7 +496,6 @@ public boolean hasPolicy() {
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
@@ -539,7 +518,6 @@ public com.google.iam.v2beta.Policy getPolicy() {
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
@@ -553,11 +531,11 @@ public Builder setPolicy(com.google.iam.v2beta.Policy value) {
           throw new NullPointerException();
         }
         policy_ = value;
+        onChanged();
       } else {
         policyBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -566,7 +544,6 @@ public Builder setPolicy(com.google.iam.v2beta.Policy value) {
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
@@ -577,11 +554,11 @@ public Builder setPolicy(com.google.iam.v2beta.Policy value) {
     public Builder setPolicy(com.google.iam.v2beta.Policy.Builder builderForValue) {
       if (policyBuilder_ == null) {
         policy_ = builderForValue.build();
+        onChanged();
       } else {
         policyBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -590,7 +567,6 @@ public Builder setPolicy(com.google.iam.v2beta.Policy.Builder builderForValue) {
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
@@ -600,20 +576,17 @@ public Builder setPolicy(com.google.iam.v2beta.Policy.Builder builderForValue) {
      */
     public Builder mergePolicy(com.google.iam.v2beta.Policy value) {
       if (policyBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && policy_ != null
-            && policy_ != com.google.iam.v2beta.Policy.getDefaultInstance()) {
-          getPolicyBuilder().mergeFrom(value);
+        if (policy_ != null) {
+          policy_ =
+              com.google.iam.v2beta.Policy.newBuilder(policy_).mergeFrom(value).buildPartial();
         } else {
           policy_ = value;
         }
+        onChanged();
       } else {
         policyBuilder_.mergeFrom(value);
       }
-      if (policy_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -622,7 +595,6 @@ public Builder mergePolicy(com.google.iam.v2beta.Policy value) {
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
@@ -631,13 +603,14 @@ public Builder mergePolicy(com.google.iam.v2beta.Policy value) {
      * .google.iam.v2beta.Policy policy = 1 [(.google.api.field_behavior) = REQUIRED];
      */
     public Builder clearPolicy() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      policy_ = null;
-      if (policyBuilder_ != null) {
-        policyBuilder_.dispose();
+      if (policyBuilder_ == null) {
+        policy_ = null;
+        onChanged();
+      } else {
+        policy_ = null;
         policyBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -646,7 +619,6 @@ public Builder clearPolicy() {
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
@@ -655,7 +627,7 @@ public Builder clearPolicy() {
      * .google.iam.v2beta.Policy policy = 1 [(.google.api.field_behavior) = REQUIRED];
      */
     public com.google.iam.v2beta.Policy.Builder getPolicyBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getPolicyFieldBuilder().getBuilder();
     }
@@ -665,7 +637,6 @@ public com.google.iam.v2beta.Policy.Builder getPolicyBuilder() {
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
@@ -686,7 +657,6 @@ public com.google.iam.v2beta.PolicyOrBuilder getPolicyOrBuilder() {
      *
      * 
      * Required. The policy to update.
-     *
      * To prevent conflicting updates, the `etag` value must match the value that
      * is stored in IAM. If the `etag` values do not match, the request fails with
      * a `409` error code and `ABORTED` status.
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/UpdatePolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/UpdatePolicyRequestOrBuilder.java
index 27a22946ac..f06cf601be 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/UpdatePolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/UpdatePolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v2beta/policy.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v2beta;
 
 public interface UpdatePolicyRequestOrBuilder
@@ -29,7 +28,6 @@ public interface UpdatePolicyRequestOrBuilder
    *
    * 
    * Required. The policy to update.
-   *
    * To prevent conflicting updates, the `etag` value must match the value that
    * is stored in IAM. If the `etag` values do not match, the request fails with
    * a `409` error code and `ABORTED` status.
@@ -46,7 +44,6 @@ public interface UpdatePolicyRequestOrBuilder
    *
    * 
    * Required. The policy to update.
-   *
    * To prevent conflicting updates, the `etag` value must match the value that
    * is stored in IAM. If the `etag` values do not match, the request fails with
    * a `409` error code and `ABORTED` status.
@@ -63,7 +60,6 @@ public interface UpdatePolicyRequestOrBuilder
    *
    * 
    * Required. The policy to update.
-   *
    * To prevent conflicting updates, the `etag` value must match the value that
    * is stored in IAM. If the `etag` values do not match, the request fails with
    * a `409` error code and `ABORTED` status.
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePolicyBindingRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePolicyBindingRequest.java
index b7c3d97041..2c3f3eaca1 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePolicyBindingRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePolicyBindingRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CreatePolicyBindingRequest();
   }
 
+  @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.iam.v3.PolicyBindingsServiceProto
         .internal_static_google_iam_v3_CreatePolicyBindingRequest_descriptor;
@@ -65,11 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v3.CreatePolicyBindingRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int PARENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -78,9 +79,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * Required. The parent resource where this policy binding will be created.
    * The binding parent is the closest Resource Manager resource (project,
    * folder or organization) to the binding target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -113,9 +112,7 @@ public java.lang.String getParent() {
    * Required. The parent resource where this policy binding will be created.
    * The binding parent is the closest Resource Manager resource (project,
    * folder or organization) to the binding target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -142,9 +139,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int POLICY_BINDING_ID_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object policyBindingId_ = "";
+  private volatile java.lang.Object policyBindingId_;
 
   /**
    *
@@ -152,7 +147,6 @@ public com.google.protobuf.ByteString getParentBytes() {
    * 
    * Required. The ID to use for the policy binding, which will become the final
    * component of the policy binding's resource name.
-   *
    * This value must start with a lowercase letter followed by up to 62
    * lowercase letters, numbers, hyphens, or dots. Pattern,
    * /[a-z][a-z0-9-\.]{2,62}/.
@@ -181,7 +175,6 @@ public java.lang.String getPolicyBindingId() {
    * 
    * Required. The ID to use for the policy binding, which will become the final
    * component of the policy binding's resource name.
-   *
    * This value must start with a lowercase letter followed by up to 62
    * lowercase letters, numbers, hyphens, or dots. Pattern,
    * /[a-z][a-z0-9-\.]{2,62}/.
@@ -222,7 +215,7 @@ public com.google.protobuf.ByteString getPolicyBindingIdBytes() {
    */
   @java.lang.Override
   public boolean hasPolicyBinding() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return policyBinding_ != null;
   }
 
   /**
@@ -258,13 +251,11 @@ public com.google.iam.v3.PolicyBinding getPolicyBinding() {
    */
   @java.lang.Override
   public com.google.iam.v3.PolicyBindingOrBuilder getPolicyBindingOrBuilder() {
-    return policyBinding_ == null
-        ? com.google.iam.v3.PolicyBinding.getDefaultInstance()
-        : policyBinding_;
+    return getPolicyBinding();
   }
 
   public static final int VALIDATE_ONLY_FIELD_NUMBER = 4;
-  private boolean validateOnly_ = false;
+  private boolean validateOnly_;
 
   /**
    *
@@ -303,7 +294,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policyBindingId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, policyBindingId_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policyBinding_ != null) {
       output.writeMessage(3, getPolicyBinding());
     }
     if (validateOnly_ != false) {
@@ -324,7 +315,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policyBindingId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, policyBindingId_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policyBinding_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getPolicyBinding());
     }
     if (validateOnly_ != false) {
@@ -504,33 +495,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.CreatePolicyBindingRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPolicyBindingFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       parent_ = "";
+
       policyBindingId_ = "";
-      policyBinding_ = null;
-      if (policyBindingBuilder_ != null) {
-        policyBindingBuilder_.dispose();
+
+      if (policyBindingBuilder_ == null) {
+        policyBinding_ = null;
+      } else {
+        policyBinding_ = null;
         policyBindingBuilder_ = null;
       }
       validateOnly_ = false;
+
       return this;
     }
 
@@ -558,33 +543,18 @@ public com.google.iam.v3.CreatePolicyBindingRequest build() {
     public com.google.iam.v3.CreatePolicyBindingRequest buildPartial() {
       com.google.iam.v3.CreatePolicyBindingRequest result =
           new com.google.iam.v3.CreatePolicyBindingRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.parent_ = parent_;
+      result.policyBindingId_ = policyBindingId_;
+      if (policyBindingBuilder_ == null) {
+        result.policyBinding_ = policyBinding_;
+      } else {
+        result.policyBinding_ = policyBindingBuilder_.build();
       }
+      result.validateOnly_ = validateOnly_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v3.CreatePolicyBindingRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.parent_ = parent_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.policyBindingId_ = policyBindingId_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.policyBinding_ =
-            policyBindingBuilder_ == null ? policyBinding_ : policyBindingBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.validateOnly_ = validateOnly_;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -632,12 +602,10 @@ public Builder mergeFrom(com.google.iam.v3.CreatePolicyBindingRequest other) {
       if (other == com.google.iam.v3.CreatePolicyBindingRequest.getDefaultInstance()) return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getPolicyBindingId().isEmpty()) {
         policyBindingId_ = other.policyBindingId_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasPolicyBinding()) {
@@ -675,25 +643,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 policyBindingId_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getPolicyBindingFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 32:
               {
                 validateOnly_ = input.readBool();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             default:
@@ -713,8 +681,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object parent_ = "";
 
     /**
@@ -724,9 +690,7 @@ public Builder mergeFrom(
      * Required. The parent resource where this policy binding will be created.
      * The binding parent is the closest Resource Manager resource (project,
      * folder or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -758,9 +722,7 @@ public java.lang.String getParent() {
      * Required. The parent resource where this policy binding will be created.
      * The binding parent is the closest Resource Manager resource (project,
      * folder or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -792,9 +754,7 @@ public com.google.protobuf.ByteString getParentBytes() {
      * Required. The parent resource where this policy binding will be created.
      * The binding parent is the closest Resource Manager resource (project,
      * folder or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -812,8 +772,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -825,9 +785,7 @@ public Builder setParent(java.lang.String value) {
      * Required. The parent resource where this policy binding will be created.
      * The binding parent is the closest Resource Manager resource (project,
      * folder or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -841,8 +799,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -854,9 +812,7 @@ public Builder clearParent() {
      * Required. The parent resource where this policy binding will be created.
      * The binding parent is the closest Resource Manager resource (project,
      * folder or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -875,8 +831,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -889,7 +845,6 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * 
      * Required. The ID to use for the policy binding, which will become the final
      * component of the policy binding's resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -917,7 +872,6 @@ public java.lang.String getPolicyBindingId() {
      * 
      * Required. The ID to use for the policy binding, which will become the final
      * component of the policy binding's resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -945,7 +899,6 @@ public com.google.protobuf.ByteString getPolicyBindingIdBytes() {
      * 
      * Required. The ID to use for the policy binding, which will become the final
      * component of the policy binding's resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -960,8 +913,8 @@ public Builder setPolicyBindingId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       policyBindingId_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -972,7 +925,6 @@ public Builder setPolicyBindingId(java.lang.String value) {
      * 
      * Required. The ID to use for the policy binding, which will become the final
      * component of the policy binding's resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -983,8 +935,8 @@ public Builder setPolicyBindingId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPolicyBindingId() {
+
       policyBindingId_ = getDefaultInstance().getPolicyBindingId();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -995,7 +947,6 @@ public Builder clearPolicyBindingId() {
      * 
      * Required. The ID to use for the policy binding, which will become the final
      * component of the policy binding's resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -1011,8 +962,8 @@ public Builder setPolicyBindingIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       policyBindingId_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1038,7 +989,7 @@ public Builder setPolicyBindingIdBytes(com.google.protobuf.ByteString value) {
      * @return Whether the policyBinding field is set.
      */
     public boolean hasPolicyBinding() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return policyBindingBuilder_ != null || policyBinding_ != null;
     }
 
     /**
@@ -1081,11 +1032,11 @@ public Builder setPolicyBinding(com.google.iam.v3.PolicyBinding value) {
           throw new NullPointerException();
         }
         policyBinding_ = value;
+        onChanged();
       } else {
         policyBindingBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1103,11 +1054,11 @@ public Builder setPolicyBinding(com.google.iam.v3.PolicyBinding value) {
     public Builder setPolicyBinding(com.google.iam.v3.PolicyBinding.Builder builderForValue) {
       if (policyBindingBuilder_ == null) {
         policyBinding_ = builderForValue.build();
+        onChanged();
       } else {
         policyBindingBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1124,20 +1075,19 @@ public Builder setPolicyBinding(com.google.iam.v3.PolicyBinding.Builder builderF
      */
     public Builder mergePolicyBinding(com.google.iam.v3.PolicyBinding value) {
       if (policyBindingBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && policyBinding_ != null
-            && policyBinding_ != com.google.iam.v3.PolicyBinding.getDefaultInstance()) {
-          getPolicyBindingBuilder().mergeFrom(value);
+        if (policyBinding_ != null) {
+          policyBinding_ =
+              com.google.iam.v3.PolicyBinding.newBuilder(policyBinding_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           policyBinding_ = value;
         }
+        onChanged();
       } else {
         policyBindingBuilder_.mergeFrom(value);
       }
-      if (policyBinding_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1153,13 +1103,14 @@ public Builder mergePolicyBinding(com.google.iam.v3.PolicyBinding value) {
      * 
      */
     public Builder clearPolicyBinding() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      policyBinding_ = null;
-      if (policyBindingBuilder_ != null) {
-        policyBindingBuilder_.dispose();
+      if (policyBindingBuilder_ == null) {
+        policyBinding_ = null;
+        onChanged();
+      } else {
+        policyBinding_ = null;
         policyBindingBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1175,7 +1126,7 @@ public Builder clearPolicyBinding() {
      * 
      */
     public com.google.iam.v3.PolicyBinding.Builder getPolicyBindingBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getPolicyBindingFieldBuilder().getBuilder();
     }
@@ -1264,7 +1215,6 @@ public boolean getValidateOnly() {
     public Builder setValidateOnly(boolean value) {
 
       validateOnly_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1282,7 +1232,7 @@ public Builder setValidateOnly(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearValidateOnly() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       validateOnly_ = false;
       onChanged();
       return this;
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePolicyBindingRequestOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePolicyBindingRequestOrBuilder.java
index 9f175e250b..ce89ffe063 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePolicyBindingRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePolicyBindingRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface CreatePolicyBindingRequestOrBuilder
@@ -31,9 +30,7 @@ public interface CreatePolicyBindingRequestOrBuilder
    * Required. The parent resource where this policy binding will be created.
    * The binding parent is the closest Resource Manager resource (project,
    * folder or organization) to the binding target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -55,9 +52,7 @@ public interface CreatePolicyBindingRequestOrBuilder
    * Required. The parent resource where this policy binding will be created.
    * The binding parent is the closest Resource Manager resource (project,
    * folder or organization) to the binding target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -78,7 +73,6 @@ public interface CreatePolicyBindingRequestOrBuilder
    * 
    * Required. The ID to use for the policy binding, which will become the final
    * component of the policy binding's resource name.
-   *
    * This value must start with a lowercase letter followed by up to 62
    * lowercase letters, numbers, hyphens, or dots. Pattern,
    * /[a-z][a-z0-9-\.]{2,62}/.
@@ -96,7 +90,6 @@ public interface CreatePolicyBindingRequestOrBuilder
    * 
    * Required. The ID to use for the policy binding, which will become the final
    * component of the policy binding's resource name.
-   *
    * This value must start with a lowercase letter followed by up to 62
    * lowercase letters, numbers, hyphens, or dots. Pattern,
    * /[a-z][a-z0-9-\.]{2,62}/.
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePrincipalAccessBoundaryPolicyRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePrincipalAccessBoundaryPolicyRequest.java
index bfed095662..ae90c3ed40 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePrincipalAccessBoundaryPolicyRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePrincipalAccessBoundaryPolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CreatePrincipalAccessBoundaryPolicyRequest();
   }
 
+  @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.iam.v3.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3_CreatePrincipalAccessBoundaryPolicyRequest_descriptor;
@@ -67,11 +71,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v3.CreatePrincipalAccessBoundaryPolicyRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int PARENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -79,7 +80,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * Required. The parent resource where this principal access boundary policy
    * will be created. Only organizations are supported.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}`
    * 

@@ -109,7 +109,6 @@ public java.lang.String getParent() {
    * 
    * Required. The parent resource where this principal access boundary policy
    * will be created. Only organizations are supported.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}`
    * 

@@ -134,9 +133,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PRINCIPAL_ACCESS_BOUNDARY_POLICY_ID_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object principalAccessBoundaryPolicyId_ = "";
+  private volatile java.lang.Object principalAccessBoundaryPolicyId_;
 
   /**
    *
@@ -145,7 +142,6 @@ public com.google.protobuf.ByteString getParentBytes() {
    * Required. The ID to use for the principal access boundary policy, which
    * will become the final component of the principal access boundary policy's
    * resource name.
-   *
    * This value must start with a lowercase letter followed by up to 62
    * lowercase letters, numbers, hyphens, or dots. Pattern,
    * /[a-z][a-z0-9-\.]{2,62}/.
@@ -176,7 +172,6 @@ public java.lang.String getPrincipalAccessBoundaryPolicyId() {
    * Required. The ID to use for the principal access boundary policy, which
    * will become the final component of the principal access boundary policy's
    * resource name.
-   *
    * This value must start with a lowercase letter followed by up to 62
    * lowercase letters, numbers, hyphens, or dots. Pattern,
    * /[a-z][a-z0-9-\.]{2,62}/.
@@ -218,7 +213,7 @@ public com.google.protobuf.ByteString getPrincipalAccessBoundaryPolicyIdBytes()
    */
   @java.lang.Override
   public boolean hasPrincipalAccessBoundaryPolicy() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return principalAccessBoundaryPolicy_ != null;
   }
 
   /**
@@ -255,13 +250,11 @@ public com.google.iam.v3.PrincipalAccessBoundaryPolicy getPrincipalAccessBoundar
   @java.lang.Override
   public com.google.iam.v3.PrincipalAccessBoundaryPolicyOrBuilder
       getPrincipalAccessBoundaryPolicyOrBuilder() {
-    return principalAccessBoundaryPolicy_ == null
-        ? com.google.iam.v3.PrincipalAccessBoundaryPolicy.getDefaultInstance()
-        : principalAccessBoundaryPolicy_;
+    return getPrincipalAccessBoundaryPolicy();
   }
 
   public static final int VALIDATE_ONLY_FIELD_NUMBER = 4;
-  private boolean validateOnly_ = false;
+  private boolean validateOnly_;
 
   /**
    *
@@ -301,7 +294,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       com.google.protobuf.GeneratedMessageV3.writeString(
           output, 2, principalAccessBoundaryPolicyId_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (principalAccessBoundaryPolicy_ != null) {
       output.writeMessage(3, getPrincipalAccessBoundaryPolicy());
     }
     if (validateOnly_ != false) {
@@ -324,7 +317,7 @@ public int getSerializedSize() {
           com.google.protobuf.GeneratedMessageV3.computeStringSize(
               2, principalAccessBoundaryPolicyId_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (principalAccessBoundaryPolicy_ != null) {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               3, getPrincipalAccessBoundaryPolicy());
@@ -510,33 +503,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.CreatePrincipalAccessBoundaryPolicyRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPrincipalAccessBoundaryPolicyFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       parent_ = "";
+
       principalAccessBoundaryPolicyId_ = "";
-      principalAccessBoundaryPolicy_ = null;
-      if (principalAccessBoundaryPolicyBuilder_ != null) {
-        principalAccessBoundaryPolicyBuilder_.dispose();
+
+      if (principalAccessBoundaryPolicyBuilder_ == null) {
+        principalAccessBoundaryPolicy_ = null;
+      } else {
+        principalAccessBoundaryPolicy_ = null;
         principalAccessBoundaryPolicyBuilder_ = null;
       }
       validateOnly_ = false;
+
       return this;
     }
 
@@ -565,36 +552,18 @@ public com.google.iam.v3.CreatePrincipalAccessBoundaryPolicyRequest build() {
     public com.google.iam.v3.CreatePrincipalAccessBoundaryPolicyRequest buildPartial() {
       com.google.iam.v3.CreatePrincipalAccessBoundaryPolicyRequest result =
           new com.google.iam.v3.CreatePrincipalAccessBoundaryPolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.parent_ = parent_;
+      result.principalAccessBoundaryPolicyId_ = principalAccessBoundaryPolicyId_;
+      if (principalAccessBoundaryPolicyBuilder_ == null) {
+        result.principalAccessBoundaryPolicy_ = principalAccessBoundaryPolicy_;
+      } else {
+        result.principalAccessBoundaryPolicy_ = principalAccessBoundaryPolicyBuilder_.build();
       }
+      result.validateOnly_ = validateOnly_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(
-        com.google.iam.v3.CreatePrincipalAccessBoundaryPolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.parent_ = parent_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.principalAccessBoundaryPolicyId_ = principalAccessBoundaryPolicyId_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.principalAccessBoundaryPolicy_ =
-            principalAccessBoundaryPolicyBuilder_ == null
-                ? principalAccessBoundaryPolicy_
-                : principalAccessBoundaryPolicyBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.validateOnly_ = validateOnly_;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -644,12 +613,10 @@ public Builder mergeFrom(com.google.iam.v3.CreatePrincipalAccessBoundaryPolicyRe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getPrincipalAccessBoundaryPolicyId().isEmpty()) {
         principalAccessBoundaryPolicyId_ = other.principalAccessBoundaryPolicyId_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasPrincipalAccessBoundaryPolicy()) {
@@ -687,26 +654,26 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 principalAccessBoundaryPolicyId_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(
                     getPrincipalAccessBoundaryPolicyFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 32:
               {
                 validateOnly_ = input.readBool();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             default:
@@ -726,8 +693,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object parent_ = "";
 
     /**
@@ -736,7 +701,6 @@ public Builder mergeFrom(
      * 
      * Required. The parent resource where this principal access boundary policy
      * will be created. Only organizations are supported.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -765,7 +729,6 @@ public java.lang.String getParent() {
      * 
      * Required. The parent resource where this principal access boundary policy
      * will be created. Only organizations are supported.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -794,7 +757,6 @@ public com.google.protobuf.ByteString getParentBytes() {
      * 
      * Required. The parent resource where this principal access boundary policy
      * will be created. Only organizations are supported.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -810,8 +772,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -822,7 +784,6 @@ public Builder setParent(java.lang.String value) {
      * 
      * Required. The parent resource where this principal access boundary policy
      * will be created. Only organizations are supported.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -834,8 +795,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -846,7 +807,6 @@ public Builder clearParent() {
      * 
      * Required. The parent resource where this principal access boundary policy
      * will be created. Only organizations are supported.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -863,8 +823,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -878,7 +838,6 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * Required. The ID to use for the principal access boundary policy, which
      * will become the final component of the principal access boundary policy's
      * resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -909,7 +868,6 @@ public java.lang.String getPrincipalAccessBoundaryPolicyId() {
      * Required. The ID to use for the principal access boundary policy, which
      * will become the final component of the principal access boundary policy's
      * resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -940,7 +898,6 @@ public com.google.protobuf.ByteString getPrincipalAccessBoundaryPolicyIdBytes()
      * Required. The ID to use for the principal access boundary policy, which
      * will become the final component of the principal access boundary policy's
      * resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -957,8 +914,8 @@ public Builder setPrincipalAccessBoundaryPolicyId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       principalAccessBoundaryPolicyId_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -970,7 +927,6 @@ public Builder setPrincipalAccessBoundaryPolicyId(java.lang.String value) {
      * Required. The ID to use for the principal access boundary policy, which
      * will become the final component of the principal access boundary policy's
      * resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -983,8 +939,8 @@ public Builder setPrincipalAccessBoundaryPolicyId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPrincipalAccessBoundaryPolicyId() {
+
       principalAccessBoundaryPolicyId_ = getDefaultInstance().getPrincipalAccessBoundaryPolicyId();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -996,7 +952,6 @@ public Builder clearPrincipalAccessBoundaryPolicyId() {
      * Required. The ID to use for the principal access boundary policy, which
      * will become the final component of the principal access boundary policy's
      * resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -1014,8 +969,8 @@ public Builder setPrincipalAccessBoundaryPolicyIdBytes(com.google.protobuf.ByteS
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       principalAccessBoundaryPolicyId_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1041,7 +996,8 @@ public Builder setPrincipalAccessBoundaryPolicyIdBytes(com.google.protobuf.ByteS
      * @return Whether the principalAccessBoundaryPolicy field is set.
      */
     public boolean hasPrincipalAccessBoundaryPolicy() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return principalAccessBoundaryPolicyBuilder_ != null
+          || principalAccessBoundaryPolicy_ != null;
     }
 
     /**
@@ -1085,11 +1041,11 @@ public Builder setPrincipalAccessBoundaryPolicy(
           throw new NullPointerException();
         }
         principalAccessBoundaryPolicy_ = value;
+        onChanged();
       } else {
         principalAccessBoundaryPolicyBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1108,11 +1064,11 @@ public Builder setPrincipalAccessBoundaryPolicy(
         com.google.iam.v3.PrincipalAccessBoundaryPolicy.Builder builderForValue) {
       if (principalAccessBoundaryPolicyBuilder_ == null) {
         principalAccessBoundaryPolicy_ = builderForValue.build();
+        onChanged();
       } else {
         principalAccessBoundaryPolicyBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1130,21 +1086,20 @@ public Builder setPrincipalAccessBoundaryPolicy(
     public Builder mergePrincipalAccessBoundaryPolicy(
         com.google.iam.v3.PrincipalAccessBoundaryPolicy value) {
       if (principalAccessBoundaryPolicyBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && principalAccessBoundaryPolicy_ != null
-            && principalAccessBoundaryPolicy_
-                != com.google.iam.v3.PrincipalAccessBoundaryPolicy.getDefaultInstance()) {
-          getPrincipalAccessBoundaryPolicyBuilder().mergeFrom(value);
+        if (principalAccessBoundaryPolicy_ != null) {
+          principalAccessBoundaryPolicy_ =
+              com.google.iam.v3.PrincipalAccessBoundaryPolicy.newBuilder(
+                      principalAccessBoundaryPolicy_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           principalAccessBoundaryPolicy_ = value;
         }
+        onChanged();
       } else {
         principalAccessBoundaryPolicyBuilder_.mergeFrom(value);
       }
-      if (principalAccessBoundaryPolicy_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1160,13 +1115,14 @@ public Builder mergePrincipalAccessBoundaryPolicy(
      * 
      */
     public Builder clearPrincipalAccessBoundaryPolicy() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      principalAccessBoundaryPolicy_ = null;
-      if (principalAccessBoundaryPolicyBuilder_ != null) {
-        principalAccessBoundaryPolicyBuilder_.dispose();
+      if (principalAccessBoundaryPolicyBuilder_ == null) {
+        principalAccessBoundaryPolicy_ = null;
+        onChanged();
+      } else {
+        principalAccessBoundaryPolicy_ = null;
         principalAccessBoundaryPolicyBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1183,7 +1139,7 @@ public Builder clearPrincipalAccessBoundaryPolicy() {
      */
     public com.google.iam.v3.PrincipalAccessBoundaryPolicy.Builder
         getPrincipalAccessBoundaryPolicyBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getPrincipalAccessBoundaryPolicyFieldBuilder().getBuilder();
     }
@@ -1273,7 +1229,6 @@ public boolean getValidateOnly() {
     public Builder setValidateOnly(boolean value) {
 
       validateOnly_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1291,7 +1246,7 @@ public Builder setValidateOnly(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearValidateOnly() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       validateOnly_ = false;
       onChanged();
       return this;
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePrincipalAccessBoundaryPolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePrincipalAccessBoundaryPolicyRequestOrBuilder.java
index a8a4e21171..908e1a5499 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePrincipalAccessBoundaryPolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePrincipalAccessBoundaryPolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface CreatePrincipalAccessBoundaryPolicyRequestOrBuilder
@@ -30,7 +29,6 @@ public interface CreatePrincipalAccessBoundaryPolicyRequestOrBuilder
    * 
    * Required. The parent resource where this principal access boundary policy
    * will be created. Only organizations are supported.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}`
    * 

@@ -49,7 +47,6 @@ public interface CreatePrincipalAccessBoundaryPolicyRequestOrBuilder
    * 
    * Required. The parent resource where this principal access boundary policy
    * will be created. Only organizations are supported.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}`
    * 

@@ -69,7 +66,6 @@ public interface CreatePrincipalAccessBoundaryPolicyRequestOrBuilder
    * Required. The ID to use for the principal access boundary policy, which
    * will become the final component of the principal access boundary policy's
    * resource name.
-   *
    * This value must start with a lowercase letter followed by up to 62
    * lowercase letters, numbers, hyphens, or dots. Pattern,
    * /[a-z][a-z0-9-\.]{2,62}/.
@@ -89,7 +85,6 @@ public interface CreatePrincipalAccessBoundaryPolicyRequestOrBuilder
    * Required. The ID to use for the principal access boundary policy, which
    * will become the final component of the principal access boundary policy's
    * resource name.
-   *
    * This value must start with a lowercase letter followed by up to 62
    * lowercase letters, numbers, hyphens, or dots. Pattern,
    * /[a-z][a-z0-9-\.]{2,62}/.
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePolicyBindingRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePolicyBindingRequest.java
index 368c7d6b79..c0d9b2bb7d 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePolicyBindingRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePolicyBindingRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DeletePolicyBindingRequest();
   }
 
+  @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.iam.v3.PolicyBindingsServiceProto
         .internal_static_google_iam_v3_DeletePolicyBindingRequest_descriptor;
@@ -66,18 +70,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
    *
    * 
    * Required. The name of the policy binding to delete.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -108,9 +108,7 @@ public java.lang.String getName() {
    *
    * 
    * Required. The name of the policy binding to delete.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -137,9 +135,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int ETAG_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object etag_ = "";
+  private volatile java.lang.Object etag_;
 
   /**
    *
@@ -192,7 +188,7 @@ public com.google.protobuf.ByteString getEtagBytes() {
   }
 
   public static final int VALIDATE_ONLY_FIELD_NUMBER = 3;
-  private boolean validateOnly_ = false;
+  private boolean validateOnly_;
 
   /**
    *
@@ -427,10 +423,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       etag_ = "";
+
       validateOnly_ = false;
+
       return this;
     }
 
@@ -458,26 +456,13 @@ public com.google.iam.v3.DeletePolicyBindingRequest build() {
     public com.google.iam.v3.DeletePolicyBindingRequest buildPartial() {
       com.google.iam.v3.DeletePolicyBindingRequest result =
           new com.google.iam.v3.DeletePolicyBindingRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
+      result.etag_ = etag_;
+      result.validateOnly_ = validateOnly_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v3.DeletePolicyBindingRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.etag_ = etag_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.validateOnly_ = validateOnly_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -525,12 +510,10 @@ public Builder mergeFrom(com.google.iam.v3.DeletePolicyBindingRequest other) {
       if (other == com.google.iam.v3.DeletePolicyBindingRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getEtag().isEmpty()) {
         etag_ = other.etag_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getValidateOnly() != false) {
@@ -565,19 +548,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 etag_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 24:
               {
                 validateOnly_ = input.readBool();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             default:
@@ -597,8 +580,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -606,9 +587,7 @@ public Builder mergeFrom(
      *
      * 
      * Required. The name of the policy binding to delete.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -638,9 +617,7 @@ public java.lang.String getName() {
      *
      * 
      * Required. The name of the policy binding to delete.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -670,9 +647,7 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * 
      * Required. The name of the policy binding to delete.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -690,8 +665,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -701,9 +676,7 @@ public Builder setName(java.lang.String value) {
      *
      * 
      * Required. The name of the policy binding to delete.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -717,8 +690,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -728,9 +701,7 @@ public Builder clearName() {
      *
      * 
      * Required. The name of the policy binding to delete.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -749,8 +720,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -822,8 +793,8 @@ public Builder setEtag(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       etag_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -841,8 +812,8 @@ public Builder setEtag(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEtag() {
+
       etag_ = getDefaultInstance().getEtag();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -865,8 +836,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       etag_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -906,7 +877,6 @@ public boolean getValidateOnly() {
     public Builder setValidateOnly(boolean value) {
 
       validateOnly_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -924,7 +894,7 @@ public Builder setValidateOnly(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearValidateOnly() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       validateOnly_ = false;
       onChanged();
       return this;
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePolicyBindingRequestOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePolicyBindingRequestOrBuilder.java
index d6e9ee0d58..4d17ca98be 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePolicyBindingRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePolicyBindingRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface DeletePolicyBindingRequestOrBuilder
@@ -29,9 +28,7 @@ public interface DeletePolicyBindingRequestOrBuilder
    *
    * 
    * Required. The name of the policy binding to delete.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -51,9 +48,7 @@ public interface DeletePolicyBindingRequestOrBuilder
    *
    * 
    * Required. The name of the policy binding to delete.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePrincipalAccessBoundaryPolicyRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePrincipalAccessBoundaryPolicyRequest.java
index ee4ccfd005..f65428b556 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePrincipalAccessBoundaryPolicyRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePrincipalAccessBoundaryPolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DeletePrincipalAccessBoundaryPolicyRequest();
   }
 
+  @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.iam.v3.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3_DeletePrincipalAccessBoundaryPolicyRequest_descriptor;
@@ -68,16 +72,13 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
    *
    * 
    * Required. The name of the principal access boundary policy to delete.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
    * 

@@ -106,7 +107,6 @@ public java.lang.String getName() {
    *
    * 
    * Required. The name of the principal access boundary policy to delete.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
    * 

@@ -131,9 +131,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int ETAG_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object etag_ = "";
+  private volatile java.lang.Object etag_;
 
   /**
    *
@@ -186,7 +184,7 @@ public com.google.protobuf.ByteString getEtagBytes() {
   }
 
   public static final int VALIDATE_ONLY_FIELD_NUMBER = 3;
-  private boolean validateOnly_ = false;
+  private boolean validateOnly_;
 
   /**
    *
@@ -206,7 +204,7 @@ public boolean getValidateOnly() {
   }
 
   public static final int FORCE_FIELD_NUMBER = 4;
-  private boolean force_ = false;
+  private boolean force_;
 
   /**
    *
@@ -451,11 +449,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       etag_ = "";
+
       validateOnly_ = false;
+
       force_ = false;
+
       return this;
     }
 
@@ -484,30 +485,14 @@ public com.google.iam.v3.DeletePrincipalAccessBoundaryPolicyRequest build() {
     public com.google.iam.v3.DeletePrincipalAccessBoundaryPolicyRequest buildPartial() {
       com.google.iam.v3.DeletePrincipalAccessBoundaryPolicyRequest result =
           new com.google.iam.v3.DeletePrincipalAccessBoundaryPolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
+      result.etag_ = etag_;
+      result.validateOnly_ = validateOnly_;
+      result.force_ = force_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(
-        com.google.iam.v3.DeletePrincipalAccessBoundaryPolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.etag_ = etag_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.validateOnly_ = validateOnly_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.force_ = force_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -557,12 +542,10 @@ public Builder mergeFrom(com.google.iam.v3.DeletePrincipalAccessBoundaryPolicyRe
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getEtag().isEmpty()) {
         etag_ = other.etag_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getValidateOnly() != false) {
@@ -600,25 +583,25 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 etag_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 24:
               {
                 validateOnly_ = input.readBool();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 32:
               {
                 force_ = input.readBool();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             default:
@@ -638,8 +621,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -647,7 +628,6 @@ public Builder mergeFrom(
      *
      * 
      * Required. The name of the principal access boundary policy to delete.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -675,7 +655,6 @@ public java.lang.String getName() {
      *
      * 
      * Required. The name of the principal access boundary policy to delete.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -703,7 +682,6 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * 
      * Required. The name of the principal access boundary policy to delete.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -719,8 +697,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -730,7 +708,6 @@ public Builder setName(java.lang.String value) {
      *
      * 
      * Required. The name of the principal access boundary policy to delete.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -742,8 +719,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -753,7 +730,6 @@ public Builder clearName() {
      *
      * 
      * Required. The name of the principal access boundary policy to delete.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -770,8 +746,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -843,8 +819,8 @@ public Builder setEtag(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       etag_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -862,8 +838,8 @@ public Builder setEtag(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEtag() {
+
       etag_ = getDefaultInstance().getEtag();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -886,8 +862,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       etag_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -927,7 +903,6 @@ public boolean getValidateOnly() {
     public Builder setValidateOnly(boolean value) {
 
       validateOnly_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -945,7 +920,7 @@ public Builder setValidateOnly(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearValidateOnly() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       validateOnly_ = false;
       onChanged();
       return this;
@@ -986,7 +961,6 @@ public boolean getForce() {
     public Builder setForce(boolean value) {
 
       force_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1004,7 +978,7 @@ public Builder setForce(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearForce() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       force_ = false;
       onChanged();
       return this;
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePrincipalAccessBoundaryPolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePrincipalAccessBoundaryPolicyRequestOrBuilder.java
index 7d773ee01e..6df086434c 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePrincipalAccessBoundaryPolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePrincipalAccessBoundaryPolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface DeletePrincipalAccessBoundaryPolicyRequestOrBuilder
@@ -29,7 +28,6 @@ public interface DeletePrincipalAccessBoundaryPolicyRequestOrBuilder
    *
    * 
    * Required. The name of the principal access boundary policy to delete.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
    * 

@@ -47,7 +45,6 @@ public interface DeletePrincipalAccessBoundaryPolicyRequestOrBuilder
    *
    * 
    * Required. The name of the principal access boundary policy to delete.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
    * 

diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPolicyBindingRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPolicyBindingRequest.java
index 0a1ea2ee35..5cf9e9f3dd 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPolicyBindingRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPolicyBindingRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GetPolicyBindingRequest();
   }
 
+  @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.iam.v3.PolicyBindingsServiceProto
         .internal_static_google_iam_v3_GetPolicyBindingRequest_descriptor;
@@ -65,18 +69,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
    *
    * 
    * Required. The name of the policy binding to retrieve.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -107,9 +107,7 @@ public java.lang.String getName() {
    *
    * 
    * Required. The name of the policy binding to retrieve.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -333,8 +331,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -362,20 +360,11 @@ public com.google.iam.v3.GetPolicyBindingRequest build() {
     public com.google.iam.v3.GetPolicyBindingRequest buildPartial() {
       com.google.iam.v3.GetPolicyBindingRequest result =
           new com.google.iam.v3.GetPolicyBindingRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v3.GetPolicyBindingRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -423,7 +412,6 @@ public Builder mergeFrom(com.google.iam.v3.GetPolicyBindingRequest other) {
       if (other == com.google.iam.v3.GetPolicyBindingRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -455,7 +443,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -475,8 +463,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -484,9 +470,7 @@ public Builder mergeFrom(
      *
      * 
      * Required. The name of the policy binding to retrieve.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -516,9 +500,7 @@ public java.lang.String getName() {
      *
      * 
      * Required. The name of the policy binding to retrieve.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -548,9 +530,7 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * 
      * Required. The name of the policy binding to retrieve.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -568,8 +548,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -579,9 +559,7 @@ public Builder setName(java.lang.String value) {
      *
      * 
      * Required. The name of the policy binding to retrieve.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -595,8 +573,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -606,9 +584,7 @@ public Builder clearName() {
      *
      * 
      * Required. The name of the policy binding to retrieve.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -627,8 +603,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPolicyBindingRequestOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPolicyBindingRequestOrBuilder.java
index c1fb6d3571..6ff6364349 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPolicyBindingRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPolicyBindingRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface GetPolicyBindingRequestOrBuilder
@@ -29,9 +28,7 @@ public interface GetPolicyBindingRequestOrBuilder
    *
    * 
    * Required. The name of the policy binding to retrieve.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -51,9 +48,7 @@ public interface GetPolicyBindingRequestOrBuilder
    *
    * 
    * Required. The name of the policy binding to retrieve.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPrincipalAccessBoundaryPolicyRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPrincipalAccessBoundaryPolicyRequest.java
index aa62f9cf51..748d6f4fc3 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPrincipalAccessBoundaryPolicyRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPrincipalAccessBoundaryPolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GetPrincipalAccessBoundaryPolicyRequest();
   }
 
+  @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.iam.v3.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3_GetPrincipalAccessBoundaryPolicyRequest_descriptor;
@@ -67,16 +71,13 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
    *
    * 
    * Required. The name of the principal access boundary policy to retrieve.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
    * 

@@ -105,7 +106,6 @@ public java.lang.String getName() {
    *
    * 
    * Required. The name of the principal access boundary policy to retrieve.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
    * 

@@ -328,8 +328,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -357,20 +357,11 @@ public com.google.iam.v3.GetPrincipalAccessBoundaryPolicyRequest build() {
     public com.google.iam.v3.GetPrincipalAccessBoundaryPolicyRequest buildPartial() {
       com.google.iam.v3.GetPrincipalAccessBoundaryPolicyRequest result =
           new com.google.iam.v3.GetPrincipalAccessBoundaryPolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v3.GetPrincipalAccessBoundaryPolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -419,7 +410,6 @@ public Builder mergeFrom(com.google.iam.v3.GetPrincipalAccessBoundaryPolicyReque
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -451,7 +441,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -471,8 +461,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -480,7 +468,6 @@ public Builder mergeFrom(
      *
      * 
      * Required. The name of the principal access boundary policy to retrieve.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -508,7 +495,6 @@ public java.lang.String getName() {
      *
      * 
      * Required. The name of the principal access boundary policy to retrieve.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -536,7 +522,6 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * 
      * Required. The name of the principal access boundary policy to retrieve.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -552,8 +537,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -563,7 +548,6 @@ public Builder setName(java.lang.String value) {
      *
      * 
      * Required. The name of the principal access boundary policy to retrieve.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -575,8 +559,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -586,7 +570,6 @@ public Builder clearName() {
      *
      * 
      * Required. The name of the principal access boundary policy to retrieve.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -603,8 +586,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPrincipalAccessBoundaryPolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPrincipalAccessBoundaryPolicyRequestOrBuilder.java
index db1843bcbb..6768373dc5 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPrincipalAccessBoundaryPolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPrincipalAccessBoundaryPolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface GetPrincipalAccessBoundaryPolicyRequestOrBuilder
@@ -29,7 +28,6 @@ public interface GetPrincipalAccessBoundaryPolicyRequestOrBuilder
    *
    * 
    * Required. The name of the principal access boundary policy to retrieve.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
    * 

@@ -47,7 +45,6 @@ public interface GetPrincipalAccessBoundaryPolicyRequestOrBuilder
    *
    * 
    * Required. The name of the principal access boundary policy to retrieve.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
    * 

diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsRequest.java
index 1b12c8e556..9188e22830 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListPolicyBindingsRequest();
   }
 
+  @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.iam.v3.PolicyBindingsServiceProto
         .internal_static_google_iam_v3_ListPolicyBindingsRequest_descriptor;
@@ -67,9 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -77,9 +79,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * Required. The parent resource, which owns the collection of policy
    * bindings.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -111,9 +111,7 @@ public java.lang.String getParent() {
    * 
    * Required. The parent resource, which owns the collection of policy
    * bindings.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -140,7 +138,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -148,7 +146,6 @@ public com.google.protobuf.ByteString getParentBytes() {
    * 
    * Optional. The maximum number of policy bindings to return. The service may
    * return fewer than this value.
-   *
    * If unspecified, at most 50 policy bindings will be returned.
    * The maximum value is 1000; values above 1000 will be coerced to 1000.
    * 

@@ -163,9 +160,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -173,7 +168,6 @@ public int getPageSize() {
    * 
    * Optional. A page token, received from a previous `ListPolicyBindings` call.
    * Provide this to retrieve the subsequent page.
-   *
    * When paginating, all other parameters provided to `ListPolicyBindings` must
    * match the call that provided the page token.
    * 

@@ -201,7 +195,6 @@ public java.lang.String getPageToken() {
    * 
    * Optional. A page token, received from a previous `ListPolicyBindings` call.
    * Provide this to retrieve the subsequent page.
-   *
    * When paginating, all other parameters provided to `ListPolicyBindings` must
    * match the call that provided the page token.
    * 

@@ -224,9 +217,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object filter_ = "";
+  private volatile java.lang.Object filter_;
 
   /**
    *
@@ -234,12 +225,9 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
    * 
    * Optional. An expression for filtering the results of the request. Filter
    * rules are case insensitive. Some eligible fields for filtering are:
-   *
    * + `target`
    * + `policy`
-   *
    * Some examples of filter queries:
-   *
    * * `target:ex*`: The binding target's name starts with "ex".
    * * `target:example`: The binding target's name is `example`.
    * * `policy:example`: The binding policy's name is `example`.
@@ -268,12 +256,9 @@ public java.lang.String getFilter() {
    * 
    * Optional. An expression for filtering the results of the request. Filter
    * rules are case insensitive. Some eligible fields for filtering are:
-   *
    * + `target`
    * + `policy`
-   *
    * Some examples of filter queries:
-   *
    * * `target:ex*`: The binding target's name starts with "ex".
    * * `target:example`: The binding target's name is `example`.
    * * `policy:example`: The binding policy's name is `example`.
@@ -521,11 +506,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       parent_ = "";
+
       pageSize_ = 0;
+
       pageToken_ = "";
+
       filter_ = "";
+
       return this;
     }
 
@@ -553,29 +541,14 @@ public com.google.iam.v3.ListPolicyBindingsRequest build() {
     public com.google.iam.v3.ListPolicyBindingsRequest buildPartial() {
       com.google.iam.v3.ListPolicyBindingsRequest result =
           new com.google.iam.v3.ListPolicyBindingsRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.parent_ = parent_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
+      result.filter_ = filter_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v3.ListPolicyBindingsRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.parent_ = parent_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.filter_ = filter_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -623,7 +596,6 @@ public Builder mergeFrom(com.google.iam.v3.ListPolicyBindingsRequest other) {
       if (other == com.google.iam.v3.ListPolicyBindingsRequest.getDefaultInstance()) return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -631,12 +603,10 @@ public Builder mergeFrom(com.google.iam.v3.ListPolicyBindingsRequest other) {
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getFilter().isEmpty()) {
         filter_ = other.filter_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -668,25 +638,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 filter_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             default:
@@ -706,8 +676,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object parent_ = "";
 
     /**
@@ -716,9 +684,7 @@ public Builder mergeFrom(
      * 
      * Required. The parent resource, which owns the collection of policy
      * bindings.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -749,9 +715,7 @@ public java.lang.String getParent() {
      * 
      * Required. The parent resource, which owns the collection of policy
      * bindings.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -782,9 +746,7 @@ public com.google.protobuf.ByteString getParentBytes() {
      * 
      * Required. The parent resource, which owns the collection of policy
      * bindings.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -802,8 +764,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -814,9 +776,7 @@ public Builder setParent(java.lang.String value) {
      * 
      * Required. The parent resource, which owns the collection of policy
      * bindings.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -830,8 +790,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -842,9 +802,7 @@ public Builder clearParent() {
      * 
      * Required. The parent resource, which owns the collection of policy
      * bindings.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -863,8 +821,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -877,7 +835,6 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -897,7 +854,6 @@ public int getPageSize() {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -910,7 +866,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -921,7 +876,6 @@ public Builder setPageSize(int value) {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -931,7 +885,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -945,7 +899,6 @@ public Builder clearPageSize() {
      * 
      * Optional. A page token, received from a previous `ListPolicyBindings` call.
      * Provide this to retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to `ListPolicyBindings` must
      * match the call that provided the page token.
      * 

@@ -972,7 +925,6 @@ public java.lang.String getPageToken() {
      * 
      * Optional. A page token, received from a previous `ListPolicyBindings` call.
      * Provide this to retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to `ListPolicyBindings` must
      * match the call that provided the page token.
      * 

@@ -999,7 +951,6 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
      * 
      * Optional. A page token, received from a previous `ListPolicyBindings` call.
      * Provide this to retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to `ListPolicyBindings` must
      * match the call that provided the page token.
      * 

@@ -1013,8 +964,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1025,7 +976,6 @@ public Builder setPageToken(java.lang.String value) {
      * 
      * Optional. A page token, received from a previous `ListPolicyBindings` call.
      * Provide this to retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to `ListPolicyBindings` must
      * match the call that provided the page token.
      * 

@@ -1035,8 +985,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1047,7 +997,6 @@ public Builder clearPageToken() {
      * 
      * Optional. A page token, received from a previous `ListPolicyBindings` call.
      * Provide this to retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to `ListPolicyBindings` must
      * match the call that provided the page token.
      * 

@@ -1062,8 +1011,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1076,12 +1025,9 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
      * 
      * Optional. An expression for filtering the results of the request. Filter
      * rules are case insensitive. Some eligible fields for filtering are:
-     *
      * + `target`
      * + `policy`
-     *
      * Some examples of filter queries:
-     *
      * * `target:ex*`: The binding target's name starts with "ex".
      * * `target:example`: The binding target's name is `example`.
      * * `policy:example`: The binding policy's name is `example`.
@@ -1109,12 +1055,9 @@ public java.lang.String getFilter() {
      * 
      * Optional. An expression for filtering the results of the request. Filter
      * rules are case insensitive. Some eligible fields for filtering are:
-     *
      * + `target`
      * + `policy`
-     *
      * Some examples of filter queries:
-     *
      * * `target:ex*`: The binding target's name starts with "ex".
      * * `target:example`: The binding target's name is `example`.
      * * `policy:example`: The binding policy's name is `example`.
@@ -1142,12 +1085,9 @@ public com.google.protobuf.ByteString getFilterBytes() {
      * 
      * Optional. An expression for filtering the results of the request. Filter
      * rules are case insensitive. Some eligible fields for filtering are:
-     *
      * + `target`
      * + `policy`
-     *
      * Some examples of filter queries:
-     *
      * * `target:ex*`: The binding target's name starts with "ex".
      * * `target:example`: The binding target's name is `example`.
      * * `policy:example`: The binding policy's name is `example`.
@@ -1162,8 +1102,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       filter_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1174,12 +1114,9 @@ public Builder setFilter(java.lang.String value) {
      * 
      * Optional. An expression for filtering the results of the request. Filter
      * rules are case insensitive. Some eligible fields for filtering are:
-     *
      * + `target`
      * + `policy`
-     *
      * Some examples of filter queries:
-     *
      * * `target:ex*`: The binding target's name starts with "ex".
      * * `target:example`: The binding target's name is `example`.
      * * `policy:example`: The binding policy's name is `example`.
@@ -1190,8 +1127,8 @@ public Builder setFilter(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFilter() {
+
       filter_ = getDefaultInstance().getFilter();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1202,12 +1139,9 @@ public Builder clearFilter() {
      * 
      * Optional. An expression for filtering the results of the request. Filter
      * rules are case insensitive. Some eligible fields for filtering are:
-     *
      * + `target`
      * + `policy`
-     *
      * Some examples of filter queries:
-     *
      * * `target:ex*`: The binding target's name starts with "ex".
      * * `target:example`: The binding target's name is `example`.
      * * `policy:example`: The binding policy's name is `example`.
@@ -1223,8 +1157,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       filter_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsRequestOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsRequestOrBuilder.java
index 2482dfe7a6..7eb523756d 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface ListPolicyBindingsRequestOrBuilder
@@ -30,9 +29,7 @@ public interface ListPolicyBindingsRequestOrBuilder
    * 
    * Required. The parent resource, which owns the collection of policy
    * bindings.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -53,9 +50,7 @@ public interface ListPolicyBindingsRequestOrBuilder
    * 
    * Required. The parent resource, which owns the collection of policy
    * bindings.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -76,7 +71,6 @@ public interface ListPolicyBindingsRequestOrBuilder
    * 
    * Optional. The maximum number of policy bindings to return. The service may
    * return fewer than this value.
-   *
    * If unspecified, at most 50 policy bindings will be returned.
    * The maximum value is 1000; values above 1000 will be coerced to 1000.
    * 

@@ -93,7 +87,6 @@ public interface ListPolicyBindingsRequestOrBuilder
    * 
    * Optional. A page token, received from a previous `ListPolicyBindings` call.
    * Provide this to retrieve the subsequent page.
-   *
    * When paginating, all other parameters provided to `ListPolicyBindings` must
    * match the call that provided the page token.
    * 

@@ -110,7 +103,6 @@ public interface ListPolicyBindingsRequestOrBuilder
    * 
    * Optional. A page token, received from a previous `ListPolicyBindings` call.
    * Provide this to retrieve the subsequent page.
-   *
    * When paginating, all other parameters provided to `ListPolicyBindings` must
    * match the call that provided the page token.
    * 

@@ -127,12 +119,9 @@ public interface ListPolicyBindingsRequestOrBuilder
    * 
    * Optional. An expression for filtering the results of the request. Filter
    * rules are case insensitive. Some eligible fields for filtering are:
-   *
    * + `target`
    * + `policy`
-   *
    * Some examples of filter queries:
-   *
    * * `target:ex*`: The binding target's name starts with "ex".
    * * `target:example`: The binding target's name is `example`.
    * * `policy:example`: The binding policy's name is `example`.
@@ -150,12 +139,9 @@ public interface ListPolicyBindingsRequestOrBuilder
    * 
    * Optional. An expression for filtering the results of the request. Filter
    * rules are case insensitive. Some eligible fields for filtering are:
-   *
    * + `target`
    * + `policy`
-   *
    * Some examples of filter queries:
-   *
    * * `target:ex*`: The binding target's name starts with "ex".
    * * `target:example`: The binding target's name is `example`.
    * * `policy:example`: The binding policy's name is `example`.
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsResponse.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsResponse.java
index e1ab1a7079..4b142f5fca 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsResponse.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListPolicyBindingsResponse();
   }
 
+  @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.iam.v3.PolicyBindingsServiceProto
         .internal_static_google_iam_v3_ListPolicyBindingsResponse_descriptor;
@@ -66,8 +70,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int POLICY_BINDINGS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List policyBindings_;
 
   /**
@@ -142,9 +144,7 @@ public com.google.iam.v3.PolicyBindingOrBuilder getPolicyBindingsOrBuilder(int i
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -405,7 +405,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (policyBindingsBuilder_ == null) {
         policyBindings_ = java.util.Collections.emptyList();
       } else {
@@ -414,6 +413,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -441,15 +441,7 @@ public com.google.iam.v3.ListPolicyBindingsResponse build() {
     public com.google.iam.v3.ListPolicyBindingsResponse buildPartial() {
       com.google.iam.v3.ListPolicyBindingsResponse result =
           new com.google.iam.v3.ListPolicyBindingsResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.iam.v3.ListPolicyBindingsResponse result) {
+      int from_bitField0_ = bitField0_;
       if (policyBindingsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           policyBindings_ = java.util.Collections.unmodifiableList(policyBindings_);
@@ -459,13 +451,9 @@ private void buildPartialRepeatedFields(com.google.iam.v3.ListPolicyBindingsResp
       } else {
         result.policyBindings_ = policyBindingsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.iam.v3.ListPolicyBindingsResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -542,7 +530,6 @@ public Builder mergeFrom(com.google.iam.v3.ListPolicyBindingsResponse other) {
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -586,7 +573,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1043,8 +1030,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1062,8 +1049,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1086,8 +1073,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsResponseOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsResponseOrBuilder.java
index 86867052f5..4304c8a440 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsResponseOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface ListPolicyBindingsResponseOrBuilder
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesRequest.java
index bd511d1687..e4e2e000e5 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListPrincipalAccessBoundaryPoliciesRequest();
   }
 
+  @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.iam.v3.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3_ListPrincipalAccessBoundaryPoliciesRequest_descriptor;
@@ -68,9 +72,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -78,7 +80,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * Required. The parent resource, which owns the collection of principal
    * access boundary policies.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}`
    * 

@@ -108,7 +109,6 @@ public java.lang.String getParent() {
    * 
    * Required. The parent resource, which owns the collection of principal
    * access boundary policies.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}`
    * 

@@ -133,7 +133,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -141,7 +141,6 @@ public com.google.protobuf.ByteString getParentBytes() {
    * 
    * Optional. The maximum number of principal access boundary policies to
    * return. The service may return fewer than this value.
-   *
    * If unspecified, at most 50 principal access boundary policies will be
    * returned. The maximum value is 1000; values above 1000 will be coerced to
    * 1000.
@@ -157,9 +156,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -168,7 +165,6 @@ public int getPageSize() {
    * Optional. A page token, received from a previous
    * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
    * subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
    * page token.
@@ -198,7 +194,6 @@ public java.lang.String getPageToken() {
    * Optional. A page token, received from a previous
    * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
    * subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
    * page token.
@@ -438,10 +433,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       parent_ = "";
+
       pageSize_ = 0;
+
       pageToken_ = "";
+
       return this;
     }
 
@@ -470,27 +467,13 @@ public com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesRequest build() {
     public com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesRequest buildPartial() {
       com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesRequest result =
           new com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.parent_ = parent_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(
-        com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.parent_ = parent_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -540,7 +523,6 @@ public Builder mergeFrom(com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesRe
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -548,7 +530,6 @@ public Builder mergeFrom(com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesRe
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -580,19 +561,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -612,8 +593,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object parent_ = "";
 
     /**
@@ -622,7 +601,6 @@ public Builder mergeFrom(
      * 
      * Required. The parent resource, which owns the collection of principal
      * access boundary policies.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -651,7 +629,6 @@ public java.lang.String getParent() {
      * 
      * Required. The parent resource, which owns the collection of principal
      * access boundary policies.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -680,7 +657,6 @@ public com.google.protobuf.ByteString getParentBytes() {
      * 
      * Required. The parent resource, which owns the collection of principal
      * access boundary policies.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -696,8 +672,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -708,7 +684,6 @@ public Builder setParent(java.lang.String value) {
      * 
      * Required. The parent resource, which owns the collection of principal
      * access boundary policies.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -720,8 +695,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -732,7 +707,6 @@ public Builder clearParent() {
      * 
      * Required. The parent resource, which owns the collection of principal
      * access boundary policies.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -749,8 +723,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -763,7 +737,6 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * 
      * Optional. The maximum number of principal access boundary policies to
      * return. The service may return fewer than this value.
-     *
      * If unspecified, at most 50 principal access boundary policies will be
      * returned. The maximum value is 1000; values above 1000 will be coerced to
      * 1000.
@@ -784,7 +757,6 @@ public int getPageSize() {
      * 
      * Optional. The maximum number of principal access boundary policies to
      * return. The service may return fewer than this value.
-     *
      * If unspecified, at most 50 principal access boundary policies will be
      * returned. The maximum value is 1000; values above 1000 will be coerced to
      * 1000.
@@ -798,7 +770,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -809,7 +780,6 @@ public Builder setPageSize(int value) {
      * 
      * Optional. The maximum number of principal access boundary policies to
      * return. The service may return fewer than this value.
-     *
      * If unspecified, at most 50 principal access boundary policies will be
      * returned. The maximum value is 1000; values above 1000 will be coerced to
      * 1000.
@@ -820,7 +790,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -835,7 +805,6 @@ public Builder clearPageSize() {
      * Optional. A page token, received from a previous
      * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
      * page token.
@@ -864,7 +833,6 @@ public java.lang.String getPageToken() {
      * Optional. A page token, received from a previous
      * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
      * page token.
@@ -893,7 +861,6 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
      * Optional. A page token, received from a previous
      * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
      * page token.
@@ -908,8 +875,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -921,7 +888,6 @@ public Builder setPageToken(java.lang.String value) {
      * Optional. A page token, received from a previous
      * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
      * page token.
@@ -932,8 +898,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -945,7 +911,6 @@ public Builder clearPageToken() {
      * Optional. A page token, received from a previous
      * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
      * page token.
@@ -961,8 +926,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesRequestOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesRequestOrBuilder.java
index ecc8168d4b..48423ad263 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface ListPrincipalAccessBoundaryPoliciesRequestOrBuilder
@@ -30,7 +29,6 @@ public interface ListPrincipalAccessBoundaryPoliciesRequestOrBuilder
    * 
    * Required. The parent resource, which owns the collection of principal
    * access boundary policies.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}`
    * 

@@ -49,7 +47,6 @@ public interface ListPrincipalAccessBoundaryPoliciesRequestOrBuilder
    * 
    * Required. The parent resource, which owns the collection of principal
    * access boundary policies.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}`
    * 

@@ -68,7 +65,6 @@ public interface ListPrincipalAccessBoundaryPoliciesRequestOrBuilder
    * 
    * Optional. The maximum number of principal access boundary policies to
    * return. The service may return fewer than this value.
-   *
    * If unspecified, at most 50 principal access boundary policies will be
    * returned. The maximum value is 1000; values above 1000 will be coerced to
    * 1000.
@@ -87,7 +83,6 @@ public interface ListPrincipalAccessBoundaryPoliciesRequestOrBuilder
    * Optional. A page token, received from a previous
    * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
    * subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
    * page token.
@@ -106,7 +101,6 @@ public interface ListPrincipalAccessBoundaryPoliciesRequestOrBuilder
    * Optional. A page token, received from a previous
    * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
    * subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
    * page token.
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesResponse.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesResponse.java
index fb264ccd49..b502315fdf 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesResponse.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListPrincipalAccessBoundaryPoliciesResponse();
   }
 
+  @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.iam.v3.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3_ListPrincipalAccessBoundaryPoliciesResponse_descriptor;
@@ -68,8 +72,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PRINCIPAL_ACCESS_BOUNDARY_POLICIES_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List
       principalAccessBoundaryPolicies_;
 
@@ -158,9 +160,7 @@ public com.google.iam.v3.PrincipalAccessBoundaryPolicy getPrincipalAccessBoundar
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -425,7 +425,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (principalAccessBoundaryPoliciesBuilder_ == null) {
         principalAccessBoundaryPolicies_ = java.util.Collections.emptyList();
       } else {
@@ -434,6 +433,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -462,16 +462,7 @@ public com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesResponse build() {
     public com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesResponse buildPartial() {
       com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesResponse result =
           new com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(
-        com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesResponse result) {
+      int from_bitField0_ = bitField0_;
       if (principalAccessBoundaryPoliciesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           principalAccessBoundaryPolicies_ =
@@ -482,14 +473,9 @@ private void buildPartialRepeatedFields(
       } else {
         result.principalAccessBoundaryPolicies_ = principalAccessBoundaryPoliciesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(
-        com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -569,7 +555,6 @@ public Builder mergeFrom(com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesRe
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -615,7 +600,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1122,8 +1107,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1141,8 +1126,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1165,8 +1150,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesResponseOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesResponseOrBuilder.java
index 963167b0e3..ad0a32d15a 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesResponseOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface ListPrincipalAccessBoundaryPoliciesResponseOrBuilder
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/OperationMetadata.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/OperationMetadata.java
index 1c2216ff9b..c932b40873 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/OperationMetadata.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/OperationMetadata.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/operation_metadata.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new OperationMetadata();
   }
 
+  @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.iam.v3.OperationMetadataProto
         .internal_static_google_iam_v3_OperationMetadata_descriptor;
@@ -67,7 +71,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v3.OperationMetadata.Builder.class);
   }
 
-  private int bitField0_;
   public static final int CREATE_TIME_FIELD_NUMBER = 1;
   private com.google.protobuf.Timestamp createTime_;
 
@@ -85,7 +88,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return createTime_ != null;
   }
 
   /**
@@ -117,7 +120,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+    return getCreateTime();
   }
 
   public static final int END_TIME_FIELD_NUMBER = 2;
@@ -137,7 +140,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasEndTime() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return endTime_ != null;
   }
 
   /**
@@ -169,13 +172,11 @@ public com.google.protobuf.Timestamp getEndTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
-    return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_;
+    return getEndTime();
   }
 
   public static final int TARGET_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object target_ = "";
+  private volatile java.lang.Object target_;
 
   /**
    *
@@ -226,9 +227,7 @@ public com.google.protobuf.ByteString getTargetBytes() {
   }
 
   public static final int VERB_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object verb_ = "";
+  private volatile java.lang.Object verb_;
 
   /**
    *
@@ -279,9 +278,7 @@ public com.google.protobuf.ByteString getVerbBytes() {
   }
 
   public static final int STATUS_MESSAGE_FIELD_NUMBER = 5;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object statusMessage_ = "";
+  private volatile java.lang.Object statusMessage_;
 
   /**
    *
@@ -332,7 +329,7 @@ public com.google.protobuf.ByteString getStatusMessageBytes() {
   }
 
   public static final int REQUESTED_CANCELLATION_FIELD_NUMBER = 6;
-  private boolean requestedCancellation_ = false;
+  private boolean requestedCancellation_;
 
   /**
    *
@@ -355,9 +352,7 @@ public boolean getRequestedCancellation() {
   }
 
   public static final int API_VERSION_FIELD_NUMBER = 7;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object apiVersion_ = "";
+  private volatile java.lang.Object apiVersion_;
 
   /**
    *
@@ -421,10 +416,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       output.writeMessage(1, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (endTime_ != null) {
       output.writeMessage(2, getEndTime());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(target_)) {
@@ -451,10 +446,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (endTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getEndTime());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(target_)) {
@@ -658,41 +653,37 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.OperationMetadata.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCreateTimeFieldBuilder();
-        getEndTimeFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      endTime_ = null;
-      if (endTimeBuilder_ != null) {
-        endTimeBuilder_.dispose();
+      if (endTimeBuilder_ == null) {
+        endTime_ = null;
+      } else {
+        endTime_ = null;
         endTimeBuilder_ = null;
       }
       target_ = "";
+
       verb_ = "";
+
       statusMessage_ = "";
+
       requestedCancellation_ = false;
+
       apiVersion_ = "";
+
       return this;
     }
 
@@ -719,42 +710,25 @@ public com.google.iam.v3.OperationMetadata build() {
     @java.lang.Override
     public com.google.iam.v3.OperationMetadata buildPartial() {
       com.google.iam.v3.OperationMetadata result = new com.google.iam.v3.OperationMetadata(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (createTimeBuilder_ == null) {
+        result.createTime_ = createTime_;
+      } else {
+        result.createTime_ = createTimeBuilder_.build();
+      }
+      if (endTimeBuilder_ == null) {
+        result.endTime_ = endTime_;
+      } else {
+        result.endTime_ = endTimeBuilder_.build();
       }
+      result.target_ = target_;
+      result.verb_ = verb_;
+      result.statusMessage_ = statusMessage_;
+      result.requestedCancellation_ = requestedCancellation_;
+      result.apiVersion_ = apiVersion_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v3.OperationMetadata result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.target_ = target_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.verb_ = verb_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.statusMessage_ = statusMessage_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.requestedCancellation_ = requestedCancellation_;
-      }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.apiVersion_ = apiVersion_;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -808,17 +782,14 @@ public Builder mergeFrom(com.google.iam.v3.OperationMetadata other) {
       }
       if (!other.getTarget().isEmpty()) {
         target_ = other.target_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getVerb().isEmpty()) {
         verb_ = other.verb_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (!other.getStatusMessage().isEmpty()) {
         statusMessage_ = other.statusMessage_;
-        bitField0_ |= 0x00000010;
         onChanged();
       }
       if (other.getRequestedCancellation() != false) {
@@ -826,7 +797,6 @@ public Builder mergeFrom(com.google.iam.v3.OperationMetadata other) {
       }
       if (!other.getApiVersion().isEmpty()) {
         apiVersion_ = other.apiVersion_;
-        bitField0_ |= 0x00000040;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -858,43 +828,43 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 target_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 verb_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             case 42:
               {
                 statusMessage_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 42
             case 48:
               {
                 requestedCancellation_ = input.readBool();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 48
             case 58:
               {
                 apiVersion_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 58
             default:
@@ -914,8 +884,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.protobuf.Timestamp createTime_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.protobuf.Timestamp,
@@ -937,7 +905,7 @@ public Builder mergeFrom(
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return createTimeBuilder_ != null || createTime_ != null;
     }
 
     /**
@@ -980,11 +948,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -1002,11 +970,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -1023,20 +991,17 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && createTime_ != null
-            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getCreateTimeBuilder().mergeFrom(value);
+        if (createTime_ != null) {
+          createTime_ =
+              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
         } else {
           createTime_ = value;
         }
+        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-      if (createTime_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1052,13 +1017,14 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearCreateTime() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+        onChanged();
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1074,7 +1040,7 @@ public Builder clearCreateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -1148,7 +1114,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      * @return Whether the endTime field is set.
      */
     public boolean hasEndTime() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return endTimeBuilder_ != null || endTime_ != null;
     }
 
     /**
@@ -1187,11 +1153,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         endTime_ = value;
+        onChanged();
       } else {
         endTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -1208,11 +1174,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
     public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (endTimeBuilder_ == null) {
         endTime_ = builderForValue.build();
+        onChanged();
       } else {
         endTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -1228,20 +1194,17 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue)
      */
     public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
       if (endTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && endTime_ != null
-            && endTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getEndTimeBuilder().mergeFrom(value);
+        if (endTime_ != null) {
+          endTime_ =
+              com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial();
         } else {
           endTime_ = value;
         }
+        onChanged();
       } else {
         endTimeBuilder_.mergeFrom(value);
       }
-      if (endTime_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1256,13 +1219,14 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearEndTime() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      endTime_ = null;
-      if (endTimeBuilder_ != null) {
-        endTimeBuilder_.dispose();
+      if (endTimeBuilder_ == null) {
+        endTime_ = null;
+        onChanged();
+      } else {
+        endTime_ = null;
         endTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1277,7 +1241,7 @@ public Builder clearEndTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getEndTimeFieldBuilder().getBuilder();
     }
@@ -1391,8 +1355,8 @@ public Builder setTarget(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       target_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1409,8 +1373,8 @@ public Builder setTarget(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTarget() {
+
       target_ = getDefaultInstance().getTarget();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1432,8 +1396,8 @@ public Builder setTargetBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       target_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1502,8 +1466,8 @@ public Builder setVerb(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       verb_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1520,8 +1484,8 @@ public Builder setVerb(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearVerb() {
+
       verb_ = getDefaultInstance().getVerb();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1543,8 +1507,8 @@ public Builder setVerbBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       verb_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1613,8 +1577,8 @@ public Builder setStatusMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       statusMessage_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1631,8 +1595,8 @@ public Builder setStatusMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearStatusMessage() {
+
       statusMessage_ = getDefaultInstance().getStatusMessage();
-      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -1654,8 +1618,8 @@ public Builder setStatusMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       statusMessage_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1701,7 +1665,6 @@ public boolean getRequestedCancellation() {
     public Builder setRequestedCancellation(boolean value) {
 
       requestedCancellation_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1722,7 +1685,7 @@ public Builder setRequestedCancellation(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearRequestedCancellation() {
-      bitField0_ = (bitField0_ & ~0x00000020);
+
       requestedCancellation_ = false;
       onChanged();
       return this;
@@ -1792,8 +1755,8 @@ public Builder setApiVersion(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       apiVersion_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1810,8 +1773,8 @@ public Builder setApiVersion(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearApiVersion() {
+
       apiVersion_ = getDefaultInstance().getApiVersion();
-      bitField0_ = (bitField0_ & ~0x00000040);
       onChanged();
       return this;
     }
@@ -1833,8 +1796,8 @@ public Builder setApiVersionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       apiVersion_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/OperationMetadataOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/OperationMetadataOrBuilder.java
index 11f236220b..9346b9f46f 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/OperationMetadataOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/OperationMetadataOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/operation_metadata.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface OperationMetadataOrBuilder
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/OperationMetadataProto.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/OperationMetadataProto.java
index 4a7bd27f57..772474dc96 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/OperationMetadataProto.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/OperationMetadataProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/operation_metadata.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public final class OperationMetadataProto {
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBinding.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBinding.java
index f8543f5eb9..250dd956c3 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBinding.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBinding.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_binding_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -55,6 +54,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PolicyBinding();
   }
 
+  @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.iam.v3.PolicyBindingResourcesProto
         .internal_static_google_iam_v3_PolicyBinding_descriptor;
@@ -62,8 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 5:
         return internalGetAnnotations();
@@ -230,7 +233,6 @@ public interface TargetOrBuilder
      * bindings. The principal set must be directly parented by the policy
      * binding's parent or same as the parent if the target is a
      * project/folder/organization.
-     *
      * Examples:
      * * For binding's parented by an organization:
      *   * Organization:
@@ -264,7 +266,6 @@ public interface TargetOrBuilder
      * bindings. The principal set must be directly parented by the policy
      * binding's parent or same as the parent if the target is a
      * project/folder/organization.
-     *
      * Examples:
      * * For binding's parented by an organization:
      *   * Organization:
@@ -298,7 +299,6 @@ public interface TargetOrBuilder
      * bindings. The principal set must be directly parented by the policy
      * binding's parent or same as the parent if the target is a
      * project/folder/organization.
-     *
      * Examples:
      * * For binding's parented by an organization:
      *   * Organization:
@@ -324,7 +324,7 @@ public interface TargetOrBuilder
      */
     com.google.protobuf.ByteString getPrincipalSetBytes();
 
-    com.google.iam.v3.PolicyBinding.Target.TargetCase getTargetCase();
+    public com.google.iam.v3.PolicyBinding.Target.TargetCase getTargetCase();
   }
 
   /**
@@ -356,6 +356,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Target();
     }
 
+    @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.iam.v3.PolicyBindingResourcesProto
           .internal_static_google_iam_v3_PolicyBinding_Target_descriptor;
@@ -372,8 +377,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     private int targetCase_ = 0;
-
-    @SuppressWarnings("serial")
     private java.lang.Object target_;
 
     public enum TargetCase
@@ -428,7 +431,6 @@ public TargetCase getTargetCase() {
      * bindings. The principal set must be directly parented by the policy
      * binding's parent or same as the parent if the target is a
      * project/folder/organization.
-     *
      * Examples:
      * * For binding's parented by an organization:
      *   * Organization:
@@ -464,7 +466,6 @@ public boolean hasPrincipalSet() {
      * bindings. The principal set must be directly parented by the policy
      * binding's parent or same as the parent if the target is a
      * project/folder/organization.
-     *
      * Examples:
      * * For binding's parented by an organization:
      *   * Organization:
@@ -513,7 +514,6 @@ public java.lang.String getPrincipalSet() {
      * bindings. The principal set must be directly parented by the policy
      * binding's parent or same as the parent if the target is a
      * project/folder/organization.
-     *
      * Examples:
      * * For binding's parented by an organization:
      *   * Organization:
@@ -767,7 +767,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         targetCase_ = 0;
         target_ = null;
         return this;
@@ -797,23 +796,14 @@ public com.google.iam.v3.PolicyBinding.Target build() {
       public com.google.iam.v3.PolicyBinding.Target buildPartial() {
         com.google.iam.v3.PolicyBinding.Target result =
             new com.google.iam.v3.PolicyBinding.Target(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        if (targetCase_ == 1) {
+          result.target_ = target_;
         }
-        buildPartialOneofs(result);
+        result.targetCase_ = targetCase_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.iam.v3.PolicyBinding.Target result) {
-        int from_bitField0_ = bitField0_;
-      }
-
-      private void buildPartialOneofs(com.google.iam.v3.PolicyBinding.Target result) {
-        result.targetCase_ = targetCase_;
-        result.target_ = this.target_;
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -938,8 +928,6 @@ public Builder clearTarget() {
         return this;
       }
 
-      private int bitField0_;
-
       /**
        *
        *
@@ -948,7 +936,6 @@ public Builder clearTarget() {
        * bindings. The principal set must be directly parented by the policy
        * binding's parent or same as the parent if the target is a
        * project/folder/organization.
-       *
        * Examples:
        * * For binding's parented by an organization:
        *   * Organization:
@@ -985,7 +972,6 @@ public boolean hasPrincipalSet() {
        * bindings. The principal set must be directly parented by the policy
        * binding's parent or same as the parent if the target is a
        * project/folder/organization.
-       *
        * Examples:
        * * For binding's parented by an organization:
        *   * Organization:
@@ -1035,7 +1021,6 @@ public java.lang.String getPrincipalSet() {
        * bindings. The principal set must be directly parented by the policy
        * binding's parent or same as the parent if the target is a
        * project/folder/organization.
-       *
        * Examples:
        * * For binding's parented by an organization:
        *   * Organization:
@@ -1085,7 +1070,6 @@ public com.google.protobuf.ByteString getPrincipalSetBytes() {
        * bindings. The principal set must be directly parented by the policy
        * binding's parent or same as the parent if the target is a
        * project/folder/organization.
-       *
        * Examples:
        * * For binding's parented by an organization:
        *   * Organization:
@@ -1128,7 +1112,6 @@ public Builder setPrincipalSet(java.lang.String value) {
        * bindings. The principal set must be directly parented by the policy
        * binding's parent or same as the parent if the target is a
        * project/folder/organization.
-       *
        * Examples:
        * * For binding's parented by an organization:
        *   * Organization:
@@ -1169,7 +1152,6 @@ public Builder clearPrincipalSet() {
        * bindings. The principal set must be directly parented by the policy
        * binding's parent or same as the parent if the target is a
        * project/folder/organization.
-       *
        * Examples:
        * * For binding's parented by an organization:
        *   * Organization:
@@ -1269,11 +1251,8 @@ public com.google.iam.v3.PolicyBinding.Target getDefaultInstanceForType() {
     }
   }
 
-  private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -1283,9 +1262,7 @@ public com.google.iam.v3.PolicyBinding.Target getDefaultInstanceForType() {
    * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
    * The binding parent is the closest Resource Manager resource (project,
    * folder, or organization) to the binding target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -1317,9 +1294,7 @@ public java.lang.String getName() {
    * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
    * The binding parent is the closest Resource Manager resource (project,
    * folder, or organization) to the binding target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -1344,9 +1319,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int UID_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object uid_ = "";
+  private volatile java.lang.Object uid_;
 
   /**
    *
@@ -1403,9 +1376,7 @@ public com.google.protobuf.ByteString getUidBytes() {
   }
 
   public static final int ETAG_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object etag_ = "";
+  private volatile java.lang.Object etag_;
 
   /**
    *
@@ -1458,9 +1429,7 @@ public com.google.protobuf.ByteString getEtagBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object displayName_ = "";
+  private volatile java.lang.Object displayName_;
 
   /**
    *
@@ -1525,7 +1494,6 @@ private static final class AnnotationsDefaultEntryHolder {
             "");
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField annotations_;
 
   private com.google.protobuf.MapField
@@ -1597,10 +1565,8 @@ public java.util.Map getAnnotationsMap() {
    * 
    */
   @java.lang.Override
-  public /* nullable */ java.lang.String getAnnotationsOrDefault(
-      java.lang.String key,
-      /* nullable */
-      java.lang.String defaultValue) {
+  public java.lang.String getAnnotationsOrDefault(
+      java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -1651,7 +1617,7 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
    */
   @java.lang.Override
   public boolean hasTarget() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return target_ != null;
   }
 
   /**
@@ -1687,11 +1653,11 @@ public com.google.iam.v3.PolicyBinding.Target getTarget() {
    */
   @java.lang.Override
   public com.google.iam.v3.PolicyBinding.TargetOrBuilder getTargetOrBuilder() {
-    return target_ == null ? com.google.iam.v3.PolicyBinding.Target.getDefaultInstance() : target_;
+    return getTarget();
   }
 
   public static final int POLICY_KIND_FIELD_NUMBER = 11;
-  private int policyKind_ = 0;
+  private int policyKind_;
 
   /**
    *
@@ -1699,7 +1665,6 @@ public com.google.iam.v3.PolicyBinding.TargetOrBuilder getTargetOrBuilder() {
    * 
    * Immutable. The kind of the policy to attach in this binding. This field
    * must be one of the following:
-   *
    * - Left empty (will be automatically set to the policy kind)
    * - The input policy kind
    * 

@@ -1721,7 +1686,6 @@ public int getPolicyKindValue() {
    * 
    * Immutable. The kind of the policy to attach in this binding. This field
    * must be one of the following:
-   *
    * - Left empty (will be automatically set to the policy kind)
    * - The input policy kind
    * 

@@ -1734,15 +1698,14 @@ public int getPolicyKindValue() {
    */
   @java.lang.Override
   public com.google.iam.v3.PolicyBinding.PolicyKind getPolicyKind() {
+    @SuppressWarnings("deprecation")
     com.google.iam.v3.PolicyBinding.PolicyKind result =
-        com.google.iam.v3.PolicyBinding.PolicyKind.forNumber(policyKind_);
+        com.google.iam.v3.PolicyBinding.PolicyKind.valueOf(policyKind_);
     return result == null ? com.google.iam.v3.PolicyBinding.PolicyKind.UNRECOGNIZED : result;
   }
 
   public static final int POLICY_FIELD_NUMBER = 7;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object policy_ = "";
+  private volatile java.lang.Object policy_;
 
   /**
    *
@@ -1799,9 +1762,7 @@ public com.google.protobuf.ByteString getPolicyBytes() {
   }
 
   public static final int POLICY_UID_FIELD_NUMBER = 12;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object policyUid_ = "";
+  private volatile java.lang.Object policyUid_;
 
   /**
    *
@@ -1863,33 +1824,25 @@ public com.google.protobuf.ByteString getPolicyUidBytes() {
    * joined by the
    * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
    * cannot contain more than 250 characters.
-   *
    * The condition is currently only supported when bound to policies of kind
    * principal access boundary.
-   *
    * When the bound policy is a principal access boundary policy, the only
    * supported attributes in any subexpression are `principal.type` and
    * `principal.subject`. An example expression is: "principal.type ==
    * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
    * 'bob@example.com'".
-   *
    * Allowed operations for `principal.subject`:
-   *
    * - `principal.subject == <principal subject string>`
    * - `principal.subject != <principal subject string>`
    * - `principal.subject in [<list of principal subjects>]`
    * - `principal.subject.startsWith(<string>)`
    * - `principal.subject.endsWith(<string>)`
-   *
    * Allowed operations for `principal.type`:
-   *
    * - `principal.type == <principal type string>`
    * - `principal.type != <principal type string>`
    * - `principal.type in [<list of principal types>]`
-   *
    * Supported principal types are Workspace, Workforce Pool, Workload Pool and
    * Service Account. Allowed string must be one of:
-   *
    * - iam.googleapis.com/WorkspaceIdentity
    * - iam.googleapis.com/WorkforcePoolIdentity
    * - iam.googleapis.com/WorkloadPoolIdentity
@@ -1902,7 +1855,7 @@ public com.google.protobuf.ByteString getPolicyUidBytes() {
    */
   @java.lang.Override
   public boolean hasCondition() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return condition_ != null;
   }
 
   /**
@@ -1914,33 +1867,25 @@ public boolean hasCondition() {
    * joined by the
    * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
    * cannot contain more than 250 characters.
-   *
    * The condition is currently only supported when bound to policies of kind
    * principal access boundary.
-   *
    * When the bound policy is a principal access boundary policy, the only
    * supported attributes in any subexpression are `principal.type` and
    * `principal.subject`. An example expression is: "principal.type ==
    * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
    * 'bob@example.com'".
-   *
    * Allowed operations for `principal.subject`:
-   *
    * - `principal.subject == <principal subject string>`
    * - `principal.subject != <principal subject string>`
    * - `principal.subject in [<list of principal subjects>]`
    * - `principal.subject.startsWith(<string>)`
    * - `principal.subject.endsWith(<string>)`
-   *
    * Allowed operations for `principal.type`:
-   *
    * - `principal.type == <principal type string>`
    * - `principal.type != <principal type string>`
    * - `principal.type in [<list of principal types>]`
-   *
    * Supported principal types are Workspace, Workforce Pool, Workload Pool and
    * Service Account. Allowed string must be one of:
-   *
    * - iam.googleapis.com/WorkspaceIdentity
    * - iam.googleapis.com/WorkforcePoolIdentity
    * - iam.googleapis.com/WorkloadPoolIdentity
@@ -1965,33 +1910,25 @@ public com.google.type.Expr getCondition() {
    * joined by the
    * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
    * cannot contain more than 250 characters.
-   *
    * The condition is currently only supported when bound to policies of kind
    * principal access boundary.
-   *
    * When the bound policy is a principal access boundary policy, the only
    * supported attributes in any subexpression are `principal.type` and
    * `principal.subject`. An example expression is: "principal.type ==
    * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
    * 'bob@example.com'".
-   *
    * Allowed operations for `principal.subject`:
-   *
    * - `principal.subject == <principal subject string>`
    * - `principal.subject != <principal subject string>`
    * - `principal.subject in [<list of principal subjects>]`
    * - `principal.subject.startsWith(<string>)`
    * - `principal.subject.endsWith(<string>)`
-   *
    * Allowed operations for `principal.type`:
-   *
    * - `principal.type == <principal type string>`
    * - `principal.type != <principal type string>`
    * - `principal.type in [<list of principal types>]`
-   *
    * Supported principal types are Workspace, Workforce Pool, Workload Pool and
    * Service Account. Allowed string must be one of:
-   *
    * - iam.googleapis.com/WorkspaceIdentity
    * - iam.googleapis.com/WorkforcePoolIdentity
    * - iam.googleapis.com/WorkloadPoolIdentity
@@ -2002,7 +1939,7 @@ public com.google.type.Expr getCondition() {
    */
   @java.lang.Override
   public com.google.type.ExprOrBuilder getConditionOrBuilder() {
-    return condition_ == null ? com.google.type.Expr.getDefaultInstance() : condition_;
+    return getCondition();
   }
 
   public static final int CREATE_TIME_FIELD_NUMBER = 9;
@@ -2022,7 +1959,7 @@ public com.google.type.ExprOrBuilder getConditionOrBuilder() {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return createTime_ != null;
   }
 
   /**
@@ -2054,7 +1991,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+    return getCreateTime();
   }
 
   public static final int UPDATE_TIME_FIELD_NUMBER = 10;
@@ -2074,7 +2011,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateTime() {
-    return ((bitField0_ & 0x00000008) != 0);
+    return updateTime_ != null;
   }
 
   /**
@@ -2106,7 +2043,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+    return getUpdateTime();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -2137,19 +2074,19 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
         output, internalGetAnnotations(), AnnotationsDefaultEntryHolder.defaultEntry, 5);
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (target_ != null) {
       output.writeMessage(6, getTarget());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policy_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 7, policy_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (condition_ != null) {
       output.writeMessage(8, getCondition());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (createTime_ != null) {
       output.writeMessage(9, getCreateTime());
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (updateTime_ != null) {
       output.writeMessage(10, getUpdateTime());
     }
     if (policyKind_
@@ -2190,19 +2127,19 @@ public int getSerializedSize() {
               .build();
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, annotations__);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (target_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getTarget());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policy_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, policy_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (condition_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getCondition());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (createTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getCreateTime());
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (updateTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getUpdateTime());
     }
     if (policyKind_
@@ -2415,8 +2352,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 5:
           return internalGetAnnotations();
@@ -2426,8 +2362,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 5:
           return internalGetMutableAnnotations();
@@ -2446,54 +2381,52 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     }
 
     // Construct using com.google.iam.v3.PolicyBinding.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getTargetFieldBuilder();
-        getConditionFieldBuilder();
-        getCreateTimeFieldBuilder();
-        getUpdateTimeFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       uid_ = "";
+
       etag_ = "";
+
       displayName_ = "";
+
       internalGetMutableAnnotations().clear();
-      target_ = null;
-      if (targetBuilder_ != null) {
-        targetBuilder_.dispose();
+      if (targetBuilder_ == null) {
+        target_ = null;
+      } else {
+        target_ = null;
         targetBuilder_ = null;
       }
       policyKind_ = 0;
+
       policy_ = "";
+
       policyUid_ = "";
-      condition_ = null;
-      if (conditionBuilder_ != null) {
-        conditionBuilder_.dispose();
+
+      if (conditionBuilder_ == null) {
+        condition_ = null;
+      } else {
+        condition_ = null;
         conditionBuilder_ = null;
       }
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
       return this;
@@ -2522,58 +2455,38 @@ public com.google.iam.v3.PolicyBinding build() {
     @java.lang.Override
     public com.google.iam.v3.PolicyBinding buildPartial() {
       com.google.iam.v3.PolicyBinding result = new com.google.iam.v3.PolicyBinding(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.iam.v3.PolicyBinding result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.uid_ = uid_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.etag_ = etag_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.displayName_ = displayName_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.annotations_ = internalGetAnnotations();
-        result.annotations_.makeImmutable();
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.target_ = targetBuilder_ == null ? target_ : targetBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.policyKind_ = policyKind_;
-      }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.policy_ = policy_;
-      }
-      if (((from_bitField0_ & 0x00000100) != 0)) {
-        result.policyUid_ = policyUid_;
+      result.name_ = name_;
+      result.uid_ = uid_;
+      result.etag_ = etag_;
+      result.displayName_ = displayName_;
+      result.annotations_ = internalGetAnnotations();
+      result.annotations_.makeImmutable();
+      if (targetBuilder_ == null) {
+        result.target_ = target_;
+      } else {
+        result.target_ = targetBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000200) != 0)) {
-        result.condition_ = conditionBuilder_ == null ? condition_ : conditionBuilder_.build();
-        to_bitField0_ |= 0x00000002;
+      result.policyKind_ = policyKind_;
+      result.policy_ = policy_;
+      result.policyUid_ = policyUid_;
+      if (conditionBuilder_ == null) {
+        result.condition_ = condition_;
+      } else {
+        result.condition_ = conditionBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000400) != 0)) {
-        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
-        to_bitField0_ |= 0x00000004;
+      if (createTimeBuilder_ == null) {
+        result.createTime_ = createTime_;
+      } else {
+        result.createTime_ = createTimeBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000800) != 0)) {
-        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
-        to_bitField0_ |= 0x00000008;
+      if (updateTimeBuilder_ == null) {
+        result.updateTime_ = updateTime_;
+      } else {
+        result.updateTime_ = updateTimeBuilder_.build();
       }
-      result.bitField0_ |= to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -2623,26 +2536,21 @@ public Builder mergeFrom(com.google.iam.v3.PolicyBinding other) {
       if (other == com.google.iam.v3.PolicyBinding.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getUid().isEmpty()) {
         uid_ = other.uid_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getEtag().isEmpty()) {
         etag_ = other.etag_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       internalGetMutableAnnotations().mergeFrom(other.internalGetAnnotations());
-      bitField0_ |= 0x00000010;
       if (other.hasTarget()) {
         mergeTarget(other.getTarget());
       }
@@ -2651,12 +2559,10 @@ public Builder mergeFrom(com.google.iam.v3.PolicyBinding other) {
       }
       if (!other.getPolicy().isEmpty()) {
         policy_ = other.policy_;
-        bitField0_ |= 0x00000080;
         onChanged();
       }
       if (!other.getPolicyUid().isEmpty()) {
         policyUid_ = other.policyUid_;
-        bitField0_ |= 0x00000100;
         onChanged();
       }
       if (other.hasCondition()) {
@@ -2697,25 +2603,25 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 uid_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 etag_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 displayName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             case 42:
@@ -2727,49 +2633,48 @@ public Builder mergeFrom(
                 internalGetMutableAnnotations()
                     .getMutableMap()
                     .put(annotations__.getKey(), annotations__.getValue());
-                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 50:
               {
                 input.readMessage(getTargetFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 50
             case 58:
               {
                 policy_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 58
             case 66:
               {
                 input.readMessage(getConditionFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000200;
+
                 break;
               } // case 66
             case 74:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000400;
+
                 break;
               } // case 74
             case 82:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000800;
+
                 break;
               } // case 82
             case 88:
               {
                 policyKind_ = input.readEnum();
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 88
             case 98:
               {
                 policyUid_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000100;
+
                 break;
               } // case 98
             default:
@@ -2801,9 +2706,7 @@ public Builder mergeFrom(
      * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
      * The binding parent is the closest Resource Manager resource (project,
      * folder, or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -2834,9 +2737,7 @@ public java.lang.String getName() {
      * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
      * The binding parent is the closest Resource Manager resource (project,
      * folder, or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -2867,9 +2768,7 @@ public com.google.protobuf.ByteString getNameBytes() {
      * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
      * The binding parent is the closest Resource Manager resource (project,
      * folder, or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -2885,8 +2784,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2899,9 +2798,7 @@ public Builder setName(java.lang.String value) {
      * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
      * The binding parent is the closest Resource Manager resource (project,
      * folder, or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -2913,8 +2810,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -2927,9 +2824,7 @@ public Builder clearName() {
      * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
      * The binding parent is the closest Resource Manager resource (project,
      * folder, or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -2946,8 +2841,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3025,8 +2920,8 @@ public Builder setUid(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       uid_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3046,8 +2941,8 @@ public Builder setUid(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearUid() {
+
       uid_ = getDefaultInstance().getUid();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -3072,8 +2967,8 @@ public Builder setUidBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       uid_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3145,8 +3040,8 @@ public Builder setEtag(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       etag_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -3164,8 +3059,8 @@ public Builder setEtag(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEtag() {
+
       etag_ = getDefaultInstance().getEtag();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -3188,8 +3083,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       etag_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -3261,8 +3156,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       displayName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -3280,8 +3175,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
+
       displayName_ = getDefaultInstance().getDisplayName();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -3304,8 +3199,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       displayName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -3323,6 +3218,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
 
     private com.google.protobuf.MapField
         internalGetMutableAnnotations() {
+      onChanged();
+      ;
       if (annotations_ == null) {
         annotations_ =
             com.google.protobuf.MapField.newMapField(AnnotationsDefaultEntryHolder.defaultEntry);
@@ -3330,8 +3227,6 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
       if (!annotations_.isMutable()) {
         annotations_ = annotations_.copy();
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
       return annotations_;
     }
 
@@ -3396,10 +3291,8 @@ public java.util.Map getAnnotationsMap() {
      * 
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getAnnotationsOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getAnnotationsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -3432,7 +3325,6 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
     }
 
     public Builder clearAnnotations() {
-      bitField0_ = (bitField0_ & ~0x00000010);
       internalGetMutableAnnotations().getMutableMap().clear();
       return this;
     }
@@ -3460,7 +3352,6 @@ public Builder removeAnnotations(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableAnnotations() {
-      bitField0_ |= 0x00000010;
       return internalGetMutableAnnotations().getMutableMap();
     }
 
@@ -3483,8 +3374,8 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
+
       internalGetMutableAnnotations().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000010;
       return this;
     }
 
@@ -3502,7 +3393,6 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllAnnotations(java.util.Map values) {
       internalGetMutableAnnotations().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000010;
       return this;
     }
 
@@ -3528,7 +3418,7 @@ public Builder putAllAnnotations(java.util.Map
      */
     public Builder clearTarget() {
-      bitField0_ = (bitField0_ & ~0x00000020);
-      target_ = null;
-      if (targetBuilder_ != null) {
-        targetBuilder_.dispose();
+      if (targetBuilder_ == null) {
+        target_ = null;
+        onChanged();
+      } else {
+        target_ = null;
         targetBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -3671,7 +3561,7 @@ public Builder clearTarget() {
      * 
      */
     public com.google.iam.v3.PolicyBinding.Target.Builder getTargetBuilder() {
-      bitField0_ |= 0x00000020;
+
       onChanged();
       return getTargetFieldBuilder().getBuilder();
     }
@@ -3735,7 +3625,6 @@ public com.google.iam.v3.PolicyBinding.TargetOrBuilder getTargetOrBuilder() {
      * 
      * Immutable. The kind of the policy to attach in this binding. This field
      * must be one of the following:
-     *
      * - Left empty (will be automatically set to the policy kind)
      * - The input policy kind
      * 

@@ -3757,7 +3646,6 @@ public int getPolicyKindValue() {
      * 
      * Immutable. The kind of the policy to attach in this binding. This field
      * must be one of the following:
-     *
      * - Left empty (will be automatically set to the policy kind)
      * - The input policy kind
      * 

@@ -3770,8 +3658,8 @@ public int getPolicyKindValue() {
      * @return This builder for chaining.
      */
     public Builder setPolicyKindValue(int value) {
+
       policyKind_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -3782,7 +3670,6 @@ public Builder setPolicyKindValue(int value) {
      * 
      * Immutable. The kind of the policy to attach in this binding. This field
      * must be one of the following:
-     *
      * - Left empty (will be automatically set to the policy kind)
      * - The input policy kind
      * 

@@ -3795,8 +3682,9 @@ public Builder setPolicyKindValue(int value) {
      */
     @java.lang.Override
     public com.google.iam.v3.PolicyBinding.PolicyKind getPolicyKind() {
+      @SuppressWarnings("deprecation")
       com.google.iam.v3.PolicyBinding.PolicyKind result =
-          com.google.iam.v3.PolicyBinding.PolicyKind.forNumber(policyKind_);
+          com.google.iam.v3.PolicyBinding.PolicyKind.valueOf(policyKind_);
       return result == null ? com.google.iam.v3.PolicyBinding.PolicyKind.UNRECOGNIZED : result;
     }
 
@@ -3806,7 +3694,6 @@ public com.google.iam.v3.PolicyBinding.PolicyKind getPolicyKind() {
      * 
      * Immutable. The kind of the policy to attach in this binding. This field
      * must be one of the following:
-     *
      * - Left empty (will be automatically set to the policy kind)
      * - The input policy kind
      * 

@@ -3822,7 +3709,7 @@ public Builder setPolicyKind(com.google.iam.v3.PolicyBinding.PolicyKind value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000040;
+
       policyKind_ = value.getNumber();
       onChanged();
       return this;
@@ -3834,7 +3721,6 @@ public Builder setPolicyKind(com.google.iam.v3.PolicyBinding.PolicyKind value) {
      * 
      * Immutable. The kind of the policy to attach in this binding. This field
      * must be one of the following:
-     *
      * - Left empty (will be automatically set to the policy kind)
      * - The input policy kind
      * 

@@ -3846,7 +3732,7 @@ public Builder setPolicyKind(com.google.iam.v3.PolicyBinding.PolicyKind value) {
      * @return This builder for chaining.
      */
     public Builder clearPolicyKind() {
-      bitField0_ = (bitField0_ & ~0x00000040);
+
       policyKind_ = 0;
       onChanged();
       return this;
@@ -3925,8 +3811,8 @@ public Builder setPolicy(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       policy_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -3946,8 +3832,8 @@ public Builder setPolicy(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPolicy() {
+
       policy_ = getDefaultInstance().getPolicy();
-      bitField0_ = (bitField0_ & ~0x00000080);
       onChanged();
       return this;
     }
@@ -3972,8 +3858,8 @@ public Builder setPolicyBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       policy_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -4042,8 +3928,8 @@ public Builder setPolicyUid(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       policyUid_ = value;
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -4060,8 +3946,8 @@ public Builder setPolicyUid(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPolicyUid() {
+
       policyUid_ = getDefaultInstance().getPolicyUid();
-      bitField0_ = (bitField0_ & ~0x00000100);
       onChanged();
       return this;
     }
@@ -4083,8 +3969,8 @@ public Builder setPolicyUidBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       policyUid_ = value;
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -4103,33 +3989,25 @@ public Builder setPolicyUidBytes(com.google.protobuf.ByteString value) {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4141,7 +4019,7 @@ public Builder setPolicyUidBytes(com.google.protobuf.ByteString value) {
      * @return Whether the condition field is set.
      */
     public boolean hasCondition() {
-      return ((bitField0_ & 0x00000200) != 0);
+      return conditionBuilder_ != null || condition_ != null;
     }
 
     /**
@@ -4153,33 +4031,25 @@ public boolean hasCondition() {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4207,33 +4077,25 @@ public com.google.type.Expr getCondition() {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4248,11 +4110,11 @@ public Builder setCondition(com.google.type.Expr value) {
           throw new NullPointerException();
         }
         condition_ = value;
+        onChanged();
       } else {
         conditionBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000200;
-      onChanged();
+
       return this;
     }
 
@@ -4265,33 +4127,25 @@ public Builder setCondition(com.google.type.Expr value) {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4303,11 +4157,11 @@ public Builder setCondition(com.google.type.Expr value) {
     public Builder setCondition(com.google.type.Expr.Builder builderForValue) {
       if (conditionBuilder_ == null) {
         condition_ = builderForValue.build();
+        onChanged();
       } else {
         conditionBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000200;
-      onChanged();
+
       return this;
     }
 
@@ -4320,33 +4174,25 @@ public Builder setCondition(com.google.type.Expr.Builder builderForValue) {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4357,20 +4203,16 @@ public Builder setCondition(com.google.type.Expr.Builder builderForValue) {
      */
     public Builder mergeCondition(com.google.type.Expr value) {
       if (conditionBuilder_ == null) {
-        if (((bitField0_ & 0x00000200) != 0)
-            && condition_ != null
-            && condition_ != com.google.type.Expr.getDefaultInstance()) {
-          getConditionBuilder().mergeFrom(value);
+        if (condition_ != null) {
+          condition_ = com.google.type.Expr.newBuilder(condition_).mergeFrom(value).buildPartial();
         } else {
           condition_ = value;
         }
+        onChanged();
       } else {
         conditionBuilder_.mergeFrom(value);
       }
-      if (condition_ != null) {
-        bitField0_ |= 0x00000200;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -4383,33 +4225,25 @@ public Builder mergeCondition(com.google.type.Expr value) {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4419,13 +4253,14 @@ public Builder mergeCondition(com.google.type.Expr value) {
      * .google.type.Expr condition = 8 [(.google.api.field_behavior) = OPTIONAL];
      */
     public Builder clearCondition() {
-      bitField0_ = (bitField0_ & ~0x00000200);
-      condition_ = null;
-      if (conditionBuilder_ != null) {
-        conditionBuilder_.dispose();
+      if (conditionBuilder_ == null) {
+        condition_ = null;
+        onChanged();
+      } else {
+        condition_ = null;
         conditionBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -4438,33 +4273,25 @@ public Builder clearCondition() {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4474,7 +4301,7 @@ public Builder clearCondition() {
      * .google.type.Expr condition = 8 [(.google.api.field_behavior) = OPTIONAL];
      */
     public com.google.type.Expr.Builder getConditionBuilder() {
-      bitField0_ |= 0x00000200;
+
       onChanged();
       return getConditionFieldBuilder().getBuilder();
     }
@@ -4488,33 +4315,25 @@ public com.google.type.Expr.Builder getConditionBuilder() {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4540,33 +4359,25 @@ public com.google.type.ExprOrBuilder getConditionOrBuilder() {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4609,7 +4420,7 @@ public com.google.type.ExprOrBuilder getConditionOrBuilder() {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return ((bitField0_ & 0x00000400) != 0);
+      return createTimeBuilder_ != null || createTime_ != null;
     }
 
     /**
@@ -4652,11 +4463,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000400;
-      onChanged();
+
       return this;
     }
 
@@ -4674,11 +4485,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000400;
-      onChanged();
+
       return this;
     }
 
@@ -4695,20 +4506,17 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000400) != 0)
-            && createTime_ != null
-            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getCreateTimeBuilder().mergeFrom(value);
+        if (createTime_ != null) {
+          createTime_ =
+              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
         } else {
           createTime_ = value;
         }
+        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-      if (createTime_ != null) {
-        bitField0_ |= 0x00000400;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -4724,13 +4532,14 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearCreateTime() {
-      bitField0_ = (bitField0_ & ~0x00000400);
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+        onChanged();
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -4746,7 +4555,7 @@ public Builder clearCreateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-      bitField0_ |= 0x00000400;
+
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -4821,7 +4630,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      * @return Whether the updateTime field is set.
      */
     public boolean hasUpdateTime() {
-      return ((bitField0_ & 0x00000800) != 0);
+      return updateTimeBuilder_ != null || updateTime_ != null;
     }
 
     /**
@@ -4864,11 +4673,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         updateTime_ = value;
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000800;
-      onChanged();
+
       return this;
     }
 
@@ -4886,11 +4695,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
     public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (updateTimeBuilder_ == null) {
         updateTime_ = builderForValue.build();
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000800;
-      onChanged();
+
       return this;
     }
 
@@ -4907,20 +4716,17 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       if (updateTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000800) != 0)
-            && updateTime_ != null
-            && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getUpdateTimeBuilder().mergeFrom(value);
+        if (updateTime_ != null) {
+          updateTime_ =
+              com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
         } else {
           updateTime_ = value;
         }
+        onChanged();
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-      if (updateTime_ != null) {
-        bitField0_ |= 0x00000800;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -4936,13 +4742,14 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearUpdateTime() {
-      bitField0_ = (bitField0_ & ~0x00000800);
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+        onChanged();
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -4958,7 +4765,7 @@ public Builder clearUpdateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-      bitField0_ |= 0x00000800;
+
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBindingOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBindingOrBuilder.java
index 152557b6c9..0ccf9afae8 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBindingOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBindingOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_binding_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface PolicyBindingOrBuilder
@@ -32,9 +31,7 @@ public interface PolicyBindingOrBuilder
    * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
    * The binding parent is the closest Resource Manager resource (project,
    * folder, or organization) to the binding target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -55,9 +52,7 @@ public interface PolicyBindingOrBuilder
    * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
    * The binding parent is the closest Resource Manager resource (project,
    * folder, or organization) to the binding target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -216,6 +211,7 @@ public interface PolicyBindingOrBuilder
    * map<string, string> annotations = 5 [(.google.api.field_behavior) = OPTIONAL];
    * 
    */
+
   /* nullable */
   java.lang.String getAnnotationsOrDefault(
       java.lang.String key,
@@ -288,7 +284,6 @@ java.lang.String getAnnotationsOrDefault(
    * 
    * Immutable. The kind of the policy to attach in this binding. This field
    * must be one of the following:
-   *
    * - Left empty (will be automatically set to the policy kind)
    * - The input policy kind
    * 

@@ -307,7 +302,6 @@ java.lang.String getAnnotationsOrDefault(
    * 
    * Immutable. The kind of the policy to attach in this binding. This field
    * must be one of the following:
-   *
    * - Left empty (will be automatically set to the policy kind)
    * - The input policy kind
    * 

@@ -387,33 +381,25 @@ java.lang.String getAnnotationsOrDefault(
    * joined by the
    * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
    * cannot contain more than 250 characters.
-   *
    * The condition is currently only supported when bound to policies of kind
    * principal access boundary.
-   *
    * When the bound policy is a principal access boundary policy, the only
    * supported attributes in any subexpression are `principal.type` and
    * `principal.subject`. An example expression is: "principal.type ==
    * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
    * 'bob@example.com'".
-   *
    * Allowed operations for `principal.subject`:
-   *
    * - `principal.subject == <principal subject string>`
    * - `principal.subject != <principal subject string>`
    * - `principal.subject in [<list of principal subjects>]`
    * - `principal.subject.startsWith(<string>)`
    * - `principal.subject.endsWith(<string>)`
-   *
    * Allowed operations for `principal.type`:
-   *
    * - `principal.type == <principal type string>`
    * - `principal.type != <principal type string>`
    * - `principal.type in [<list of principal types>]`
-   *
    * Supported principal types are Workspace, Workforce Pool, Workload Pool and
    * Service Account. Allowed string must be one of:
-   *
    * - iam.googleapis.com/WorkspaceIdentity
    * - iam.googleapis.com/WorkforcePoolIdentity
    * - iam.googleapis.com/WorkloadPoolIdentity
@@ -435,33 +421,25 @@ java.lang.String getAnnotationsOrDefault(
    * joined by the
    * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
    * cannot contain more than 250 characters.
-   *
    * The condition is currently only supported when bound to policies of kind
    * principal access boundary.
-   *
    * When the bound policy is a principal access boundary policy, the only
    * supported attributes in any subexpression are `principal.type` and
    * `principal.subject`. An example expression is: "principal.type ==
    * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
    * 'bob@example.com'".
-   *
    * Allowed operations for `principal.subject`:
-   *
    * - `principal.subject == <principal subject string>`
    * - `principal.subject != <principal subject string>`
    * - `principal.subject in [<list of principal subjects>]`
    * - `principal.subject.startsWith(<string>)`
    * - `principal.subject.endsWith(<string>)`
-   *
    * Allowed operations for `principal.type`:
-   *
    * - `principal.type == <principal type string>`
    * - `principal.type != <principal type string>`
    * - `principal.type in [<list of principal types>]`
-   *
    * Supported principal types are Workspace, Workforce Pool, Workload Pool and
    * Service Account. Allowed string must be one of:
-   *
    * - iam.googleapis.com/WorkspaceIdentity
    * - iam.googleapis.com/WorkforcePoolIdentity
    * - iam.googleapis.com/WorkloadPoolIdentity
@@ -483,33 +461,25 @@ java.lang.String getAnnotationsOrDefault(
    * joined by the
    * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
    * cannot contain more than 250 characters.
-   *
    * The condition is currently only supported when bound to policies of kind
    * principal access boundary.
-   *
    * When the bound policy is a principal access boundary policy, the only
    * supported attributes in any subexpression are `principal.type` and
    * `principal.subject`. An example expression is: "principal.type ==
    * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
    * 'bob@example.com'".
-   *
    * Allowed operations for `principal.subject`:
-   *
    * - `principal.subject == <principal subject string>`
    * - `principal.subject != <principal subject string>`
    * - `principal.subject in [<list of principal subjects>]`
    * - `principal.subject.startsWith(<string>)`
    * - `principal.subject.endsWith(<string>)`
-   *
    * Allowed operations for `principal.type`:
-   *
    * - `principal.type == <principal type string>`
    * - `principal.type != <principal type string>`
    * - `principal.type in [<list of principal types>]`
-   *
    * Supported principal types are Workspace, Workforce Pool, Workload Pool and
    * Service Account. Allowed string must be one of:
-   *
    * - iam.googleapis.com/WorkspaceIdentity
    * - iam.googleapis.com/WorkforcePoolIdentity
    * - iam.googleapis.com/WorkloadPoolIdentity
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBindingResourcesProto.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBindingResourcesProto.java
index 0fba3dc5ae..8101bcaf07 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBindingResourcesProto.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBindingResourcesProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_binding_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public final class PolicyBindingResourcesProto {
@@ -56,7 +55,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "rotobuf/timestamp.proto\032\026google/type/expr.proto\"\326\007\n\r"
           + "PolicyBinding\022\021\n"
           + "\004name\030\001 \001(\tB\003\340A\010\022\030\n"
-          + "\003uid\030\002 \001(\tB\013\340A\003\342\214\317\327\010\002\010\001\022\021\n"
+          + "\003uid\030\002 \001(\tB\013\342\214\317\327\010\002\010\001\340A\003\022\021\n"
           + "\004etag\030\003 \001(\tB\003\340A\001\022\031\n"
           + "\014display_name\030\004 \001(\tB\003\340A\001\022G\n"
           + "\013annotations\030\005"
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBindingsServiceProto.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBindingsServiceProto.java
index ac21021159..54adf5ad92 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBindingsServiceProto.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBindingsServiceProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public final class PolicyBindingsServiceProto {
@@ -118,45 +117,44 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\017next_page_token\030\002 \001(\tB\003\340A\0012\240\021\n"
           + "\016PolicyBindings\022\214\003\n"
           + "\023CreatePolicyBinding\022).google.iam.v3.CreatePolicyBindingR"
-          + "equest\032\035.google.longrunning.Operation\"\252\002\312A\"\n\r"
-          + "PolicyBinding\022\021OperationMetadata\332A\'"
-          + "parent,policy_binding,policy_binding_id\202"
-          + "\323\344\223\002\324\001\"2/v3/{parent=projects/*/locations"
-          + "/*}/policyBindings:\016policy_bindingZC\"1/v3/{parent=folders/*/locations/*}/policyB"
-          + "indings:\016policy_bindingZI\"7/v3/{parent=o"
-          + "rganizations/*/locations/*}/policyBindings:\016policy_binding\022\215\002\n"
+          + "equest\032\035.google.longrunning.Operation\"\252\002"
+          + "\202\323\344\223\002\324\001\"2/v3/{parent=projects/*/location"
+          + "s/*}/policyBindings:\016policy_bindingZC\"1/v3/{parent=folders/*/locations/*}/policy"
+          + "Bindings:\016policy_bindingZI\"7/v3/{parent=organizations/*/locations/*}/policyBindi"
+          + "ngs:\016policy_binding\332A\'parent,policy_binding,policy_binding_id\312A\"\n\r"
+          + "PolicyBinding\022\021OperationMetadata\022\215\002\n"
           + "\020GetPolicyBinding\022&.google.iam.v3.GetPolicyBindingRequest\032"
-          + "\034.google.iam.v3.PolicyBinding\"\262\001\332A\004name\202"
-          + "\323\344\223\002\244\001\0222/v3/{name=projects/*/locations/*"
-          + "/policyBindings/*}Z3\0221/v3/{name=folders/*/locations/*/policyBindings/*}Z9\0227/v3/{"
-          + "name=organizations/*/locations/*/policyBindings/*}\022\254\003\n"
-          + "\023UpdatePolicyBinding\022).goo"
-          + "gle.iam.v3.UpdatePolicyBindingRequest\032\035.google.longrunning.Operation\"\312\002\312A\"\n\r"
-          + "PolicyBinding\022\021OperationMetadata\332A\032policy_bi"
-          + "nding,update_mask\202\323\344\223\002\201\0022A/v3/{policy_bi"
-          + "nding.name=projects/*/locations/*/policyBindings/*}:\016policy_bindingZR2@/v3/{poli"
-          + "cy_binding.name=folders/*/locations/*/policyBindings/*}:\016policy_bindingZX2F/v3/{"
-          + "policy_binding.name=organizations/*/loca"
-          + "tions/*/policyBindings/*}:\016policy_binding\022\301\002\n"
+          + "\034.google.iam.v3.PolicyBinding\"\262\001\202\323\344\223\002\244\001\022"
+          + "2/v3/{name=projects/*/locations/*/policyBindings/*}Z3\0221/v3/{name=folders/*/locat"
+          + "ions/*/policyBindings/*}Z9\0227/v3/{name=or"
+          + "ganizations/*/locations/*/policyBindings/*}\332A\004name\022\254\003\n"
+          + "\023UpdatePolicyBinding\022).google.iam.v3.UpdatePolicyBindingRequest\032\035."
+          + "google.longrunning.Operation\"\312\002\202\323\344\223\002\201\0022A"
+          + "/v3/{policy_binding.name=projects/*/locations/*/policyBindings/*}:\016policy_bindin"
+          + "gZR2@/v3/{policy_binding.name=folders/*/locations/*/policyBindings/*}:\016policy_bi"
+          + "ndingZX2F/v3/{policy_binding.name=organizations/*/locations/*/policyBindings/*}:"
+          + "\016policy_binding\332A\032policy_binding,update_mask\312A\"\n\r"
+          + "PolicyBinding\022\021OperationMetadata\022\301\002\n"
           + "\023DeletePolicyBinding\022).google.iam.v"
-          + "3.DeletePolicyBindingRequest\032\035.google.longrunning.Operation\"\337\001\312A*\n"
-          + "\025google.protob"
-          + "uf.Empty\022\021OperationMetadata\332A\004name\202\323\344\223\002\244"
-          + "\001*2/v3/{name=projects/*/locations/*/policyBindings/*}Z3*1/v3/{name=folders/*/loc"
-          + "ations/*/policyBindings/*}Z9*7/v3/{name="
-          + "organizations/*/locations/*/policyBindings/*}\022\240\002\n"
+          + "3.DeletePolicyBindingRequest\032\035.google.lo"
+          + "ngrunning.Operation\"\337\001\202\323\344\223\002\244\001*2/v3/{name"
+          + "=projects/*/locations/*/policyBindings/*}Z3*1/v3/{name=folders/*/locations/*/pol"
+          + "icyBindings/*}Z9*7/v3/{name=organization"
+          + "s/*/locations/*/policyBindings/*}\332A\004name\312A*\n"
+          + "\025google.protobuf.Empty\022\021OperationMetadata\022\240\002\n"
           + "\022ListPolicyBindings\022(.google.iam.v3.ListPolicyBindingsRequest\032).google."
-          + "iam.v3.ListPolicyBindingsResponse\"\264\001\332A\006p"
-          + "arent\202\323\344\223\002\244\001\0222/v3/{parent=projects/*/loc"
-          + "ations/*}/policyBindingsZ3\0221/v3/{parent=folders/*/locations/*}/policyBindingsZ9\022"
-          + "7/v3/{parent=organizations/*/locations/*}/policyBindings\022\220\003\n"
+          + "iam.v3.ListPolicyBindingsResponse\"\264\001\202\323\344\223"
+          + "\002\244\001\0222/v3/{parent=projects/*/locations/*}"
+          + "/policyBindingsZ3\0221/v3/{parent=folders/*/locations/*}/policyBindingsZ9\0227/v3/{par"
+          + "ent=organizations/*/locations/*}/policyBindings\332A\006parent\022\220\003\n"
           + "\032SearchTargetPolicyBindings\0220.google.iam.v3.SearchTargetPoli"
-          + "cyBindingsRequest\0321.google.iam.v3.SearchTargetPolicyBindingsResponse\"\214\002\332A\r"
-          + "parent,target\202\323\344\223\002\365\001\022M/v3/{parent=projects/*/l"
-          + "ocations/*}/policyBindings:searchTargetPolicyBindingsZN\022L/v3/{parent=folders/*/l"
-          + "ocations/*}/policyBindings:searchTargetPolicyBindingsZT\022R/v3/{parent=organizatio"
-          + "ns/*/locations/*}/policyBindings:searchT"
-          + "argetPolicyBindings\032F\312A\022iam.googleapis.c"
+          + "cyBindingsRequest\0321.google.iam.v3.Search"
+          + "TargetPolicyBindingsResponse\"\214\002\202\323\344\223\002\365\001\022M"
+          + "/v3/{parent=projects/*/locations/*}/policyBindings:searchTargetPolicyBindingsZN\022"
+          + "L/v3/{parent=folders/*/locations/*}/policyBindings:searchTargetPolicyBindingsZT\022"
+          + "R/v3/{parent=organizations/*/locations/*"
+          + "}/policyBindings:searchTargetPolicyBindings\332A\r"
+          + "parent,target\032F\312A\022iam.googleapis.c"
           + "om\322A.https://www.googleapis.com/auth/cloud-platformB\264\002\n"
           + "\021com.google.iam.v3B\032PolicyBindingsServiceProtoP\001Z)cloud.google.co"
           + "m/go/iam/apiv3/iampb;iampb\252\002\023Google.Cloud.Iam.V3\312\002\023Google\\Cloud\\Iam\\V3\352A\\\n"
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesServiceProto.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesServiceProto.java
index e5f7830a42..c0473f2cbd 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesServiceProto.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesServiceProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public final class PrincipalAccessBoundaryPoliciesServiceProto {
@@ -119,39 +118,38 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\017next_page_token\030\002 \001(\tB\003\340A\0012\354\016\n"
           + "\037PrincipalAccessBoundaryPolicies\022\367\002\n"
           + "#CreatePrincipalAccessBoundaryPolicy\0229.google."
-          + "iam.v3.CreatePrincipalAccessBoundaryPoli"
-          + "cyRequest\032\035.google.longrunning.Operation\"\365\001\312A2\n"
-          + "\035PrincipalAccessBoundaryPolicy\022\021OperationMetadata\332AKparent,principal_acce"
-          + "ss_boundary_policy,principal_access_boun"
-          + "dary_policy_id\202\323\344\223\002l\"H/v3/{parent=organi"
-          + "zations/*/locations/*}/principalAccessBoundaryPolicies:"
-          + " principal_access_boundary_policy\022\341\001\n"
+          + "iam.v3.CreatePrincipalAccessBoundaryPolicyRequest\032\035.google.longrunning.Operation"
+          + "\"\365\001\202\323\344\223\002l\"H/v3/{parent=organizations/*/l"
+          + "ocations/*}/principalAccessBoundaryPolicies: principal_access_boundary_policy\332AK"
+          + "parent,principal_access_boundary_policy,principal_access_boundary_policy_id\312A2\n"
+          + "\035PrincipalAccessBoundaryPolicy\022\021OperationMetadata\022\341\001\n"
           + " GetPrincipalAccessBoundaryPolicy\0226.google.iam.v3.GetPrincipalAccess"
           + "BoundaryPolicyRequest\032,.google.iam.v3.Pr"
-          + "incipalAccessBoundaryPolicy\"W\332A\004name\202\323\344\223"
-          + "\002J\022H/v3/{name=organizations/*/locations/*/principalAccessBoundaryPolicies/*}\022\372\002\n"
+          + "incipalAccessBoundaryPolicy\"W\202\323\344\223\002J\022H/v3"
+          + "/{name=organizations/*/locations/*/principalAccessBoundaryPolicies/*}\332A\004name\022\372\002\n"
           + "#UpdatePrincipalAccessBoundaryPolicy\0229.google.iam.v3.UpdatePrincipalAccessBounda"
-          + "ryPolicyRequest\032\035.google.longrunning.Operation\"\370\001\312A2\n"
-          + "\035PrincipalAccessBoundaryPolicy\022\021OperationMetadata\332A,principal_acces"
-          + "s_boundary_policy,update_mask\202\323\344\223\002\215\0012i/v"
-          + "3/{principal_access_boundary_policy.name"
-          + "=organizations/*/locations/*/principalAccessBoundaryPolicies/*}:"
-          + " principal_access_boundary_policy\022\206\002\n"
+          + "ryPolicyRequest\032\035.google.longrunning.Ope"
+          + "ration\"\370\001\202\323\344\223\002\215\0012i/v3/{principal_access_"
+          + "boundary_policy.name=organizations/*/locations/*/principalAccessBoundaryPolicies/*}:"
+          + " principal_access_boundary_policy\332A,"
+          + "principal_access_boundary_policy,update_mask\312A2\n"
+          + "\035PrincipalAccessBoundaryPolicy\022\021OperationMetadata\022\206\002\n"
           + "#DeletePrincipalAccessBoundaryPolicy\0229.google.iam.v3.Delete"
-          + "PrincipalAccessBoundaryPolicyRequest\032\035.google.longrunning.Operation\"\204\001\312A*\n"
-          + "\025google.protobuf.Empty\022\021OperationMetadata\332A\004na"
-          + "me\202\323\344\223\002J*H/v3/{name=organizations/*/loca"
-          + "tions/*/principalAccessBoundaryPolicies/*}\022\367\001\n"
+          + "PrincipalAccessBoundaryPolicyRequest\032\035.g"
+          + "oogle.longrunning.Operation\"\204\001\202\323\344\223\002J*H/v"
+          + "3/{name=organizations/*/locations/*/prin"
+          + "cipalAccessBoundaryPolicies/*}\332A\004name\312A*\n"
+          + "\025google.protobuf.Empty\022\021OperationMetadata\022\367\001\n"
           + "#ListPrincipalAccessBoundaryPolicies\0229.google.iam.v3.ListPrincipalAccessBo"
           + "undaryPoliciesRequest\032:.google.iam.v3.ListPrincipalAccessBoundaryPoliciesRespons"
-          + "e\"Y\332A\006parent\202\323\344\223\002J\022H/v3/{parent=organiza"
-          + "tions/*/locations/*}/principalAccessBoundaryPolicies\022\242\002\n"
+          + "e\"Y\202\323\344\223\002J\022H/v3/{parent=organizations/*/l"
+          + "ocations/*}/principalAccessBoundaryPolicies\332A\006parent\022\242\002\n"
           + "+SearchPrincipalAccessBoundaryPolicyBindings\022A.google.iam.v3.Sea"
           + "rchPrincipalAccessBoundaryPolicyBindingsRequest\032B.google.iam.v3.SearchPrincipalA"
-          + "ccessBoundaryPolicyBindingsResponse\"l\332A\004"
-          + "name\202\323\344\223\002_\022]/v3/{name=organizations/*/lo"
-          + "cations/*/principalAccessBoundaryPolicie"
-          + "s/*}:searchPolicyBindings\032F\312A\022iam.google"
+          + "ccessBoundaryPolicyBindingsResponse\"l\202\323\344"
+          + "\223\002_\022]/v3/{name=organizations/*/locations"
+          + "/*/principalAccessBoundaryPolicies/*}:se"
+          + "archPolicyBindings\332A\004name\032F\312A\022iam.google"
           + "apis.com\322A.https://www.googleapis.com/auth/cloud-platformB\231\001\n"
           + "\021com.google.iam.v3B+PrincipalAccessBoundaryPoliciesServiceP"
           + "rotoP\001Z)cloud.google.com/go/iam/apiv3/ia"
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicy.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicy.java
index 91358a580e..ea005c18a7 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicy.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicy.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policy_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PrincipalAccessBoundaryPolicy();
   }
 
+  @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.iam.v3.PrincipalAccessBoundaryPolicyResourcesProto
         .internal_static_google_iam_v3_PrincipalAccessBoundaryPolicy_descriptor;
@@ -59,8 +63,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 5:
         return internalGetAnnotations();
@@ -79,18 +82,14 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
             com.google.iam.v3.PrincipalAccessBoundaryPolicy.Builder.class);
   }
 
-  private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
    *
    * 
    * Identifier. The resource name of the principal access boundary policy.
-   *
    * The following format is supported:
    * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
    * 

@@ -117,7 +116,6 @@ public java.lang.String getName() {
    *
    * 
    * Identifier. The resource name of the principal access boundary policy.
-   *
    * The following format is supported:
    * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
    * 

@@ -140,9 +138,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int UID_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object uid_ = "";
+  private volatile java.lang.Object uid_;
 
   /**
    *
@@ -199,9 +195,7 @@ public com.google.protobuf.ByteString getUidBytes() {
   }
 
   public static final int ETAG_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object etag_ = "";
+  private volatile java.lang.Object etag_;
 
   /**
    *
@@ -254,9 +248,7 @@ public com.google.protobuf.ByteString getEtagBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object displayName_ = "";
+  private volatile java.lang.Object displayName_;
 
   /**
    *
@@ -321,7 +313,6 @@ private static final class AnnotationsDefaultEntryHolder {
             "");
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField annotations_;
 
   private com.google.protobuf.MapField
@@ -393,10 +384,8 @@ public java.util.Map getAnnotationsMap() {
    * 
    */
   @java.lang.Override
-  public /* nullable */ java.lang.String getAnnotationsOrDefault(
-      java.lang.String key,
-      /* nullable */
-      java.lang.String defaultValue) {
+  public java.lang.String getAnnotationsOrDefault(
+      java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -446,7 +435,7 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return createTime_ != null;
   }
 
   /**
@@ -480,7 +469,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+    return getCreateTime();
   }
 
   public static final int UPDATE_TIME_FIELD_NUMBER = 7;
@@ -501,7 +490,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateTime() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return updateTime_ != null;
   }
 
   /**
@@ -535,7 +524,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+    return getUpdateTime();
   }
 
   public static final int DETAILS_FIELD_NUMBER = 8;
@@ -556,7 +545,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasDetails() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return details_ != null;
   }
 
   /**
@@ -592,9 +581,7 @@ public com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails getDetails() {
    */
   @java.lang.Override
   public com.google.iam.v3.PrincipalAccessBoundaryPolicyDetailsOrBuilder getDetailsOrBuilder() {
-    return details_ == null
-        ? com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails.getDefaultInstance()
-        : details_;
+    return getDetails();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -625,13 +612,13 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
         output, internalGetAnnotations(), AnnotationsDefaultEntryHolder.defaultEntry, 5);
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       output.writeMessage(6, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateTime_ != null) {
       output.writeMessage(7, getUpdateTime());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (details_ != null) {
       output.writeMessage(8, getDetails());
     }
     getUnknownFields().writeTo(output);
@@ -665,13 +652,13 @@ public int getSerializedSize() {
               .build();
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, annotations__);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getUpdateTime());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (details_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getDetails());
     }
     size += getUnknownFields().getSerializedSize();
@@ -862,8 +849,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 5:
           return internalGetAnnotations();
@@ -873,8 +859,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 5:
           return internalGetMutableAnnotations();
@@ -894,45 +879,40 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     }
 
     // Construct using com.google.iam.v3.PrincipalAccessBoundaryPolicy.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCreateTimeFieldBuilder();
-        getUpdateTimeFieldBuilder();
-        getDetailsFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       uid_ = "";
+
       etag_ = "";
+
       displayName_ = "";
+
       internalGetMutableAnnotations().clear();
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
-      details_ = null;
-      if (detailsBuilder_ != null) {
-        detailsBuilder_.dispose();
+      if (detailsBuilder_ == null) {
+        details_ = null;
+      } else {
+        details_ = null;
         detailsBuilder_ = null;
       }
       return this;
@@ -962,45 +942,30 @@ public com.google.iam.v3.PrincipalAccessBoundaryPolicy build() {
     public com.google.iam.v3.PrincipalAccessBoundaryPolicy buildPartial() {
       com.google.iam.v3.PrincipalAccessBoundaryPolicy result =
           new com.google.iam.v3.PrincipalAccessBoundaryPolicy(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.iam.v3.PrincipalAccessBoundaryPolicy result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.uid_ = uid_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.etag_ = etag_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.displayName_ = displayName_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.annotations_ = internalGetAnnotations();
-        result.annotations_.makeImmutable();
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
-        to_bitField0_ |= 0x00000001;
+      result.name_ = name_;
+      result.uid_ = uid_;
+      result.etag_ = etag_;
+      result.displayName_ = displayName_;
+      result.annotations_ = internalGetAnnotations();
+      result.annotations_.makeImmutable();
+      if (createTimeBuilder_ == null) {
+        result.createTime_ = createTime_;
+      } else {
+        result.createTime_ = createTimeBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
-        to_bitField0_ |= 0x00000002;
+      if (updateTimeBuilder_ == null) {
+        result.updateTime_ = updateTime_;
+      } else {
+        result.updateTime_ = updateTimeBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.details_ = detailsBuilder_ == null ? details_ : detailsBuilder_.build();
-        to_bitField0_ |= 0x00000004;
+      if (detailsBuilder_ == null) {
+        result.details_ = details_;
+      } else {
+        result.details_ = detailsBuilder_.build();
       }
-      result.bitField0_ |= to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1051,26 +1016,21 @@ public Builder mergeFrom(com.google.iam.v3.PrincipalAccessBoundaryPolicy other)
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getUid().isEmpty()) {
         uid_ = other.uid_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getEtag().isEmpty()) {
         etag_ = other.etag_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       internalGetMutableAnnotations().mergeFrom(other.internalGetAnnotations());
-      bitField0_ |= 0x00000010;
       if (other.hasCreateTime()) {
         mergeCreateTime(other.getCreateTime());
       }
@@ -1109,25 +1069,25 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 uid_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 etag_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 displayName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             case 42:
@@ -1139,25 +1099,24 @@ public Builder mergeFrom(
                 internalGetMutableAnnotations()
                     .getMutableMap()
                     .put(annotations__.getKey(), annotations__.getValue());
-                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 50:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 50
             case 58:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 58
             case 66:
               {
                 input.readMessage(getDetailsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 66
             default:
@@ -1186,7 +1145,6 @@ public Builder mergeFrom(
      *
      * 
      * Identifier. The resource name of the principal access boundary policy.
-     *
      * The following format is supported:
      * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
      * 

@@ -1212,7 +1170,6 @@ public java.lang.String getName() {
      *
      * 
      * Identifier. The resource name of the principal access boundary policy.
-     *
      * The following format is supported:
      * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
      * 

@@ -1238,7 +1195,6 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * 
      * Identifier. The resource name of the principal access boundary policy.
-     *
      * The following format is supported:
      * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
      * 

@@ -1252,8 +1208,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1263,7 +1219,6 @@ public Builder setName(java.lang.String value) {
      *
      * 
      * Identifier. The resource name of the principal access boundary policy.
-     *
      * The following format is supported:
      * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
      * 

@@ -1273,8 +1228,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1284,7 +1239,6 @@ public Builder clearName() {
      *
      * 
      * Identifier. The resource name of the principal access boundary policy.
-     *
      * The following format is supported:
      * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
      * 

@@ -1299,8 +1253,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1378,8 +1332,8 @@ public Builder setUid(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       uid_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1399,8 +1353,8 @@ public Builder setUid(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearUid() {
+
       uid_ = getDefaultInstance().getUid();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1425,8 +1379,8 @@ public Builder setUidBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       uid_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1498,8 +1452,8 @@ public Builder setEtag(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       etag_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1517,8 +1471,8 @@ public Builder setEtag(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEtag() {
+
       etag_ = getDefaultInstance().getEtag();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1541,8 +1495,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       etag_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1614,8 +1568,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       displayName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1633,8 +1587,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
+
       displayName_ = getDefaultInstance().getDisplayName();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1657,8 +1611,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       displayName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1676,6 +1630,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
 
     private com.google.protobuf.MapField
         internalGetMutableAnnotations() {
+      onChanged();
+      ;
       if (annotations_ == null) {
         annotations_ =
             com.google.protobuf.MapField.newMapField(AnnotationsDefaultEntryHolder.defaultEntry);
@@ -1683,8 +1639,6 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
       if (!annotations_.isMutable()) {
         annotations_ = annotations_.copy();
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
       return annotations_;
     }
 
@@ -1749,10 +1703,8 @@ public java.util.Map getAnnotationsMap() {
      * 
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getAnnotationsOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getAnnotationsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1785,7 +1737,6 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
     }
 
     public Builder clearAnnotations() {
-      bitField0_ = (bitField0_ & ~0x00000010);
       internalGetMutableAnnotations().getMutableMap().clear();
       return this;
     }
@@ -1813,7 +1764,6 @@ public Builder removeAnnotations(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableAnnotations() {
-      bitField0_ |= 0x00000010;
       return internalGetMutableAnnotations().getMutableMap();
     }
 
@@ -1836,8 +1786,8 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
+
       internalGetMutableAnnotations().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000010;
       return this;
     }
 
@@ -1855,7 +1805,6 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllAnnotations(java.util.Map values) {
       internalGetMutableAnnotations().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000010;
       return this;
     }
 
@@ -1881,7 +1830,7 @@ public Builder putAllAnnotations(java.util.Map
      */
     public Builder clearCreateTime() {
-      bitField0_ = (bitField0_ & ~0x00000020);
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+        onChanged();
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2024,7 +1971,7 @@ public Builder clearCreateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-      bitField0_ |= 0x00000020;
+
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -2102,7 +2049,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      * @return Whether the updateTime field is set.
      */
     public boolean hasUpdateTime() {
-      return ((bitField0_ & 0x00000040) != 0);
+      return updateTimeBuilder_ != null || updateTime_ != null;
     }
 
     /**
@@ -2147,11 +2094,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         updateTime_ = value;
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -2170,11 +2117,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
     public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (updateTimeBuilder_ == null) {
         updateTime_ = builderForValue.build();
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -2192,20 +2139,17 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       if (updateTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000040) != 0)
-            && updateTime_ != null
-            && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getUpdateTimeBuilder().mergeFrom(value);
+        if (updateTime_ != null) {
+          updateTime_ =
+              com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
         } else {
           updateTime_ = value;
         }
+        onChanged();
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-      if (updateTime_ != null) {
-        bitField0_ |= 0x00000040;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2222,13 +2166,14 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearUpdateTime() {
-      bitField0_ = (bitField0_ & ~0x00000040);
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+        onChanged();
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2245,7 +2190,7 @@ public Builder clearUpdateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-      bitField0_ |= 0x00000040;
+
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
@@ -2322,7 +2267,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
      * @return Whether the details field is set.
      */
     public boolean hasDetails() {
-      return ((bitField0_ & 0x00000080) != 0);
+      return detailsBuilder_ != null || details_ != null;
     }
 
     /**
@@ -2365,11 +2310,11 @@ public Builder setDetails(com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails
           throw new NullPointerException();
         }
         details_ = value;
+        onChanged();
       } else {
         detailsBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -2388,11 +2333,11 @@ public Builder setDetails(
         com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails.Builder builderForValue) {
       if (detailsBuilder_ == null) {
         details_ = builderForValue.build();
+        onChanged();
       } else {
         detailsBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -2409,21 +2354,19 @@ public Builder setDetails(
      */
     public Builder mergeDetails(com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails value) {
       if (detailsBuilder_ == null) {
-        if (((bitField0_ & 0x00000080) != 0)
-            && details_ != null
-            && details_
-                != com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails.getDefaultInstance()) {
-          getDetailsBuilder().mergeFrom(value);
+        if (details_ != null) {
+          details_ =
+              com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails.newBuilder(details_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           details_ = value;
         }
+        onChanged();
       } else {
         detailsBuilder_.mergeFrom(value);
       }
-      if (details_ != null) {
-        bitField0_ |= 0x00000080;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2439,13 +2382,14 @@ public Builder mergeDetails(com.google.iam.v3.PrincipalAccessBoundaryPolicyDetai
      * 
      */
     public Builder clearDetails() {
-      bitField0_ = (bitField0_ & ~0x00000080);
-      details_ = null;
-      if (detailsBuilder_ != null) {
-        detailsBuilder_.dispose();
+      if (detailsBuilder_ == null) {
+        details_ = null;
+        onChanged();
+      } else {
+        details_ = null;
         detailsBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2461,7 +2405,7 @@ public Builder clearDetails() {
      * 
      */
     public com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails.Builder getDetailsBuilder() {
-      bitField0_ |= 0x00000080;
+
       onChanged();
       return getDetailsFieldBuilder().getBuilder();
     }
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyDetails.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyDetails.java
index 2b0afb7b49..3e9cb49071 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyDetails.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyDetails.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policy_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PrincipalAccessBoundaryPolicyDetails();
   }
 
+  @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.iam.v3.PrincipalAccessBoundaryPolicyResourcesProto
         .internal_static_google_iam_v3_PrincipalAccessBoundaryPolicyDetails_descriptor;
@@ -68,8 +72,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RULES_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List rules_;
 
   /**
@@ -159,9 +161,7 @@ public com.google.iam.v3.PrincipalAccessBoundaryPolicyRuleOrBuilder getRulesOrBu
   }
 
   public static final int ENFORCEMENT_VERSION_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object enforcementVersion_ = "";
+  private volatile java.lang.Object enforcementVersion_;
 
   /**
    *
@@ -429,7 +429,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
       } else {
@@ -438,6 +437,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       enforcementVersion_ = "";
+
       return this;
     }
 
@@ -465,16 +465,7 @@ public com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails build() {
     public com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails buildPartial() {
       com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails result =
           new com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(
-        com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails result) {
+      int from_bitField0_ = bitField0_;
       if (rulesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
@@ -484,13 +475,9 @@ private void buildPartialRepeatedFields(
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.enforcementVersion_ = enforcementVersion_;
-      }
+      result.enforcementVersion_ = enforcementVersion_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -568,7 +555,6 @@ public Builder mergeFrom(com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails
       }
       if (!other.getEnforcementVersion().isEmpty()) {
         enforcementVersion_ = other.enforcementVersion_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -614,7 +600,7 @@ public Builder mergeFrom(
             case 34:
               {
                 enforcementVersion_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 34
             default:
@@ -1136,8 +1122,8 @@ public Builder setEnforcementVersion(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       enforcementVersion_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1158,8 +1144,8 @@ public Builder setEnforcementVersion(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEnforcementVersion() {
+
       enforcementVersion_ = getDefaultInstance().getEnforcementVersion();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1185,8 +1171,8 @@ public Builder setEnforcementVersionBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       enforcementVersion_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyDetailsOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyDetailsOrBuilder.java
index 1edf61ee0b..75d3dd6a42 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyDetailsOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyDetailsOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policy_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface PrincipalAccessBoundaryPolicyDetailsOrBuilder
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyOrBuilder.java
index ae99967950..3891800a03 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policy_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface PrincipalAccessBoundaryPolicyOrBuilder
@@ -29,7 +28,6 @@ public interface PrincipalAccessBoundaryPolicyOrBuilder
    *
    * 
    * Identifier. The resource name of the principal access boundary policy.
-   *
    * The following format is supported:
    * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
    * 

@@ -45,7 +43,6 @@ public interface PrincipalAccessBoundaryPolicyOrBuilder
    *
    * 
    * Identifier. The resource name of the principal access boundary policy.
-   *
    * The following format is supported:
    * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
    * 

@@ -202,6 +199,7 @@ public interface PrincipalAccessBoundaryPolicyOrBuilder
    * map<string, string> annotations = 5 [(.google.api.field_behavior) = OPTIONAL];
    * 
    */
+
   /* nullable */
   java.lang.String getAnnotationsOrDefault(
       java.lang.String key,
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyResourcesProto.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyResourcesProto.java
index be675627d7..16cbcad6f1 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyResourcesProto.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyResourcesProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policy_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public final class PrincipalAccessBoundaryPolicyResourcesProto {
@@ -60,7 +59,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "ce.proto\032\037google/protobuf/timestamp.proto\"\255\005\n"
           + "\035PrincipalAccessBoundaryPolicy\022\021\n"
           + "\004name\030\001 \001(\tB\003\340A\010\022\030\n"
-          + "\003uid\030\002 \001(\tB\013\340A\003\342\214\317\327\010\002\010\001\022\021\n"
+          + "\003uid\030\002 \001(\tB\013\342\214\317\327\010\002\010\001\340A\003\022\021\n"
           + "\004etag\030\003 \001(\tB\003\340A\001\022\031\n"
           + "\014display_name\030\004 \001(\tB\003\340A\001\022W\n"
           + "\013annotations\030\005 \003(\0132=.google.iam"
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyRule.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyRule.java
index d54fa26c85..c74b38535a 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyRule.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyRule.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policy_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -42,7 +41,7 @@ private PrincipalAccessBoundaryPolicyRule(
 
   private PrincipalAccessBoundaryPolicyRule() {
     description_ = "";
-    resources_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    resources_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     effect_ = 0;
   }
 
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PrincipalAccessBoundaryPolicyRule();
   }
 
+  @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.iam.v3.PrincipalAccessBoundaryPolicyResourcesProto
         .internal_static_google_iam_v3_PrincipalAccessBoundaryPolicyRule_descriptor;
@@ -206,9 +210,7 @@ private Effect(int value) {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object description_ = "";
+  private volatile java.lang.Object description_;
 
   /**
    *
@@ -261,10 +263,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int RESOURCES_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList resources_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList resources_;
 
   /**
    *
@@ -274,9 +273,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    * the rule, then the rule applies for that resource and its descendants. The
    * number of resources in a policy is limited to 500 across all rules in the
    * policy.
-   *
    * The following resource types are supported:
-   *
    * * Organizations, such as
    * `//cloudresourcemanager.googleapis.com/organizations/123`.
    * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -300,9 +297,7 @@ public com.google.protobuf.ProtocolStringList getResourcesList() {
    * the rule, then the rule applies for that resource and its descendants. The
    * number of resources in a policy is limited to 500 across all rules in the
    * policy.
-   *
    * The following resource types are supported:
-   *
    * * Organizations, such as
    * `//cloudresourcemanager.googleapis.com/organizations/123`.
    * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -326,9 +321,7 @@ public int getResourcesCount() {
    * the rule, then the rule applies for that resource and its descendants. The
    * number of resources in a policy is limited to 500 across all rules in the
    * policy.
-   *
    * The following resource types are supported:
-   *
    * * Organizations, such as
    * `//cloudresourcemanager.googleapis.com/organizations/123`.
    * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -353,9 +346,7 @@ public java.lang.String getResources(int index) {
    * the rule, then the rule applies for that resource and its descendants. The
    * number of resources in a policy is limited to 500 across all rules in the
    * policy.
-   *
    * The following resource types are supported:
-   *
    * * Organizations, such as
    * `//cloudresourcemanager.googleapis.com/organizations/123`.
    * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -373,7 +364,7 @@ public com.google.protobuf.ByteString getResourcesBytes(int index) {
   }
 
   public static final int EFFECT_FIELD_NUMBER = 3;
-  private int effect_ = 0;
+  private int effect_;
 
   /**
    *
@@ -410,8 +401,9 @@ public int getEffectValue() {
    */
   @java.lang.Override
   public com.google.iam.v3.PrincipalAccessBoundaryPolicyRule.Effect getEffect() {
+    @SuppressWarnings("deprecation")
     com.google.iam.v3.PrincipalAccessBoundaryPolicyRule.Effect result =
-        com.google.iam.v3.PrincipalAccessBoundaryPolicyRule.Effect.forNumber(effect_);
+        com.google.iam.v3.PrincipalAccessBoundaryPolicyRule.Effect.valueOf(effect_);
     return result == null
         ? com.google.iam.v3.PrincipalAccessBoundaryPolicyRule.Effect.UNRECOGNIZED
         : result;
@@ -644,10 +636,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       description_ = "";
-      resources_ = com.google.protobuf.LazyStringArrayList.emptyList();
+
+      resources_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       effect_ = 0;
+
       return this;
     }
 
@@ -675,27 +669,18 @@ public com.google.iam.v3.PrincipalAccessBoundaryPolicyRule build() {
     public com.google.iam.v3.PrincipalAccessBoundaryPolicyRule buildPartial() {
       com.google.iam.v3.PrincipalAccessBoundaryPolicyRule result =
           new com.google.iam.v3.PrincipalAccessBoundaryPolicyRule(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      result.description_ = description_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        resources_ = resources_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
+      result.resources_ = resources_;
+      result.effect_ = effect_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v3.PrincipalAccessBoundaryPolicyRule result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.description_ = description_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        resources_.makeImmutable();
-        result.resources_ = resources_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.effect_ = effect_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -744,13 +729,12 @@ public Builder mergeFrom(com.google.iam.v3.PrincipalAccessBoundaryPolicyRule oth
         return this;
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.resources_.isEmpty()) {
         if (resources_.isEmpty()) {
           resources_ = other.resources_;
-          bitField0_ |= 0x00000002;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureResourcesIsMutable();
           resources_.addAll(other.resources_);
@@ -789,7 +773,7 @@ public Builder mergeFrom(
             case 10:
               {
                 description_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -802,7 +786,7 @@ public Builder mergeFrom(
             case 24:
               {
                 effect_ = input.readEnum();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             default:
@@ -891,8 +875,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       description_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -910,8 +894,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
+
       description_ = getDefaultInstance().getDescription();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -934,20 +918,20 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       description_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList resources_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList resources_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureResourcesIsMutable() {
-      if (!resources_.isModifiable()) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         resources_ = new com.google.protobuf.LazyStringArrayList(resources_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000002;
     }
 
     /**
@@ -958,9 +942,7 @@ private void ensureResourcesIsMutable() {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -973,8 +955,7 @@ private void ensureResourcesIsMutable() {
      * @return A list containing the resources.
      */
     public com.google.protobuf.ProtocolStringList getResourcesList() {
-      resources_.makeImmutable();
-      return resources_;
+      return resources_.getUnmodifiableView();
     }
 
     /**
@@ -985,9 +966,7 @@ public com.google.protobuf.ProtocolStringList getResourcesList() {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -1011,9 +990,7 @@ public int getResourcesCount() {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -1038,9 +1015,7 @@ public java.lang.String getResources(int index) {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -1065,9 +1040,7 @@ public com.google.protobuf.ByteString getResourcesBytes(int index) {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -1087,7 +1060,6 @@ public Builder setResources(int index, java.lang.String value) {
       }
       ensureResourcesIsMutable();
       resources_.set(index, value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1100,9 +1072,7 @@ public Builder setResources(int index, java.lang.String value) {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -1121,7 +1091,6 @@ public Builder addResources(java.lang.String value) {
       }
       ensureResourcesIsMutable();
       resources_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1134,9 +1103,7 @@ public Builder addResources(java.lang.String value) {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -1152,7 +1119,6 @@ public Builder addResources(java.lang.String value) {
     public Builder addAllResources(java.lang.Iterable values) {
       ensureResourcesIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, resources_);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1165,9 +1131,7 @@ public Builder addAllResources(java.lang.Iterable values) {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -1180,9 +1144,8 @@ public Builder addAllResources(java.lang.Iterable values) {
      * @return This builder for chaining.
      */
     public Builder clearResources() {
-      resources_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000002);
-      ;
+      resources_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1195,9 +1158,7 @@ public Builder clearResources() {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -1217,7 +1178,6 @@ public Builder addResourcesBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureResourcesIsMutable();
       resources_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1259,8 +1219,8 @@ public int getEffectValue() {
      * @return This builder for chaining.
      */
     public Builder setEffectValue(int value) {
+
       effect_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1281,8 +1241,9 @@ public Builder setEffectValue(int value) {
      */
     @java.lang.Override
     public com.google.iam.v3.PrincipalAccessBoundaryPolicyRule.Effect getEffect() {
+      @SuppressWarnings("deprecation")
       com.google.iam.v3.PrincipalAccessBoundaryPolicyRule.Effect result =
-          com.google.iam.v3.PrincipalAccessBoundaryPolicyRule.Effect.forNumber(effect_);
+          com.google.iam.v3.PrincipalAccessBoundaryPolicyRule.Effect.valueOf(effect_);
       return result == null
           ? com.google.iam.v3.PrincipalAccessBoundaryPolicyRule.Effect.UNRECOGNIZED
           : result;
@@ -1307,7 +1268,7 @@ public Builder setEffect(com.google.iam.v3.PrincipalAccessBoundaryPolicyRule.Eff
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000004;
+
       effect_ = value.getNumber();
       onChanged();
       return this;
@@ -1328,7 +1289,7 @@ public Builder setEffect(com.google.iam.v3.PrincipalAccessBoundaryPolicyRule.Eff
      * @return This builder for chaining.
      */
     public Builder clearEffect() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       effect_ = 0;
       onChanged();
       return this;
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyRuleOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyRuleOrBuilder.java
index 44162930d3..0c54ff0b32 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyRuleOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyRuleOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policy_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface PrincipalAccessBoundaryPolicyRuleOrBuilder
@@ -60,9 +59,7 @@ public interface PrincipalAccessBoundaryPolicyRuleOrBuilder
    * the rule, then the rule applies for that resource and its descendants. The
    * number of resources in a policy is limited to 500 across all rules in the
    * policy.
-   *
    * The following resource types are supported:
-   *
    * * Organizations, such as
    * `//cloudresourcemanager.googleapis.com/organizations/123`.
    * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -84,9 +81,7 @@ public interface PrincipalAccessBoundaryPolicyRuleOrBuilder
    * the rule, then the rule applies for that resource and its descendants. The
    * number of resources in a policy is limited to 500 across all rules in the
    * policy.
-   *
    * The following resource types are supported:
-   *
    * * Organizations, such as
    * `//cloudresourcemanager.googleapis.com/organizations/123`.
    * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -108,9 +103,7 @@ public interface PrincipalAccessBoundaryPolicyRuleOrBuilder
    * the rule, then the rule applies for that resource and its descendants. The
    * number of resources in a policy is limited to 500 across all rules in the
    * policy.
-   *
    * The following resource types are supported:
-   *
    * * Organizations, such as
    * `//cloudresourcemanager.googleapis.com/organizations/123`.
    * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -133,9 +126,7 @@ public interface PrincipalAccessBoundaryPolicyRuleOrBuilder
    * the rule, then the rule applies for that resource and its descendants. The
    * number of resources in a policy is limited to 500 across all rules in the
    * policy.
-   *
    * The following resource types are supported:
-   *
    * * Organizations, such as
    * `//cloudresourcemanager.googleapis.com/organizations/123`.
    * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsRequest.java
index 98afd0c839..5a0187cdd6 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SearchPrincipalAccessBoundaryPolicyBindingsRequest();
   }
 
+  @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.iam.v3.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3_SearchPrincipalAccessBoundaryPolicyBindingsRequest_descriptor;
@@ -68,9 +72,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -129,7 +131,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 3;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -137,7 +139,6 @@ public com.google.protobuf.ByteString getNameBytes() {
    * 
    * Optional. The maximum number of policy bindings to return. The service may
    * return fewer than this value.
-   *
    * If unspecified, at most 50 policy bindings will be returned.
    * The maximum value is 1000; values above 1000 will be coerced to 1000.
    * 

@@ -152,9 +153,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -163,7 +162,6 @@ public int getPageSize() {
    * Optional. A page token, received from a previous
    * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
    * retrieve the subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
    * that provided the page token.
@@ -193,7 +191,6 @@ public java.lang.String getPageToken() {
    * Optional. A page token, received from a previous
    * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
    * retrieve the subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
    * that provided the page token.
@@ -435,10 +432,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       pageSize_ = 0;
+
       pageToken_ = "";
+
       return this;
     }
 
@@ -468,27 +467,13 @@ public com.google.iam.v3.SearchPrincipalAccessBoundaryPolicyBindingsRequest buil
     public com.google.iam.v3.SearchPrincipalAccessBoundaryPolicyBindingsRequest buildPartial() {
       com.google.iam.v3.SearchPrincipalAccessBoundaryPolicyBindingsRequest result =
           new com.google.iam.v3.SearchPrincipalAccessBoundaryPolicyBindingsRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(
-        com.google.iam.v3.SearchPrincipalAccessBoundaryPolicyBindingsRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -540,7 +525,6 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -548,7 +532,6 @@ public Builder mergeFrom(
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -580,19 +563,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 24:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 24
             case 34:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 34
             default:
@@ -612,8 +595,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -690,8 +671,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -712,8 +693,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -739,8 +720,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -753,7 +734,6 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -773,7 +753,6 @@ public int getPageSize() {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -786,7 +765,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -797,7 +775,6 @@ public Builder setPageSize(int value) {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -807,7 +784,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -822,7 +799,6 @@ public Builder clearPageSize() {
      * Optional. A page token, received from a previous
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
      * retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
      * that provided the page token.
@@ -851,7 +827,6 @@ public java.lang.String getPageToken() {
      * Optional. A page token, received from a previous
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
      * retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
      * that provided the page token.
@@ -880,7 +855,6 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
      * Optional. A page token, received from a previous
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
      * retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
      * that provided the page token.
@@ -895,8 +869,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -908,7 +882,6 @@ public Builder setPageToken(java.lang.String value) {
      * Optional. A page token, received from a previous
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
      * retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
      * that provided the page token.
@@ -919,8 +892,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -932,7 +905,6 @@ public Builder clearPageToken() {
      * Optional. A page token, received from a previous
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
      * retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
      * that provided the page token.
@@ -948,8 +920,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsRequestOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsRequestOrBuilder.java
index ea59adb791..a807689e9c 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface SearchPrincipalAccessBoundaryPolicyBindingsRequestOrBuilder
@@ -64,7 +63,6 @@ public interface SearchPrincipalAccessBoundaryPolicyBindingsRequestOrBuilder
    * 
    * Optional. The maximum number of policy bindings to return. The service may
    * return fewer than this value.
-   *
    * If unspecified, at most 50 policy bindings will be returned.
    * The maximum value is 1000; values above 1000 will be coerced to 1000.
    * 

@@ -82,7 +80,6 @@ public interface SearchPrincipalAccessBoundaryPolicyBindingsRequestOrBuilder
    * Optional. A page token, received from a previous
    * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
    * retrieve the subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
    * that provided the page token.
@@ -101,7 +98,6 @@ public interface SearchPrincipalAccessBoundaryPolicyBindingsRequestOrBuilder
    * Optional. A page token, received from a previous
    * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
    * retrieve the subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
    * that provided the page token.
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsResponse.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsResponse.java
index 8caf5dce21..cef51d414a 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsResponse.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SearchPrincipalAccessBoundaryPolicyBindingsResponse();
   }
 
+  @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.iam.v3.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3_SearchPrincipalAccessBoundaryPolicyBindingsResponse_descriptor;
@@ -68,8 +72,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int POLICY_BINDINGS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List policyBindings_;
 
   /**
@@ -144,9 +146,7 @@ public com.google.iam.v3.PolicyBindingOrBuilder getPolicyBindingsOrBuilder(int i
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -410,7 +410,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (policyBindingsBuilder_ == null) {
         policyBindings_ = java.util.Collections.emptyList();
       } else {
@@ -419,6 +418,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -448,16 +448,7 @@ public com.google.iam.v3.SearchPrincipalAccessBoundaryPolicyBindingsResponse bui
     public com.google.iam.v3.SearchPrincipalAccessBoundaryPolicyBindingsResponse buildPartial() {
       com.google.iam.v3.SearchPrincipalAccessBoundaryPolicyBindingsResponse result =
           new com.google.iam.v3.SearchPrincipalAccessBoundaryPolicyBindingsResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(
-        com.google.iam.v3.SearchPrincipalAccessBoundaryPolicyBindingsResponse result) {
+      int from_bitField0_ = bitField0_;
       if (policyBindingsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           policyBindings_ = java.util.Collections.unmodifiableList(policyBindings_);
@@ -467,14 +458,9 @@ private void buildPartialRepeatedFields(
       } else {
         result.policyBindings_ = policyBindingsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(
-        com.google.iam.v3.SearchPrincipalAccessBoundaryPolicyBindingsResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -555,7 +541,6 @@ public Builder mergeFrom(
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -599,7 +584,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1056,8 +1041,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1075,8 +1060,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1099,8 +1084,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsResponseOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsResponseOrBuilder.java
index 7a3a1dd477..912ab4e27d 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsResponseOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface SearchPrincipalAccessBoundaryPolicyBindingsResponseOrBuilder
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsRequest.java
index ac93af4f7a..6c2372e77b 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SearchTargetPolicyBindingsRequest();
   }
 
+  @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.iam.v3.PolicyBindingsServiceProto
         .internal_static_google_iam_v3_SearchTargetPolicyBindingsRequest_descriptor;
@@ -68,18 +72,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int TARGET_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object target_ = "";
+  private volatile java.lang.Object target_;
 
   /**
    *
    *
    * 
    * Required. The target resource, which is bound to the policy in the binding.
-   *
    * Format:
-   *
    * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
    * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
    * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -110,9 +110,7 @@ public java.lang.String getTarget() {
    *
    * 
    * Required. The target resource, which is bound to the policy in the binding.
-   *
    * Format:
-   *
    * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
    * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
    * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -139,7 +137,7 @@ public com.google.protobuf.ByteString getTargetBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -147,7 +145,6 @@ public com.google.protobuf.ByteString getTargetBytes() {
    * 
    * Optional. The maximum number of policy bindings to return. The service may
    * return fewer than this value.
-   *
    * If unspecified, at most 50 policy bindings will be returned.
    * The maximum value is 1000; values above 1000 will be coerced to 1000.
    * 

@@ -162,9 +159,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -173,7 +168,6 @@ public int getPageSize() {
    * Optional. A page token, received from a previous
    * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
    * subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `SearchTargetPolicyBindingsRequest` must match the call that provided the
    * page token.
@@ -203,7 +197,6 @@ public java.lang.String getPageToken() {
    * Optional. A page token, received from a previous
    * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
    * subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `SearchTargetPolicyBindingsRequest` must match the call that provided the
    * page token.
@@ -227,9 +220,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 5;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -238,9 +229,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
    * Required. The parent resource where this search will be performed. This
    * should be the nearest Resource Manager resource (project, folder, or
    * organization) to the target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -273,9 +262,7 @@ public java.lang.String getParent() {
    * Required. The parent resource where this search will be performed. This
    * should be the nearest Resource Manager resource (project, folder, or
    * organization) to the target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -526,11 +513,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       target_ = "";
+
       pageSize_ = 0;
+
       pageToken_ = "";
+
       parent_ = "";
+
       return this;
     }
 
@@ -558,29 +548,14 @@ public com.google.iam.v3.SearchTargetPolicyBindingsRequest build() {
     public com.google.iam.v3.SearchTargetPolicyBindingsRequest buildPartial() {
       com.google.iam.v3.SearchTargetPolicyBindingsRequest result =
           new com.google.iam.v3.SearchTargetPolicyBindingsRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.target_ = target_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
+      result.parent_ = parent_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v3.SearchTargetPolicyBindingsRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.target_ = target_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.parent_ = parent_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -629,7 +604,6 @@ public Builder mergeFrom(com.google.iam.v3.SearchTargetPolicyBindingsRequest oth
         return this;
       if (!other.getTarget().isEmpty()) {
         target_ = other.target_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -637,12 +611,10 @@ public Builder mergeFrom(com.google.iam.v3.SearchTargetPolicyBindingsRequest oth
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -674,25 +646,25 @@ public Builder mergeFrom(
             case 10:
               {
                 target_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 42:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 42
             default:
@@ -712,8 +684,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object target_ = "";
 
     /**
@@ -721,9 +691,7 @@ public Builder mergeFrom(
      *
      * 
      * Required. The target resource, which is bound to the policy in the binding.
-     *
      * Format:
-     *
      * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
      * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
      * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -753,9 +721,7 @@ public java.lang.String getTarget() {
      *
      * 
      * Required. The target resource, which is bound to the policy in the binding.
-     *
      * Format:
-     *
      * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
      * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
      * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -785,9 +751,7 @@ public com.google.protobuf.ByteString getTargetBytes() {
      *
      * 
      * Required. The target resource, which is bound to the policy in the binding.
-     *
      * Format:
-     *
      * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
      * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
      * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -805,8 +769,8 @@ public Builder setTarget(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       target_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -816,9 +780,7 @@ public Builder setTarget(java.lang.String value) {
      *
      * 
      * Required. The target resource, which is bound to the policy in the binding.
-     *
      * Format:
-     *
      * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
      * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
      * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -832,8 +794,8 @@ public Builder setTarget(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTarget() {
+
       target_ = getDefaultInstance().getTarget();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -843,9 +805,7 @@ public Builder clearTarget() {
      *
      * 
      * Required. The target resource, which is bound to the policy in the binding.
-     *
      * Format:
-     *
      * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
      * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
      * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -864,8 +824,8 @@ public Builder setTargetBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       target_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -878,7 +838,6 @@ public Builder setTargetBytes(com.google.protobuf.ByteString value) {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -898,7 +857,6 @@ public int getPageSize() {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -911,7 +869,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -922,7 +879,6 @@ public Builder setPageSize(int value) {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -932,7 +888,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -947,7 +903,6 @@ public Builder clearPageSize() {
      * Optional. A page token, received from a previous
      * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchTargetPolicyBindingsRequest` must match the call that provided the
      * page token.
@@ -976,7 +931,6 @@ public java.lang.String getPageToken() {
      * Optional. A page token, received from a previous
      * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchTargetPolicyBindingsRequest` must match the call that provided the
      * page token.
@@ -1005,7 +959,6 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
      * Optional. A page token, received from a previous
      * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchTargetPolicyBindingsRequest` must match the call that provided the
      * page token.
@@ -1020,8 +973,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1033,7 +986,6 @@ public Builder setPageToken(java.lang.String value) {
      * Optional. A page token, received from a previous
      * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchTargetPolicyBindingsRequest` must match the call that provided the
      * page token.
@@ -1044,8 +996,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1057,7 +1009,6 @@ public Builder clearPageToken() {
      * Optional. A page token, received from a previous
      * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchTargetPolicyBindingsRequest` must match the call that provided the
      * page token.
@@ -1073,8 +1024,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1088,9 +1039,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
      * Required. The parent resource where this search will be performed. This
      * should be the nearest Resource Manager resource (project, folder, or
      * organization) to the target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -1122,9 +1071,7 @@ public java.lang.String getParent() {
      * Required. The parent resource where this search will be performed. This
      * should be the nearest Resource Manager resource (project, folder, or
      * organization) to the target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -1156,9 +1103,7 @@ public com.google.protobuf.ByteString getParentBytes() {
      * Required. The parent resource where this search will be performed. This
      * should be the nearest Resource Manager resource (project, folder, or
      * organization) to the target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -1176,8 +1121,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1189,9 +1134,7 @@ public Builder setParent(java.lang.String value) {
      * Required. The parent resource where this search will be performed. This
      * should be the nearest Resource Manager resource (project, folder, or
      * organization) to the target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -1205,8 +1148,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1218,9 +1161,7 @@ public Builder clearParent() {
      * Required. The parent resource where this search will be performed. This
      * should be the nearest Resource Manager resource (project, folder, or
      * organization) to the target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -1239,8 +1180,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsRequestOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsRequestOrBuilder.java
index f82c3bdc00..d203f8b8a4 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface SearchTargetPolicyBindingsRequestOrBuilder
@@ -29,9 +28,7 @@ public interface SearchTargetPolicyBindingsRequestOrBuilder
    *
    * 
    * Required. The target resource, which is bound to the policy in the binding.
-   *
    * Format:
-   *
    * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
    * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
    * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -51,9 +48,7 @@ public interface SearchTargetPolicyBindingsRequestOrBuilder
    *
    * 
    * Required. The target resource, which is bound to the policy in the binding.
-   *
    * Format:
-   *
    * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
    * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
    * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -74,7 +69,6 @@ public interface SearchTargetPolicyBindingsRequestOrBuilder
    * 
    * Optional. The maximum number of policy bindings to return. The service may
    * return fewer than this value.
-   *
    * If unspecified, at most 50 policy bindings will be returned.
    * The maximum value is 1000; values above 1000 will be coerced to 1000.
    * 

@@ -92,7 +86,6 @@ public interface SearchTargetPolicyBindingsRequestOrBuilder
    * Optional. A page token, received from a previous
    * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
    * subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `SearchTargetPolicyBindingsRequest` must match the call that provided the
    * page token.
@@ -111,7 +104,6 @@ public interface SearchTargetPolicyBindingsRequestOrBuilder
    * Optional. A page token, received from a previous
    * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
    * subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `SearchTargetPolicyBindingsRequest` must match the call that provided the
    * page token.
@@ -130,9 +122,7 @@ public interface SearchTargetPolicyBindingsRequestOrBuilder
    * Required. The parent resource where this search will be performed. This
    * should be the nearest Resource Manager resource (project, folder, or
    * organization) to the target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -154,9 +144,7 @@ public interface SearchTargetPolicyBindingsRequestOrBuilder
    * Required. The parent resource where this search will be performed. This
    * should be the nearest Resource Manager resource (project, folder, or
    * organization) to the target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsResponse.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsResponse.java
index a3c1212fd0..7b46d6a636 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsResponse.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SearchTargetPolicyBindingsResponse();
   }
 
+  @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.iam.v3.PolicyBindingsServiceProto
         .internal_static_google_iam_v3_SearchTargetPolicyBindingsResponse_descriptor;
@@ -67,8 +71,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int POLICY_BINDINGS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List policyBindings_;
 
   /**
@@ -143,9 +145,7 @@ public com.google.iam.v3.PolicyBindingOrBuilder getPolicyBindingsOrBuilder(int i
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -406,7 +406,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (policyBindingsBuilder_ == null) {
         policyBindings_ = java.util.Collections.emptyList();
       } else {
@@ -415,6 +414,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -442,16 +442,7 @@ public com.google.iam.v3.SearchTargetPolicyBindingsResponse build() {
     public com.google.iam.v3.SearchTargetPolicyBindingsResponse buildPartial() {
       com.google.iam.v3.SearchTargetPolicyBindingsResponse result =
           new com.google.iam.v3.SearchTargetPolicyBindingsResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(
-        com.google.iam.v3.SearchTargetPolicyBindingsResponse result) {
+      int from_bitField0_ = bitField0_;
       if (policyBindingsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           policyBindings_ = java.util.Collections.unmodifiableList(policyBindings_);
@@ -461,13 +452,9 @@ private void buildPartialRepeatedFields(
       } else {
         result.policyBindings_ = policyBindingsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.iam.v3.SearchTargetPolicyBindingsResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -545,7 +532,6 @@ public Builder mergeFrom(com.google.iam.v3.SearchTargetPolicyBindingsResponse ot
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -589,7 +575,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1046,8 +1032,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1065,8 +1051,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1089,8 +1075,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsResponseOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsResponseOrBuilder.java
index 8229fc6b6e..fba222dd40 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsResponseOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface SearchTargetPolicyBindingsResponseOrBuilder
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePolicyBindingRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePolicyBindingRequest.java
index e0ae493579..1d1c74f116 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePolicyBindingRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePolicyBindingRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -47,6 +46,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new UpdatePolicyBindingRequest();
   }
 
+  @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.iam.v3.PolicyBindingsServiceProto
         .internal_static_google_iam_v3_UpdatePolicyBindingRequest_descriptor;
@@ -62,7 +66,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v3.UpdatePolicyBindingRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int POLICY_BINDING_FIELD_NUMBER = 1;
   private com.google.iam.v3.PolicyBinding policyBinding_;
 
@@ -71,7 +74,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * Required. The policy binding to update.
-   *
    * The policy binding's `name` field is used to identify the policy binding to
    * update.
    * 

@@ -84,7 +86,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasPolicyBinding() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return policyBinding_ != null;
   }
 
   /**
@@ -92,7 +94,6 @@ public boolean hasPolicyBinding() {
    *
    * 
    * Required. The policy binding to update.
-   *
    * The policy binding's `name` field is used to identify the policy binding to
    * update.
    * 

@@ -115,7 +116,6 @@ public com.google.iam.v3.PolicyBinding getPolicyBinding() {
    *
    * 
    * Required. The policy binding to update.
-   *
    * The policy binding's `name` field is used to identify the policy binding to
    * update.
    * 

@@ -126,13 +126,11 @@ public com.google.iam.v3.PolicyBinding getPolicyBinding() {
    */
   @java.lang.Override
   public com.google.iam.v3.PolicyBindingOrBuilder getPolicyBindingOrBuilder() {
-    return policyBinding_ == null
-        ? com.google.iam.v3.PolicyBinding.getDefaultInstance()
-        : policyBinding_;
+    return getPolicyBinding();
   }
 
   public static final int VALIDATE_ONLY_FIELD_NUMBER = 2;
-  private boolean validateOnly_ = false;
+  private boolean validateOnly_;
 
   /**
    *
@@ -168,7 +166,7 @@ public boolean getValidateOnly() {
    */
   @java.lang.Override
   public boolean hasUpdateMask() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return updateMask_ != null;
   }
 
   /**
@@ -200,7 +198,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+    return getUpdateMask();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -217,13 +215,13 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policyBinding_ != null) {
       output.writeMessage(1, getPolicyBinding());
     }
     if (validateOnly_ != false) {
       output.writeBool(2, validateOnly_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateMask_ != null) {
       output.writeMessage(3, getUpdateMask());
     }
     getUnknownFields().writeTo(output);
@@ -235,13 +233,13 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policyBinding_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getPolicyBinding());
     }
     if (validateOnly_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(2, validateOnly_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateMask_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getUpdateMask());
     }
     size += getUnknownFields().getSerializedSize();
@@ -420,35 +418,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.UpdatePolicyBindingRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPolicyBindingFieldBuilder();
-        getUpdateMaskFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      policyBinding_ = null;
-      if (policyBindingBuilder_ != null) {
-        policyBindingBuilder_.dispose();
+      if (policyBindingBuilder_ == null) {
+        policyBinding_ = null;
+      } else {
+        policyBinding_ = null;
         policyBindingBuilder_ = null;
       }
       validateOnly_ = false;
-      updateMask_ = null;
-      if (updateMaskBuilder_ != null) {
-        updateMaskBuilder_.dispose();
+
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+      } else {
+        updateMask_ = null;
         updateMaskBuilder_ = null;
       }
       return this;
@@ -478,31 +468,21 @@ public com.google.iam.v3.UpdatePolicyBindingRequest build() {
     public com.google.iam.v3.UpdatePolicyBindingRequest buildPartial() {
       com.google.iam.v3.UpdatePolicyBindingRequest result =
           new com.google.iam.v3.UpdatePolicyBindingRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (policyBindingBuilder_ == null) {
+        result.policyBinding_ = policyBinding_;
+      } else {
+        result.policyBinding_ = policyBindingBuilder_.build();
+      }
+      result.validateOnly_ = validateOnly_;
+      if (updateMaskBuilder_ == null) {
+        result.updateMask_ = updateMask_;
+      } else {
+        result.updateMask_ = updateMaskBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v3.UpdatePolicyBindingRequest result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.policyBinding_ =
-            policyBindingBuilder_ == null ? policyBinding_ : policyBindingBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.validateOnly_ = validateOnly_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -586,19 +566,19 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getPolicyBindingFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 validateOnly_ = input.readBool();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -618,8 +598,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.iam.v3.PolicyBinding policyBinding_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.iam.v3.PolicyBinding,
@@ -632,7 +610,6 @@ public Builder mergeFrom(
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -644,7 +621,7 @@ public Builder mergeFrom(
      * @return Whether the policyBinding field is set.
      */
     public boolean hasPolicyBinding() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return policyBindingBuilder_ != null || policyBinding_ != null;
     }
 
     /**
@@ -652,7 +629,6 @@ public boolean hasPolicyBinding() {
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -678,7 +654,6 @@ public com.google.iam.v3.PolicyBinding getPolicyBinding() {
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -693,11 +668,11 @@ public Builder setPolicyBinding(com.google.iam.v3.PolicyBinding value) {
           throw new NullPointerException();
         }
         policyBinding_ = value;
+        onChanged();
       } else {
         policyBindingBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -706,7 +681,6 @@ public Builder setPolicyBinding(com.google.iam.v3.PolicyBinding value) {
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -718,11 +692,11 @@ public Builder setPolicyBinding(com.google.iam.v3.PolicyBinding value) {
     public Builder setPolicyBinding(com.google.iam.v3.PolicyBinding.Builder builderForValue) {
       if (policyBindingBuilder_ == null) {
         policyBinding_ = builderForValue.build();
+        onChanged();
       } else {
         policyBindingBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -731,7 +705,6 @@ public Builder setPolicyBinding(com.google.iam.v3.PolicyBinding.Builder builderF
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -742,20 +715,19 @@ public Builder setPolicyBinding(com.google.iam.v3.PolicyBinding.Builder builderF
      */
     public Builder mergePolicyBinding(com.google.iam.v3.PolicyBinding value) {
       if (policyBindingBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && policyBinding_ != null
-            && policyBinding_ != com.google.iam.v3.PolicyBinding.getDefaultInstance()) {
-          getPolicyBindingBuilder().mergeFrom(value);
+        if (policyBinding_ != null) {
+          policyBinding_ =
+              com.google.iam.v3.PolicyBinding.newBuilder(policyBinding_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           policyBinding_ = value;
         }
+        onChanged();
       } else {
         policyBindingBuilder_.mergeFrom(value);
       }
-      if (policyBinding_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -764,7 +736,6 @@ public Builder mergePolicyBinding(com.google.iam.v3.PolicyBinding value) {
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -774,13 +745,14 @@ public Builder mergePolicyBinding(com.google.iam.v3.PolicyBinding value) {
      * 
      */
     public Builder clearPolicyBinding() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      policyBinding_ = null;
-      if (policyBindingBuilder_ != null) {
-        policyBindingBuilder_.dispose();
+      if (policyBindingBuilder_ == null) {
+        policyBinding_ = null;
+        onChanged();
+      } else {
+        policyBinding_ = null;
         policyBindingBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -789,7 +761,6 @@ public Builder clearPolicyBinding() {
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -799,7 +770,7 @@ public Builder clearPolicyBinding() {
      * 
      */
     public com.google.iam.v3.PolicyBinding.Builder getPolicyBindingBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getPolicyBindingFieldBuilder().getBuilder();
     }
@@ -809,7 +780,6 @@ public com.google.iam.v3.PolicyBinding.Builder getPolicyBindingBuilder() {
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -833,7 +803,6 @@ public com.google.iam.v3.PolicyBindingOrBuilder getPolicyBindingOrBuilder() {
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -894,7 +863,6 @@ public boolean getValidateOnly() {
     public Builder setValidateOnly(boolean value) {
 
       validateOnly_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -912,7 +880,7 @@ public Builder setValidateOnly(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearValidateOnly() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       validateOnly_ = false;
       onChanged();
       return this;
@@ -938,7 +906,7 @@ public Builder clearValidateOnly() {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return updateMaskBuilder_ != null || updateMask_ != null;
     }
 
     /**
@@ -979,11 +947,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
+        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1000,11 +968,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
+        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1020,20 +988,17 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && updateMask_ != null
-            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
-          getUpdateMaskBuilder().mergeFrom(value);
+        if (updateMask_ != null) {
+          updateMask_ =
+              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
         } else {
           updateMask_ = value;
         }
+        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-      if (updateMask_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1048,13 +1013,14 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * 
      */
     public Builder clearUpdateMask() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      updateMask_ = null;
-      if (updateMaskBuilder_ != null) {
-        updateMaskBuilder_.dispose();
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+        onChanged();
+      } else {
+        updateMask_ = null;
         updateMaskBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1069,7 +1035,7 @@ public Builder clearUpdateMask() {
      * 
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePolicyBindingRequestOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePolicyBindingRequestOrBuilder.java
index 1c6ad03408..413348b4ef 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePolicyBindingRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePolicyBindingRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface UpdatePolicyBindingRequestOrBuilder
@@ -29,7 +28,6 @@ public interface UpdatePolicyBindingRequestOrBuilder
    *
    * 
    * Required. The policy binding to update.
-   *
    * The policy binding's `name` field is used to identify the policy binding to
    * update.
    * 

@@ -47,7 +45,6 @@ public interface UpdatePolicyBindingRequestOrBuilder
    *
    * 
    * Required. The policy binding to update.
-   *
    * The policy binding's `name` field is used to identify the policy binding to
    * update.
    * 

@@ -65,7 +62,6 @@ public interface UpdatePolicyBindingRequestOrBuilder
    *
    * 
    * Required. The policy binding to update.
-   *
    * The policy binding's `name` field is used to identify the policy binding to
    * update.
    * 

diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePrincipalAccessBoundaryPolicyRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePrincipalAccessBoundaryPolicyRequest.java
index 3f271336fd..3a71f44716 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePrincipalAccessBoundaryPolicyRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePrincipalAccessBoundaryPolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new UpdatePrincipalAccessBoundaryPolicyRequest();
   }
 
+  @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.iam.v3.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3_UpdatePrincipalAccessBoundaryPolicyRequest_descriptor;
@@ -64,7 +68,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v3.UpdatePrincipalAccessBoundaryPolicyRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int PRINCIPAL_ACCESS_BOUNDARY_POLICY_FIELD_NUMBER = 1;
   private com.google.iam.v3.PrincipalAccessBoundaryPolicy principalAccessBoundaryPolicy_;
 
@@ -73,7 +76,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * Required. The principal access boundary policy to update.
-   *
    * The principal access boundary policy's `name` field is used to identify the
    * policy to update.
    * 

@@ -86,7 +88,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasPrincipalAccessBoundaryPolicy() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return principalAccessBoundaryPolicy_ != null;
   }
 
   /**
@@ -94,7 +96,6 @@ public boolean hasPrincipalAccessBoundaryPolicy() {
    *
    * 
    * Required. The principal access boundary policy to update.
-   *
    * The principal access boundary policy's `name` field is used to identify the
    * policy to update.
    * 

@@ -117,7 +118,6 @@ public com.google.iam.v3.PrincipalAccessBoundaryPolicy getPrincipalAccessBoundar
    *
    * 
    * Required. The principal access boundary policy to update.
-   *
    * The principal access boundary policy's `name` field is used to identify the
    * policy to update.
    * 

@@ -129,13 +129,11 @@ public com.google.iam.v3.PrincipalAccessBoundaryPolicy getPrincipalAccessBoundar
   @java.lang.Override
   public com.google.iam.v3.PrincipalAccessBoundaryPolicyOrBuilder
       getPrincipalAccessBoundaryPolicyOrBuilder() {
-    return principalAccessBoundaryPolicy_ == null
-        ? com.google.iam.v3.PrincipalAccessBoundaryPolicy.getDefaultInstance()
-        : principalAccessBoundaryPolicy_;
+    return getPrincipalAccessBoundaryPolicy();
   }
 
   public static final int VALIDATE_ONLY_FIELD_NUMBER = 2;
-  private boolean validateOnly_ = false;
+  private boolean validateOnly_;
 
   /**
    *
@@ -171,7 +169,7 @@ public boolean getValidateOnly() {
    */
   @java.lang.Override
   public boolean hasUpdateMask() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return updateMask_ != null;
   }
 
   /**
@@ -203,7 +201,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+    return getUpdateMask();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -220,13 +218,13 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (principalAccessBoundaryPolicy_ != null) {
       output.writeMessage(1, getPrincipalAccessBoundaryPolicy());
     }
     if (validateOnly_ != false) {
       output.writeBool(2, validateOnly_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateMask_ != null) {
       output.writeMessage(3, getUpdateMask());
     }
     getUnknownFields().writeTo(output);
@@ -238,7 +236,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (principalAccessBoundaryPolicy_ != null) {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               1, getPrincipalAccessBoundaryPolicy());
@@ -246,7 +244,7 @@ public int getSerializedSize() {
     if (validateOnly_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(2, validateOnly_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateMask_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getUpdateMask());
     }
     size += getUnknownFields().getSerializedSize();
@@ -428,35 +426,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.UpdatePrincipalAccessBoundaryPolicyRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPrincipalAccessBoundaryPolicyFieldBuilder();
-        getUpdateMaskFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      principalAccessBoundaryPolicy_ = null;
-      if (principalAccessBoundaryPolicyBuilder_ != null) {
-        principalAccessBoundaryPolicyBuilder_.dispose();
+      if (principalAccessBoundaryPolicyBuilder_ == null) {
+        principalAccessBoundaryPolicy_ = null;
+      } else {
+        principalAccessBoundaryPolicy_ = null;
         principalAccessBoundaryPolicyBuilder_ = null;
       }
       validateOnly_ = false;
-      updateMask_ = null;
-      if (updateMaskBuilder_ != null) {
-        updateMaskBuilder_.dispose();
+
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+      } else {
+        updateMask_ = null;
         updateMaskBuilder_ = null;
       }
       return this;
@@ -487,34 +477,21 @@ public com.google.iam.v3.UpdatePrincipalAccessBoundaryPolicyRequest build() {
     public com.google.iam.v3.UpdatePrincipalAccessBoundaryPolicyRequest buildPartial() {
       com.google.iam.v3.UpdatePrincipalAccessBoundaryPolicyRequest result =
           new com.google.iam.v3.UpdatePrincipalAccessBoundaryPolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (principalAccessBoundaryPolicyBuilder_ == null) {
+        result.principalAccessBoundaryPolicy_ = principalAccessBoundaryPolicy_;
+      } else {
+        result.principalAccessBoundaryPolicy_ = principalAccessBoundaryPolicyBuilder_.build();
+      }
+      result.validateOnly_ = validateOnly_;
+      if (updateMaskBuilder_ == null) {
+        result.updateMask_ = updateMask_;
+      } else {
+        result.updateMask_ = updateMaskBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(
-        com.google.iam.v3.UpdatePrincipalAccessBoundaryPolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.principalAccessBoundaryPolicy_ =
-            principalAccessBoundaryPolicyBuilder_ == null
-                ? principalAccessBoundaryPolicy_
-                : principalAccessBoundaryPolicyBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.validateOnly_ = validateOnly_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -601,19 +578,19 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getPrincipalAccessBoundaryPolicyFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 validateOnly_ = input.readBool();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -633,8 +610,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.iam.v3.PrincipalAccessBoundaryPolicy principalAccessBoundaryPolicy_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.iam.v3.PrincipalAccessBoundaryPolicy,
@@ -647,7 +622,6 @@ public Builder mergeFrom(
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -659,7 +633,8 @@ public Builder mergeFrom(
      * @return Whether the principalAccessBoundaryPolicy field is set.
      */
     public boolean hasPrincipalAccessBoundaryPolicy() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return principalAccessBoundaryPolicyBuilder_ != null
+          || principalAccessBoundaryPolicy_ != null;
     }
 
     /**
@@ -667,7 +642,6 @@ public boolean hasPrincipalAccessBoundaryPolicy() {
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -693,7 +667,6 @@ public com.google.iam.v3.PrincipalAccessBoundaryPolicy getPrincipalAccessBoundar
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -709,11 +682,11 @@ public Builder setPrincipalAccessBoundaryPolicy(
           throw new NullPointerException();
         }
         principalAccessBoundaryPolicy_ = value;
+        onChanged();
       } else {
         principalAccessBoundaryPolicyBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -722,7 +695,6 @@ public Builder setPrincipalAccessBoundaryPolicy(
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -735,11 +707,11 @@ public Builder setPrincipalAccessBoundaryPolicy(
         com.google.iam.v3.PrincipalAccessBoundaryPolicy.Builder builderForValue) {
       if (principalAccessBoundaryPolicyBuilder_ == null) {
         principalAccessBoundaryPolicy_ = builderForValue.build();
+        onChanged();
       } else {
         principalAccessBoundaryPolicyBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -748,7 +720,6 @@ public Builder setPrincipalAccessBoundaryPolicy(
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -760,21 +731,20 @@ public Builder setPrincipalAccessBoundaryPolicy(
     public Builder mergePrincipalAccessBoundaryPolicy(
         com.google.iam.v3.PrincipalAccessBoundaryPolicy value) {
       if (principalAccessBoundaryPolicyBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && principalAccessBoundaryPolicy_ != null
-            && principalAccessBoundaryPolicy_
-                != com.google.iam.v3.PrincipalAccessBoundaryPolicy.getDefaultInstance()) {
-          getPrincipalAccessBoundaryPolicyBuilder().mergeFrom(value);
+        if (principalAccessBoundaryPolicy_ != null) {
+          principalAccessBoundaryPolicy_ =
+              com.google.iam.v3.PrincipalAccessBoundaryPolicy.newBuilder(
+                      principalAccessBoundaryPolicy_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           principalAccessBoundaryPolicy_ = value;
         }
+        onChanged();
       } else {
         principalAccessBoundaryPolicyBuilder_.mergeFrom(value);
       }
-      if (principalAccessBoundaryPolicy_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -783,7 +753,6 @@ public Builder mergePrincipalAccessBoundaryPolicy(
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -793,13 +762,14 @@ public Builder mergePrincipalAccessBoundaryPolicy(
      * 
      */
     public Builder clearPrincipalAccessBoundaryPolicy() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      principalAccessBoundaryPolicy_ = null;
-      if (principalAccessBoundaryPolicyBuilder_ != null) {
-        principalAccessBoundaryPolicyBuilder_.dispose();
+      if (principalAccessBoundaryPolicyBuilder_ == null) {
+        principalAccessBoundaryPolicy_ = null;
+        onChanged();
+      } else {
+        principalAccessBoundaryPolicy_ = null;
         principalAccessBoundaryPolicyBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -808,7 +778,6 @@ public Builder clearPrincipalAccessBoundaryPolicy() {
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -819,7 +788,7 @@ public Builder clearPrincipalAccessBoundaryPolicy() {
      */
     public com.google.iam.v3.PrincipalAccessBoundaryPolicy.Builder
         getPrincipalAccessBoundaryPolicyBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getPrincipalAccessBoundaryPolicyFieldBuilder().getBuilder();
     }
@@ -829,7 +798,6 @@ public Builder clearPrincipalAccessBoundaryPolicy() {
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -854,7 +822,6 @@ public Builder clearPrincipalAccessBoundaryPolicy() {
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -915,7 +882,6 @@ public boolean getValidateOnly() {
     public Builder setValidateOnly(boolean value) {
 
       validateOnly_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -933,7 +899,7 @@ public Builder setValidateOnly(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearValidateOnly() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       validateOnly_ = false;
       onChanged();
       return this;
@@ -959,7 +925,7 @@ public Builder clearValidateOnly() {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return updateMaskBuilder_ != null || updateMask_ != null;
     }
 
     /**
@@ -1000,11 +966,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
+        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1021,11 +987,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
+        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1041,20 +1007,17 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && updateMask_ != null
-            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
-          getUpdateMaskBuilder().mergeFrom(value);
+        if (updateMask_ != null) {
+          updateMask_ =
+              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
         } else {
           updateMask_ = value;
         }
+        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-      if (updateMask_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1069,13 +1032,14 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * 
      */
     public Builder clearUpdateMask() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      updateMask_ = null;
-      if (updateMaskBuilder_ != null) {
-        updateMaskBuilder_.dispose();
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+        onChanged();
+      } else {
+        updateMask_ = null;
         updateMaskBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1090,7 +1054,7 @@ public Builder clearUpdateMask() {
      * 
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePrincipalAccessBoundaryPolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePrincipalAccessBoundaryPolicyRequestOrBuilder.java
index 4d3f5b0516..52f833c4c2 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePrincipalAccessBoundaryPolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePrincipalAccessBoundaryPolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3;
 
 public interface UpdatePrincipalAccessBoundaryPolicyRequestOrBuilder
@@ -29,7 +28,6 @@ public interface UpdatePrincipalAccessBoundaryPolicyRequestOrBuilder
    *
    * 
    * Required. The principal access boundary policy to update.
-   *
    * The principal access boundary policy's `name` field is used to identify the
    * policy to update.
    * 

@@ -47,7 +45,6 @@ public interface UpdatePrincipalAccessBoundaryPolicyRequestOrBuilder
    *
    * 
    * Required. The principal access boundary policy to update.
-   *
    * The principal access boundary policy's `name` field is used to identify the
    * policy to update.
    * 

@@ -65,7 +62,6 @@ public interface UpdatePrincipalAccessBoundaryPolicyRequestOrBuilder
    *
    * 
    * Required. The principal access boundary policy to update.
-   *
    * The principal access boundary policy's `name` field is used to identify the
    * policy to update.
    * 

diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePolicyBindingRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePolicyBindingRequest.java
index 64277bd73c..5a30312668 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePolicyBindingRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePolicyBindingRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CreatePolicyBindingRequest();
   }
 
+  @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.iam.v3beta.PolicyBindingsServiceProto
         .internal_static_google_iam_v3beta_CreatePolicyBindingRequest_descriptor;
@@ -65,11 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v3beta.CreatePolicyBindingRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int PARENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -78,9 +79,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * Required. The parent resource where this policy binding will be created.
    * The binding parent is the closest Resource Manager resource (project,
    * folder or organization) to the binding target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -113,9 +112,7 @@ public java.lang.String getParent() {
    * Required. The parent resource where this policy binding will be created.
    * The binding parent is the closest Resource Manager resource (project,
    * folder or organization) to the binding target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -142,9 +139,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int POLICY_BINDING_ID_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object policyBindingId_ = "";
+  private volatile java.lang.Object policyBindingId_;
 
   /**
    *
@@ -152,7 +147,6 @@ public com.google.protobuf.ByteString getParentBytes() {
    * 
    * Required. The ID to use for the policy binding, which will become the final
    * component of the policy binding's resource name.
-   *
    * This value must start with a lowercase letter followed by up to 62
    * lowercase letters, numbers, hyphens, or dots. Pattern,
    * /[a-z][a-z0-9-\.]{2,62}/.
@@ -181,7 +175,6 @@ public java.lang.String getPolicyBindingId() {
    * 
    * Required. The ID to use for the policy binding, which will become the final
    * component of the policy binding's resource name.
-   *
    * This value must start with a lowercase letter followed by up to 62
    * lowercase letters, numbers, hyphens, or dots. Pattern,
    * /[a-z][a-z0-9-\.]{2,62}/.
@@ -222,7 +215,7 @@ public com.google.protobuf.ByteString getPolicyBindingIdBytes() {
    */
   @java.lang.Override
   public boolean hasPolicyBinding() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return policyBinding_ != null;
   }
 
   /**
@@ -258,13 +251,11 @@ public com.google.iam.v3beta.PolicyBinding getPolicyBinding() {
    */
   @java.lang.Override
   public com.google.iam.v3beta.PolicyBindingOrBuilder getPolicyBindingOrBuilder() {
-    return policyBinding_ == null
-        ? com.google.iam.v3beta.PolicyBinding.getDefaultInstance()
-        : policyBinding_;
+    return getPolicyBinding();
   }
 
   public static final int VALIDATE_ONLY_FIELD_NUMBER = 4;
-  private boolean validateOnly_ = false;
+  private boolean validateOnly_;
 
   /**
    *
@@ -303,7 +294,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policyBindingId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, policyBindingId_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policyBinding_ != null) {
       output.writeMessage(3, getPolicyBinding());
     }
     if (validateOnly_ != false) {
@@ -324,7 +315,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policyBindingId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, policyBindingId_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policyBinding_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getPolicyBinding());
     }
     if (validateOnly_ != false) {
@@ -504,33 +495,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.CreatePolicyBindingRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPolicyBindingFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       parent_ = "";
+
       policyBindingId_ = "";
-      policyBinding_ = null;
-      if (policyBindingBuilder_ != null) {
-        policyBindingBuilder_.dispose();
+
+      if (policyBindingBuilder_ == null) {
+        policyBinding_ = null;
+      } else {
+        policyBinding_ = null;
         policyBindingBuilder_ = null;
       }
       validateOnly_ = false;
+
       return this;
     }
 
@@ -558,33 +543,18 @@ public com.google.iam.v3beta.CreatePolicyBindingRequest build() {
     public com.google.iam.v3beta.CreatePolicyBindingRequest buildPartial() {
       com.google.iam.v3beta.CreatePolicyBindingRequest result =
           new com.google.iam.v3beta.CreatePolicyBindingRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.parent_ = parent_;
+      result.policyBindingId_ = policyBindingId_;
+      if (policyBindingBuilder_ == null) {
+        result.policyBinding_ = policyBinding_;
+      } else {
+        result.policyBinding_ = policyBindingBuilder_.build();
       }
+      result.validateOnly_ = validateOnly_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v3beta.CreatePolicyBindingRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.parent_ = parent_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.policyBindingId_ = policyBindingId_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.policyBinding_ =
-            policyBindingBuilder_ == null ? policyBinding_ : policyBindingBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.validateOnly_ = validateOnly_;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -633,12 +603,10 @@ public Builder mergeFrom(com.google.iam.v3beta.CreatePolicyBindingRequest other)
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getPolicyBindingId().isEmpty()) {
         policyBindingId_ = other.policyBindingId_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasPolicyBinding()) {
@@ -676,25 +644,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 policyBindingId_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getPolicyBindingFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 32:
               {
                 validateOnly_ = input.readBool();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             default:
@@ -714,8 +682,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object parent_ = "";
 
     /**
@@ -725,9 +691,7 @@ public Builder mergeFrom(
      * Required. The parent resource where this policy binding will be created.
      * The binding parent is the closest Resource Manager resource (project,
      * folder or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -759,9 +723,7 @@ public java.lang.String getParent() {
      * Required. The parent resource where this policy binding will be created.
      * The binding parent is the closest Resource Manager resource (project,
      * folder or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -793,9 +755,7 @@ public com.google.protobuf.ByteString getParentBytes() {
      * Required. The parent resource where this policy binding will be created.
      * The binding parent is the closest Resource Manager resource (project,
      * folder or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -813,8 +773,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -826,9 +786,7 @@ public Builder setParent(java.lang.String value) {
      * Required. The parent resource where this policy binding will be created.
      * The binding parent is the closest Resource Manager resource (project,
      * folder or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -842,8 +800,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -855,9 +813,7 @@ public Builder clearParent() {
      * Required. The parent resource where this policy binding will be created.
      * The binding parent is the closest Resource Manager resource (project,
      * folder or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -876,8 +832,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -890,7 +846,6 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * 
      * Required. The ID to use for the policy binding, which will become the final
      * component of the policy binding's resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -918,7 +873,6 @@ public java.lang.String getPolicyBindingId() {
      * 
      * Required. The ID to use for the policy binding, which will become the final
      * component of the policy binding's resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -946,7 +900,6 @@ public com.google.protobuf.ByteString getPolicyBindingIdBytes() {
      * 
      * Required. The ID to use for the policy binding, which will become the final
      * component of the policy binding's resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -961,8 +914,8 @@ public Builder setPolicyBindingId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       policyBindingId_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -973,7 +926,6 @@ public Builder setPolicyBindingId(java.lang.String value) {
      * 
      * Required. The ID to use for the policy binding, which will become the final
      * component of the policy binding's resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -984,8 +936,8 @@ public Builder setPolicyBindingId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPolicyBindingId() {
+
       policyBindingId_ = getDefaultInstance().getPolicyBindingId();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -996,7 +948,6 @@ public Builder clearPolicyBindingId() {
      * 
      * Required. The ID to use for the policy binding, which will become the final
      * component of the policy binding's resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -1012,8 +963,8 @@ public Builder setPolicyBindingIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       policyBindingId_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1039,7 +990,7 @@ public Builder setPolicyBindingIdBytes(com.google.protobuf.ByteString value) {
      * @return Whether the policyBinding field is set.
      */
     public boolean hasPolicyBinding() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return policyBindingBuilder_ != null || policyBinding_ != null;
     }
 
     /**
@@ -1082,11 +1033,11 @@ public Builder setPolicyBinding(com.google.iam.v3beta.PolicyBinding value) {
           throw new NullPointerException();
         }
         policyBinding_ = value;
+        onChanged();
       } else {
         policyBindingBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1104,11 +1055,11 @@ public Builder setPolicyBinding(com.google.iam.v3beta.PolicyBinding value) {
     public Builder setPolicyBinding(com.google.iam.v3beta.PolicyBinding.Builder builderForValue) {
       if (policyBindingBuilder_ == null) {
         policyBinding_ = builderForValue.build();
+        onChanged();
       } else {
         policyBindingBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1125,20 +1076,19 @@ public Builder setPolicyBinding(com.google.iam.v3beta.PolicyBinding.Builder buil
      */
     public Builder mergePolicyBinding(com.google.iam.v3beta.PolicyBinding value) {
       if (policyBindingBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && policyBinding_ != null
-            && policyBinding_ != com.google.iam.v3beta.PolicyBinding.getDefaultInstance()) {
-          getPolicyBindingBuilder().mergeFrom(value);
+        if (policyBinding_ != null) {
+          policyBinding_ =
+              com.google.iam.v3beta.PolicyBinding.newBuilder(policyBinding_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           policyBinding_ = value;
         }
+        onChanged();
       } else {
         policyBindingBuilder_.mergeFrom(value);
       }
-      if (policyBinding_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1154,13 +1104,14 @@ public Builder mergePolicyBinding(com.google.iam.v3beta.PolicyBinding value) {
      * 
      */
     public Builder clearPolicyBinding() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      policyBinding_ = null;
-      if (policyBindingBuilder_ != null) {
-        policyBindingBuilder_.dispose();
+      if (policyBindingBuilder_ == null) {
+        policyBinding_ = null;
+        onChanged();
+      } else {
+        policyBinding_ = null;
         policyBindingBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1176,7 +1127,7 @@ public Builder clearPolicyBinding() {
      * 
      */
     public com.google.iam.v3beta.PolicyBinding.Builder getPolicyBindingBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getPolicyBindingFieldBuilder().getBuilder();
     }
@@ -1265,7 +1216,6 @@ public boolean getValidateOnly() {
     public Builder setValidateOnly(boolean value) {
 
       validateOnly_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1283,7 +1233,7 @@ public Builder setValidateOnly(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearValidateOnly() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       validateOnly_ = false;
       onChanged();
       return this;
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePolicyBindingRequestOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePolicyBindingRequestOrBuilder.java
index b871ebf303..29a1dd05e4 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePolicyBindingRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePolicyBindingRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface CreatePolicyBindingRequestOrBuilder
@@ -31,9 +30,7 @@ public interface CreatePolicyBindingRequestOrBuilder
    * Required. The parent resource where this policy binding will be created.
    * The binding parent is the closest Resource Manager resource (project,
    * folder or organization) to the binding target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -55,9 +52,7 @@ public interface CreatePolicyBindingRequestOrBuilder
    * Required. The parent resource where this policy binding will be created.
    * The binding parent is the closest Resource Manager resource (project,
    * folder or organization) to the binding target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -78,7 +73,6 @@ public interface CreatePolicyBindingRequestOrBuilder
    * 
    * Required. The ID to use for the policy binding, which will become the final
    * component of the policy binding's resource name.
-   *
    * This value must start with a lowercase letter followed by up to 62
    * lowercase letters, numbers, hyphens, or dots. Pattern,
    * /[a-z][a-z0-9-\.]{2,62}/.
@@ -96,7 +90,6 @@ public interface CreatePolicyBindingRequestOrBuilder
    * 
    * Required. The ID to use for the policy binding, which will become the final
    * component of the policy binding's resource name.
-   *
    * This value must start with a lowercase letter followed by up to 62
    * lowercase letters, numbers, hyphens, or dots. Pattern,
    * /[a-z][a-z0-9-\.]{2,62}/.
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePrincipalAccessBoundaryPolicyRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePrincipalAccessBoundaryPolicyRequest.java
index 0b0235e791..13e377051f 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePrincipalAccessBoundaryPolicyRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePrincipalAccessBoundaryPolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CreatePrincipalAccessBoundaryPolicyRequest();
   }
 
+  @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.iam.v3beta.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3beta_CreatePrincipalAccessBoundaryPolicyRequest_descriptor;
@@ -67,11 +71,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v3beta.CreatePrincipalAccessBoundaryPolicyRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int PARENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -79,7 +80,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * Required. The parent resource where this principal access boundary policy
    * will be created. Only organizations are supported.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}`
    * 

@@ -109,7 +109,6 @@ public java.lang.String getParent() {
    * 
    * Required. The parent resource where this principal access boundary policy
    * will be created. Only organizations are supported.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}`
    * 

@@ -134,9 +133,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PRINCIPAL_ACCESS_BOUNDARY_POLICY_ID_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object principalAccessBoundaryPolicyId_ = "";
+  private volatile java.lang.Object principalAccessBoundaryPolicyId_;
 
   /**
    *
@@ -145,7 +142,6 @@ public com.google.protobuf.ByteString getParentBytes() {
    * Required. The ID to use for the principal access boundary policy, which
    * will become the final component of the principal access boundary policy's
    * resource name.
-   *
    * This value must start with a lowercase letter followed by up to 62
    * lowercase letters, numbers, hyphens, or dots. Pattern,
    * /[a-z][a-z0-9-\.]{2,62}/.
@@ -176,7 +172,6 @@ public java.lang.String getPrincipalAccessBoundaryPolicyId() {
    * Required. The ID to use for the principal access boundary policy, which
    * will become the final component of the principal access boundary policy's
    * resource name.
-   *
    * This value must start with a lowercase letter followed by up to 62
    * lowercase letters, numbers, hyphens, or dots. Pattern,
    * /[a-z][a-z0-9-\.]{2,62}/.
@@ -218,7 +213,7 @@ public com.google.protobuf.ByteString getPrincipalAccessBoundaryPolicyIdBytes()
    */
   @java.lang.Override
   public boolean hasPrincipalAccessBoundaryPolicy() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return principalAccessBoundaryPolicy_ != null;
   }
 
   /**
@@ -255,13 +250,11 @@ public com.google.iam.v3beta.PrincipalAccessBoundaryPolicy getPrincipalAccessBou
   @java.lang.Override
   public com.google.iam.v3beta.PrincipalAccessBoundaryPolicyOrBuilder
       getPrincipalAccessBoundaryPolicyOrBuilder() {
-    return principalAccessBoundaryPolicy_ == null
-        ? com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.getDefaultInstance()
-        : principalAccessBoundaryPolicy_;
+    return getPrincipalAccessBoundaryPolicy();
   }
 
   public static final int VALIDATE_ONLY_FIELD_NUMBER = 4;
-  private boolean validateOnly_ = false;
+  private boolean validateOnly_;
 
   /**
    *
@@ -301,7 +294,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       com.google.protobuf.GeneratedMessageV3.writeString(
           output, 2, principalAccessBoundaryPolicyId_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (principalAccessBoundaryPolicy_ != null) {
       output.writeMessage(3, getPrincipalAccessBoundaryPolicy());
     }
     if (validateOnly_ != false) {
@@ -324,7 +317,7 @@ public int getSerializedSize() {
           com.google.protobuf.GeneratedMessageV3.computeStringSize(
               2, principalAccessBoundaryPolicyId_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (principalAccessBoundaryPolicy_ != null) {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               3, getPrincipalAccessBoundaryPolicy());
@@ -510,33 +503,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.CreatePrincipalAccessBoundaryPolicyRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPrincipalAccessBoundaryPolicyFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       parent_ = "";
+
       principalAccessBoundaryPolicyId_ = "";
-      principalAccessBoundaryPolicy_ = null;
-      if (principalAccessBoundaryPolicyBuilder_ != null) {
-        principalAccessBoundaryPolicyBuilder_.dispose();
+
+      if (principalAccessBoundaryPolicyBuilder_ == null) {
+        principalAccessBoundaryPolicy_ = null;
+      } else {
+        principalAccessBoundaryPolicy_ = null;
         principalAccessBoundaryPolicyBuilder_ = null;
       }
       validateOnly_ = false;
+
       return this;
     }
 
@@ -565,36 +552,18 @@ public com.google.iam.v3beta.CreatePrincipalAccessBoundaryPolicyRequest build()
     public com.google.iam.v3beta.CreatePrincipalAccessBoundaryPolicyRequest buildPartial() {
       com.google.iam.v3beta.CreatePrincipalAccessBoundaryPolicyRequest result =
           new com.google.iam.v3beta.CreatePrincipalAccessBoundaryPolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.parent_ = parent_;
+      result.principalAccessBoundaryPolicyId_ = principalAccessBoundaryPolicyId_;
+      if (principalAccessBoundaryPolicyBuilder_ == null) {
+        result.principalAccessBoundaryPolicy_ = principalAccessBoundaryPolicy_;
+      } else {
+        result.principalAccessBoundaryPolicy_ = principalAccessBoundaryPolicyBuilder_.build();
       }
+      result.validateOnly_ = validateOnly_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(
-        com.google.iam.v3beta.CreatePrincipalAccessBoundaryPolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.parent_ = parent_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.principalAccessBoundaryPolicyId_ = principalAccessBoundaryPolicyId_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.principalAccessBoundaryPolicy_ =
-            principalAccessBoundaryPolicyBuilder_ == null
-                ? principalAccessBoundaryPolicy_
-                : principalAccessBoundaryPolicyBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.validateOnly_ = validateOnly_;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -645,12 +614,10 @@ public Builder mergeFrom(
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getPrincipalAccessBoundaryPolicyId().isEmpty()) {
         principalAccessBoundaryPolicyId_ = other.principalAccessBoundaryPolicyId_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasPrincipalAccessBoundaryPolicy()) {
@@ -688,26 +655,26 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 principalAccessBoundaryPolicyId_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(
                     getPrincipalAccessBoundaryPolicyFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 32:
               {
                 validateOnly_ = input.readBool();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             default:
@@ -727,8 +694,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object parent_ = "";
 
     /**
@@ -737,7 +702,6 @@ public Builder mergeFrom(
      * 
      * Required. The parent resource where this principal access boundary policy
      * will be created. Only organizations are supported.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -766,7 +730,6 @@ public java.lang.String getParent() {
      * 
      * Required. The parent resource where this principal access boundary policy
      * will be created. Only organizations are supported.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -795,7 +758,6 @@ public com.google.protobuf.ByteString getParentBytes() {
      * 
      * Required. The parent resource where this principal access boundary policy
      * will be created. Only organizations are supported.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -811,8 +773,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -823,7 +785,6 @@ public Builder setParent(java.lang.String value) {
      * 
      * Required. The parent resource where this principal access boundary policy
      * will be created. Only organizations are supported.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -835,8 +796,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -847,7 +808,6 @@ public Builder clearParent() {
      * 
      * Required. The parent resource where this principal access boundary policy
      * will be created. Only organizations are supported.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -864,8 +824,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -879,7 +839,6 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * Required. The ID to use for the principal access boundary policy, which
      * will become the final component of the principal access boundary policy's
      * resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -910,7 +869,6 @@ public java.lang.String getPrincipalAccessBoundaryPolicyId() {
      * Required. The ID to use for the principal access boundary policy, which
      * will become the final component of the principal access boundary policy's
      * resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -941,7 +899,6 @@ public com.google.protobuf.ByteString getPrincipalAccessBoundaryPolicyIdBytes()
      * Required. The ID to use for the principal access boundary policy, which
      * will become the final component of the principal access boundary policy's
      * resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -958,8 +915,8 @@ public Builder setPrincipalAccessBoundaryPolicyId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       principalAccessBoundaryPolicyId_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -971,7 +928,6 @@ public Builder setPrincipalAccessBoundaryPolicyId(java.lang.String value) {
      * Required. The ID to use for the principal access boundary policy, which
      * will become the final component of the principal access boundary policy's
      * resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -984,8 +940,8 @@ public Builder setPrincipalAccessBoundaryPolicyId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPrincipalAccessBoundaryPolicyId() {
+
       principalAccessBoundaryPolicyId_ = getDefaultInstance().getPrincipalAccessBoundaryPolicyId();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -997,7 +953,6 @@ public Builder clearPrincipalAccessBoundaryPolicyId() {
      * Required. The ID to use for the principal access boundary policy, which
      * will become the final component of the principal access boundary policy's
      * resource name.
-     *
      * This value must start with a lowercase letter followed by up to 62
      * lowercase letters, numbers, hyphens, or dots. Pattern,
      * /[a-z][a-z0-9-\.]{2,62}/.
@@ -1015,8 +970,8 @@ public Builder setPrincipalAccessBoundaryPolicyIdBytes(com.google.protobuf.ByteS
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       principalAccessBoundaryPolicyId_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1042,7 +997,8 @@ public Builder setPrincipalAccessBoundaryPolicyIdBytes(com.google.protobuf.ByteS
      * @return Whether the principalAccessBoundaryPolicy field is set.
      */
     public boolean hasPrincipalAccessBoundaryPolicy() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return principalAccessBoundaryPolicyBuilder_ != null
+          || principalAccessBoundaryPolicy_ != null;
     }
 
     /**
@@ -1086,11 +1042,11 @@ public Builder setPrincipalAccessBoundaryPolicy(
           throw new NullPointerException();
         }
         principalAccessBoundaryPolicy_ = value;
+        onChanged();
       } else {
         principalAccessBoundaryPolicyBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1109,11 +1065,11 @@ public Builder setPrincipalAccessBoundaryPolicy(
         com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.Builder builderForValue) {
       if (principalAccessBoundaryPolicyBuilder_ == null) {
         principalAccessBoundaryPolicy_ = builderForValue.build();
+        onChanged();
       } else {
         principalAccessBoundaryPolicyBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1131,21 +1087,20 @@ public Builder setPrincipalAccessBoundaryPolicy(
     public Builder mergePrincipalAccessBoundaryPolicy(
         com.google.iam.v3beta.PrincipalAccessBoundaryPolicy value) {
       if (principalAccessBoundaryPolicyBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && principalAccessBoundaryPolicy_ != null
-            && principalAccessBoundaryPolicy_
-                != com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.getDefaultInstance()) {
-          getPrincipalAccessBoundaryPolicyBuilder().mergeFrom(value);
+        if (principalAccessBoundaryPolicy_ != null) {
+          principalAccessBoundaryPolicy_ =
+              com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.newBuilder(
+                      principalAccessBoundaryPolicy_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           principalAccessBoundaryPolicy_ = value;
         }
+        onChanged();
       } else {
         principalAccessBoundaryPolicyBuilder_.mergeFrom(value);
       }
-      if (principalAccessBoundaryPolicy_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1161,13 +1116,14 @@ public Builder mergePrincipalAccessBoundaryPolicy(
      * 
      */
     public Builder clearPrincipalAccessBoundaryPolicy() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      principalAccessBoundaryPolicy_ = null;
-      if (principalAccessBoundaryPolicyBuilder_ != null) {
-        principalAccessBoundaryPolicyBuilder_.dispose();
+      if (principalAccessBoundaryPolicyBuilder_ == null) {
+        principalAccessBoundaryPolicy_ = null;
+        onChanged();
+      } else {
+        principalAccessBoundaryPolicy_ = null;
         principalAccessBoundaryPolicyBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1184,7 +1140,7 @@ public Builder clearPrincipalAccessBoundaryPolicy() {
      */
     public com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.Builder
         getPrincipalAccessBoundaryPolicyBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getPrincipalAccessBoundaryPolicyFieldBuilder().getBuilder();
     }
@@ -1274,7 +1230,6 @@ public boolean getValidateOnly() {
     public Builder setValidateOnly(boolean value) {
 
       validateOnly_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1292,7 +1247,7 @@ public Builder setValidateOnly(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearValidateOnly() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       validateOnly_ = false;
       onChanged();
       return this;
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePrincipalAccessBoundaryPolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePrincipalAccessBoundaryPolicyRequestOrBuilder.java
index 7ee130f63d..b6b2efda4b 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePrincipalAccessBoundaryPolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePrincipalAccessBoundaryPolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface CreatePrincipalAccessBoundaryPolicyRequestOrBuilder
@@ -30,7 +29,6 @@ public interface CreatePrincipalAccessBoundaryPolicyRequestOrBuilder
    * 
    * Required. The parent resource where this principal access boundary policy
    * will be created. Only organizations are supported.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}`
    * 

@@ -49,7 +47,6 @@ public interface CreatePrincipalAccessBoundaryPolicyRequestOrBuilder
    * 
    * Required. The parent resource where this principal access boundary policy
    * will be created. Only organizations are supported.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}`
    * 

@@ -69,7 +66,6 @@ public interface CreatePrincipalAccessBoundaryPolicyRequestOrBuilder
    * Required. The ID to use for the principal access boundary policy, which
    * will become the final component of the principal access boundary policy's
    * resource name.
-   *
    * This value must start with a lowercase letter followed by up to 62
    * lowercase letters, numbers, hyphens, or dots. Pattern,
    * /[a-z][a-z0-9-\.]{2,62}/.
@@ -89,7 +85,6 @@ public interface CreatePrincipalAccessBoundaryPolicyRequestOrBuilder
    * Required. The ID to use for the principal access boundary policy, which
    * will become the final component of the principal access boundary policy's
    * resource name.
-   *
    * This value must start with a lowercase letter followed by up to 62
    * lowercase letters, numbers, hyphens, or dots. Pattern,
    * /[a-z][a-z0-9-\.]{2,62}/.
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePolicyBindingRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePolicyBindingRequest.java
index 0aef9affe4..43e2363e53 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePolicyBindingRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePolicyBindingRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DeletePolicyBindingRequest();
   }
 
+  @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.iam.v3beta.PolicyBindingsServiceProto
         .internal_static_google_iam_v3beta_DeletePolicyBindingRequest_descriptor;
@@ -66,18 +70,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
    *
    * 
    * Required. The name of the policy binding to delete.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -108,9 +108,7 @@ public java.lang.String getName() {
    *
    * 
    * Required. The name of the policy binding to delete.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -137,9 +135,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int ETAG_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object etag_ = "";
+  private volatile java.lang.Object etag_;
 
   /**
    *
@@ -192,7 +188,7 @@ public com.google.protobuf.ByteString getEtagBytes() {
   }
 
   public static final int VALIDATE_ONLY_FIELD_NUMBER = 3;
-  private boolean validateOnly_ = false;
+  private boolean validateOnly_;
 
   /**
    *
@@ -427,10 +423,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       etag_ = "";
+
       validateOnly_ = false;
+
       return this;
     }
 
@@ -458,26 +456,13 @@ public com.google.iam.v3beta.DeletePolicyBindingRequest build() {
     public com.google.iam.v3beta.DeletePolicyBindingRequest buildPartial() {
       com.google.iam.v3beta.DeletePolicyBindingRequest result =
           new com.google.iam.v3beta.DeletePolicyBindingRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
+      result.etag_ = etag_;
+      result.validateOnly_ = validateOnly_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v3beta.DeletePolicyBindingRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.etag_ = etag_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.validateOnly_ = validateOnly_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -526,12 +511,10 @@ public Builder mergeFrom(com.google.iam.v3beta.DeletePolicyBindingRequest other)
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getEtag().isEmpty()) {
         etag_ = other.etag_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getValidateOnly() != false) {
@@ -566,19 +549,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 etag_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 24:
               {
                 validateOnly_ = input.readBool();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             default:
@@ -598,8 +581,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -607,9 +588,7 @@ public Builder mergeFrom(
      *
      * 
      * Required. The name of the policy binding to delete.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -639,9 +618,7 @@ public java.lang.String getName() {
      *
      * 
      * Required. The name of the policy binding to delete.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -671,9 +648,7 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * 
      * Required. The name of the policy binding to delete.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -691,8 +666,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -702,9 +677,7 @@ public Builder setName(java.lang.String value) {
      *
      * 
      * Required. The name of the policy binding to delete.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -718,8 +691,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -729,9 +702,7 @@ public Builder clearName() {
      *
      * 
      * Required. The name of the policy binding to delete.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -750,8 +721,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -823,8 +794,8 @@ public Builder setEtag(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       etag_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -842,8 +813,8 @@ public Builder setEtag(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEtag() {
+
       etag_ = getDefaultInstance().getEtag();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -866,8 +837,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       etag_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -907,7 +878,6 @@ public boolean getValidateOnly() {
     public Builder setValidateOnly(boolean value) {
 
       validateOnly_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -925,7 +895,7 @@ public Builder setValidateOnly(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearValidateOnly() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       validateOnly_ = false;
       onChanged();
       return this;
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePolicyBindingRequestOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePolicyBindingRequestOrBuilder.java
index 858d7b8878..544464e424 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePolicyBindingRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePolicyBindingRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface DeletePolicyBindingRequestOrBuilder
@@ -29,9 +28,7 @@ public interface DeletePolicyBindingRequestOrBuilder
    *
    * 
    * Required. The name of the policy binding to delete.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -51,9 +48,7 @@ public interface DeletePolicyBindingRequestOrBuilder
    *
    * 
    * Required. The name of the policy binding to delete.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePrincipalAccessBoundaryPolicyRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePrincipalAccessBoundaryPolicyRequest.java
index ba86f97f78..031b2defec 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePrincipalAccessBoundaryPolicyRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePrincipalAccessBoundaryPolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DeletePrincipalAccessBoundaryPolicyRequest();
   }
 
+  @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.iam.v3beta.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3beta_DeletePrincipalAccessBoundaryPolicyRequest_descriptor;
@@ -68,16 +72,13 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
    *
    * 
    * Required. The name of the principal access boundary policy to delete.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
    * 

@@ -106,7 +107,6 @@ public java.lang.String getName() {
    *
    * 
    * Required. The name of the principal access boundary policy to delete.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
    * 

@@ -131,9 +131,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int ETAG_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object etag_ = "";
+  private volatile java.lang.Object etag_;
 
   /**
    *
@@ -186,7 +184,7 @@ public com.google.protobuf.ByteString getEtagBytes() {
   }
 
   public static final int VALIDATE_ONLY_FIELD_NUMBER = 3;
-  private boolean validateOnly_ = false;
+  private boolean validateOnly_;
 
   /**
    *
@@ -206,7 +204,7 @@ public boolean getValidateOnly() {
   }
 
   public static final int FORCE_FIELD_NUMBER = 4;
-  private boolean force_ = false;
+  private boolean force_;
 
   /**
    *
@@ -451,11 +449,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       etag_ = "";
+
       validateOnly_ = false;
+
       force_ = false;
+
       return this;
     }
 
@@ -484,30 +485,14 @@ public com.google.iam.v3beta.DeletePrincipalAccessBoundaryPolicyRequest build()
     public com.google.iam.v3beta.DeletePrincipalAccessBoundaryPolicyRequest buildPartial() {
       com.google.iam.v3beta.DeletePrincipalAccessBoundaryPolicyRequest result =
           new com.google.iam.v3beta.DeletePrincipalAccessBoundaryPolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
+      result.etag_ = etag_;
+      result.validateOnly_ = validateOnly_;
+      result.force_ = force_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(
-        com.google.iam.v3beta.DeletePrincipalAccessBoundaryPolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.etag_ = etag_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.validateOnly_ = validateOnly_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.force_ = force_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -558,12 +543,10 @@ public Builder mergeFrom(
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getEtag().isEmpty()) {
         etag_ = other.etag_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getValidateOnly() != false) {
@@ -601,25 +584,25 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 etag_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 24:
               {
                 validateOnly_ = input.readBool();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 32:
               {
                 force_ = input.readBool();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             default:
@@ -639,8 +622,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -648,7 +629,6 @@ public Builder mergeFrom(
      *
      * 
      * Required. The name of the principal access boundary policy to delete.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -676,7 +656,6 @@ public java.lang.String getName() {
      *
      * 
      * Required. The name of the principal access boundary policy to delete.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -704,7 +683,6 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * 
      * Required. The name of the principal access boundary policy to delete.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -720,8 +698,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -731,7 +709,6 @@ public Builder setName(java.lang.String value) {
      *
      * 
      * Required. The name of the principal access boundary policy to delete.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -743,8 +720,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -754,7 +731,6 @@ public Builder clearName() {
      *
      * 
      * Required. The name of the principal access boundary policy to delete.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -771,8 +747,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -844,8 +820,8 @@ public Builder setEtag(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       etag_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -863,8 +839,8 @@ public Builder setEtag(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEtag() {
+
       etag_ = getDefaultInstance().getEtag();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -887,8 +863,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       etag_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -928,7 +904,6 @@ public boolean getValidateOnly() {
     public Builder setValidateOnly(boolean value) {
 
       validateOnly_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -946,7 +921,7 @@ public Builder setValidateOnly(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearValidateOnly() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       validateOnly_ = false;
       onChanged();
       return this;
@@ -987,7 +962,6 @@ public boolean getForce() {
     public Builder setForce(boolean value) {
 
       force_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1005,7 +979,7 @@ public Builder setForce(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearForce() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       force_ = false;
       onChanged();
       return this;
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePrincipalAccessBoundaryPolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePrincipalAccessBoundaryPolicyRequestOrBuilder.java
index 567fd54b72..76fdac5bfc 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePrincipalAccessBoundaryPolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePrincipalAccessBoundaryPolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface DeletePrincipalAccessBoundaryPolicyRequestOrBuilder
@@ -29,7 +28,6 @@ public interface DeletePrincipalAccessBoundaryPolicyRequestOrBuilder
    *
    * 
    * Required. The name of the principal access boundary policy to delete.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
    * 

@@ -47,7 +45,6 @@ public interface DeletePrincipalAccessBoundaryPolicyRequestOrBuilder
    *
    * 
    * Required. The name of the principal access boundary policy to delete.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
    * 

diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPolicyBindingRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPolicyBindingRequest.java
index 4f52e172dd..bcce3e73a0 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPolicyBindingRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPolicyBindingRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GetPolicyBindingRequest();
   }
 
+  @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.iam.v3beta.PolicyBindingsServiceProto
         .internal_static_google_iam_v3beta_GetPolicyBindingRequest_descriptor;
@@ -65,18 +69,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
    *
    * 
    * Required. The name of the policy binding to retrieve.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -107,9 +107,7 @@ public java.lang.String getName() {
    *
    * 
    * Required. The name of the policy binding to retrieve.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -333,8 +331,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -362,20 +360,11 @@ public com.google.iam.v3beta.GetPolicyBindingRequest build() {
     public com.google.iam.v3beta.GetPolicyBindingRequest buildPartial() {
       com.google.iam.v3beta.GetPolicyBindingRequest result =
           new com.google.iam.v3beta.GetPolicyBindingRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v3beta.GetPolicyBindingRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -423,7 +412,6 @@ public Builder mergeFrom(com.google.iam.v3beta.GetPolicyBindingRequest other) {
       if (other == com.google.iam.v3beta.GetPolicyBindingRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -455,7 +443,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -475,8 +463,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -484,9 +470,7 @@ public Builder mergeFrom(
      *
      * 
      * Required. The name of the policy binding to retrieve.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -516,9 +500,7 @@ public java.lang.String getName() {
      *
      * 
      * Required. The name of the policy binding to retrieve.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -548,9 +530,7 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * 
      * Required. The name of the policy binding to retrieve.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -568,8 +548,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -579,9 +559,7 @@ public Builder setName(java.lang.String value) {
      *
      * 
      * Required. The name of the policy binding to retrieve.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -595,8 +573,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -606,9 +584,7 @@ public Builder clearName() {
      *
      * 
      * Required. The name of the policy binding to retrieve.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -627,8 +603,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPolicyBindingRequestOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPolicyBindingRequestOrBuilder.java
index f4479c57d9..5429982e96 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPolicyBindingRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPolicyBindingRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface GetPolicyBindingRequestOrBuilder
@@ -29,9 +28,7 @@ public interface GetPolicyBindingRequestOrBuilder
    *
    * 
    * Required. The name of the policy binding to retrieve.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -51,9 +48,7 @@ public interface GetPolicyBindingRequestOrBuilder
    *
    * 
    * Required. The name of the policy binding to retrieve.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPrincipalAccessBoundaryPolicyRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPrincipalAccessBoundaryPolicyRequest.java
index 9c67538aba..9e69a1c428 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPrincipalAccessBoundaryPolicyRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPrincipalAccessBoundaryPolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GetPrincipalAccessBoundaryPolicyRequest();
   }
 
+  @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.iam.v3beta.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3beta_GetPrincipalAccessBoundaryPolicyRequest_descriptor;
@@ -67,16 +71,13 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
    *
    * 
    * Required. The name of the principal access boundary policy to retrieve.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
    * 

@@ -105,7 +106,6 @@ public java.lang.String getName() {
    *
    * 
    * Required. The name of the principal access boundary policy to retrieve.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
    * 

@@ -328,8 +328,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -358,21 +358,11 @@ public com.google.iam.v3beta.GetPrincipalAccessBoundaryPolicyRequest build() {
     public com.google.iam.v3beta.GetPrincipalAccessBoundaryPolicyRequest buildPartial() {
       com.google.iam.v3beta.GetPrincipalAccessBoundaryPolicyRequest result =
           new com.google.iam.v3beta.GetPrincipalAccessBoundaryPolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(
-        com.google.iam.v3beta.GetPrincipalAccessBoundaryPolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -422,7 +412,6 @@ public Builder mergeFrom(com.google.iam.v3beta.GetPrincipalAccessBoundaryPolicyR
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -454,7 +443,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -474,8 +463,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -483,7 +470,6 @@ public Builder mergeFrom(
      *
      * 
      * Required. The name of the principal access boundary policy to retrieve.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -511,7 +497,6 @@ public java.lang.String getName() {
      *
      * 
      * Required. The name of the principal access boundary policy to retrieve.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -539,7 +524,6 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * 
      * Required. The name of the principal access boundary policy to retrieve.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -555,8 +539,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -566,7 +550,6 @@ public Builder setName(java.lang.String value) {
      *
      * 
      * Required. The name of the principal access boundary policy to retrieve.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -578,8 +561,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -589,7 +572,6 @@ public Builder clearName() {
      *
      * 
      * Required. The name of the principal access boundary policy to retrieve.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
      * 

@@ -606,8 +588,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPrincipalAccessBoundaryPolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPrincipalAccessBoundaryPolicyRequestOrBuilder.java
index 1e7e2c300f..6d63f92b2f 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPrincipalAccessBoundaryPolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPrincipalAccessBoundaryPolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface GetPrincipalAccessBoundaryPolicyRequestOrBuilder
@@ -29,7 +28,6 @@ public interface GetPrincipalAccessBoundaryPolicyRequestOrBuilder
    *
    * 
    * Required. The name of the principal access boundary policy to retrieve.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
    * 

@@ -47,7 +45,6 @@ public interface GetPrincipalAccessBoundaryPolicyRequestOrBuilder
    *
    * 
    * Required. The name of the principal access boundary policy to retrieve.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{principal_access_boundary_policy_id}`
    * 

diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsRequest.java
index 9f6ad30d25..03b7b560fe 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListPolicyBindingsRequest();
   }
 
+  @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.iam.v3beta.PolicyBindingsServiceProto
         .internal_static_google_iam_v3beta_ListPolicyBindingsRequest_descriptor;
@@ -67,9 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -77,9 +79,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * Required. The parent resource, which owns the collection of policy
    * bindings.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -111,9 +111,7 @@ public java.lang.String getParent() {
    * 
    * Required. The parent resource, which owns the collection of policy
    * bindings.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -140,7 +138,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -148,7 +146,6 @@ public com.google.protobuf.ByteString getParentBytes() {
    * 
    * Optional. The maximum number of policy bindings to return. The service may
    * return fewer than this value.
-   *
    * If unspecified, at most 50 policy bindings will be returned.
    * The maximum value is 1000; values above 1000 will be coerced to 1000.
    * 

@@ -163,9 +160,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -173,7 +168,6 @@ public int getPageSize() {
    * 
    * Optional. A page token, received from a previous `ListPolicyBindings` call.
    * Provide this to retrieve the subsequent page.
-   *
    * When paginating, all other parameters provided to `ListPolicyBindings` must
    * match the call that provided the page token.
    * 

@@ -201,7 +195,6 @@ public java.lang.String getPageToken() {
    * 
    * Optional. A page token, received from a previous `ListPolicyBindings` call.
    * Provide this to retrieve the subsequent page.
-   *
    * When paginating, all other parameters provided to `ListPolicyBindings` must
    * match the call that provided the page token.
    * 

@@ -224,9 +217,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
   }
 
   public static final int FILTER_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object filter_ = "";
+  private volatile java.lang.Object filter_;
 
   /**
    *
@@ -234,12 +225,9 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
    * 
    * Optional. An expression for filtering the results of the request. Filter
    * rules are case insensitive. Some eligible fields for filtering are:
-   *
    * + `target`
    * + `policy`
-   *
    * Some examples of filter queries:
-   *
    * * `target:ex*`: The binding target's name starts with "ex".
    * * `target:example`: The binding target's name is `example`.
    * * `policy:example`: The binding policy's name is `example`.
@@ -268,12 +256,9 @@ public java.lang.String getFilter() {
    * 
    * Optional. An expression for filtering the results of the request. Filter
    * rules are case insensitive. Some eligible fields for filtering are:
-   *
    * + `target`
    * + `policy`
-   *
    * Some examples of filter queries:
-   *
    * * `target:ex*`: The binding target's name starts with "ex".
    * * `target:example`: The binding target's name is `example`.
    * * `policy:example`: The binding policy's name is `example`.
@@ -521,11 +506,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       parent_ = "";
+
       pageSize_ = 0;
+
       pageToken_ = "";
+
       filter_ = "";
+
       return this;
     }
 
@@ -553,29 +541,14 @@ public com.google.iam.v3beta.ListPolicyBindingsRequest build() {
     public com.google.iam.v3beta.ListPolicyBindingsRequest buildPartial() {
       com.google.iam.v3beta.ListPolicyBindingsRequest result =
           new com.google.iam.v3beta.ListPolicyBindingsRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.parent_ = parent_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
+      result.filter_ = filter_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v3beta.ListPolicyBindingsRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.parent_ = parent_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.filter_ = filter_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -624,7 +597,6 @@ public Builder mergeFrom(com.google.iam.v3beta.ListPolicyBindingsRequest other)
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -632,12 +604,10 @@ public Builder mergeFrom(com.google.iam.v3beta.ListPolicyBindingsRequest other)
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getFilter().isEmpty()) {
         filter_ = other.filter_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -669,25 +639,25 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 filter_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             default:
@@ -707,8 +677,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object parent_ = "";
 
     /**
@@ -717,9 +685,7 @@ public Builder mergeFrom(
      * 
      * Required. The parent resource, which owns the collection of policy
      * bindings.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -750,9 +716,7 @@ public java.lang.String getParent() {
      * 
      * Required. The parent resource, which owns the collection of policy
      * bindings.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -783,9 +747,7 @@ public com.google.protobuf.ByteString getParentBytes() {
      * 
      * Required. The parent resource, which owns the collection of policy
      * bindings.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -803,8 +765,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -815,9 +777,7 @@ public Builder setParent(java.lang.String value) {
      * 
      * Required. The parent resource, which owns the collection of policy
      * bindings.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -831,8 +791,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -843,9 +803,7 @@ public Builder clearParent() {
      * 
      * Required. The parent resource, which owns the collection of policy
      * bindings.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -864,8 +822,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -878,7 +836,6 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -898,7 +855,6 @@ public int getPageSize() {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -911,7 +867,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -922,7 +877,6 @@ public Builder setPageSize(int value) {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -932,7 +886,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -946,7 +900,6 @@ public Builder clearPageSize() {
      * 
      * Optional. A page token, received from a previous `ListPolicyBindings` call.
      * Provide this to retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to `ListPolicyBindings` must
      * match the call that provided the page token.
      * 

@@ -973,7 +926,6 @@ public java.lang.String getPageToken() {
      * 
      * Optional. A page token, received from a previous `ListPolicyBindings` call.
      * Provide this to retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to `ListPolicyBindings` must
      * match the call that provided the page token.
      * 

@@ -1000,7 +952,6 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
      * 
      * Optional. A page token, received from a previous `ListPolicyBindings` call.
      * Provide this to retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to `ListPolicyBindings` must
      * match the call that provided the page token.
      * 

@@ -1014,8 +965,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1026,7 +977,6 @@ public Builder setPageToken(java.lang.String value) {
      * 
      * Optional. A page token, received from a previous `ListPolicyBindings` call.
      * Provide this to retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to `ListPolicyBindings` must
      * match the call that provided the page token.
      * 

@@ -1036,8 +986,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1048,7 +998,6 @@ public Builder clearPageToken() {
      * 
      * Optional. A page token, received from a previous `ListPolicyBindings` call.
      * Provide this to retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to `ListPolicyBindings` must
      * match the call that provided the page token.
      * 

@@ -1063,8 +1012,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1077,12 +1026,9 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
      * 
      * Optional. An expression for filtering the results of the request. Filter
      * rules are case insensitive. Some eligible fields for filtering are:
-     *
      * + `target`
      * + `policy`
-     *
      * Some examples of filter queries:
-     *
      * * `target:ex*`: The binding target's name starts with "ex".
      * * `target:example`: The binding target's name is `example`.
      * * `policy:example`: The binding policy's name is `example`.
@@ -1110,12 +1056,9 @@ public java.lang.String getFilter() {
      * 
      * Optional. An expression for filtering the results of the request. Filter
      * rules are case insensitive. Some eligible fields for filtering are:
-     *
      * + `target`
      * + `policy`
-     *
      * Some examples of filter queries:
-     *
      * * `target:ex*`: The binding target's name starts with "ex".
      * * `target:example`: The binding target's name is `example`.
      * * `policy:example`: The binding policy's name is `example`.
@@ -1143,12 +1086,9 @@ public com.google.protobuf.ByteString getFilterBytes() {
      * 
      * Optional. An expression for filtering the results of the request. Filter
      * rules are case insensitive. Some eligible fields for filtering are:
-     *
      * + `target`
      * + `policy`
-     *
      * Some examples of filter queries:
-     *
      * * `target:ex*`: The binding target's name starts with "ex".
      * * `target:example`: The binding target's name is `example`.
      * * `policy:example`: The binding policy's name is `example`.
@@ -1163,8 +1103,8 @@ public Builder setFilter(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       filter_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1175,12 +1115,9 @@ public Builder setFilter(java.lang.String value) {
      * 
      * Optional. An expression for filtering the results of the request. Filter
      * rules are case insensitive. Some eligible fields for filtering are:
-     *
      * + `target`
      * + `policy`
-     *
      * Some examples of filter queries:
-     *
      * * `target:ex*`: The binding target's name starts with "ex".
      * * `target:example`: The binding target's name is `example`.
      * * `policy:example`: The binding policy's name is `example`.
@@ -1191,8 +1128,8 @@ public Builder setFilter(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFilter() {
+
       filter_ = getDefaultInstance().getFilter();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1203,12 +1140,9 @@ public Builder clearFilter() {
      * 
      * Optional. An expression for filtering the results of the request. Filter
      * rules are case insensitive. Some eligible fields for filtering are:
-     *
      * + `target`
      * + `policy`
-     *
      * Some examples of filter queries:
-     *
      * * `target:ex*`: The binding target's name starts with "ex".
      * * `target:example`: The binding target's name is `example`.
      * * `policy:example`: The binding policy's name is `example`.
@@ -1224,8 +1158,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       filter_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsRequestOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsRequestOrBuilder.java
index 29b509b68e..22f48993d0 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface ListPolicyBindingsRequestOrBuilder
@@ -30,9 +29,7 @@ public interface ListPolicyBindingsRequestOrBuilder
    * 
    * Required. The parent resource, which owns the collection of policy
    * bindings.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -53,9 +50,7 @@ public interface ListPolicyBindingsRequestOrBuilder
    * 
    * Required. The parent resource, which owns the collection of policy
    * bindings.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -76,7 +71,6 @@ public interface ListPolicyBindingsRequestOrBuilder
    * 
    * Optional. The maximum number of policy bindings to return. The service may
    * return fewer than this value.
-   *
    * If unspecified, at most 50 policy bindings will be returned.
    * The maximum value is 1000; values above 1000 will be coerced to 1000.
    * 

@@ -93,7 +87,6 @@ public interface ListPolicyBindingsRequestOrBuilder
    * 
    * Optional. A page token, received from a previous `ListPolicyBindings` call.
    * Provide this to retrieve the subsequent page.
-   *
    * When paginating, all other parameters provided to `ListPolicyBindings` must
    * match the call that provided the page token.
    * 

@@ -110,7 +103,6 @@ public interface ListPolicyBindingsRequestOrBuilder
    * 
    * Optional. A page token, received from a previous `ListPolicyBindings` call.
    * Provide this to retrieve the subsequent page.
-   *
    * When paginating, all other parameters provided to `ListPolicyBindings` must
    * match the call that provided the page token.
    * 

@@ -127,12 +119,9 @@ public interface ListPolicyBindingsRequestOrBuilder
    * 
    * Optional. An expression for filtering the results of the request. Filter
    * rules are case insensitive. Some eligible fields for filtering are:
-   *
    * + `target`
    * + `policy`
-   *
    * Some examples of filter queries:
-   *
    * * `target:ex*`: The binding target's name starts with "ex".
    * * `target:example`: The binding target's name is `example`.
    * * `policy:example`: The binding policy's name is `example`.
@@ -150,12 +139,9 @@ public interface ListPolicyBindingsRequestOrBuilder
    * 
    * Optional. An expression for filtering the results of the request. Filter
    * rules are case insensitive. Some eligible fields for filtering are:
-   *
    * + `target`
    * + `policy`
-   *
    * Some examples of filter queries:
-   *
    * * `target:ex*`: The binding target's name starts with "ex".
    * * `target:example`: The binding target's name is `example`.
    * * `policy:example`: The binding policy's name is `example`.
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsResponse.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsResponse.java
index 3eca9c0ff3..85505dbc11 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsResponse.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListPolicyBindingsResponse();
   }
 
+  @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.iam.v3beta.PolicyBindingsServiceProto
         .internal_static_google_iam_v3beta_ListPolicyBindingsResponse_descriptor;
@@ -66,8 +70,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int POLICY_BINDINGS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List policyBindings_;
 
   /**
@@ -142,9 +144,7 @@ public com.google.iam.v3beta.PolicyBindingOrBuilder getPolicyBindingsOrBuilder(i
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -405,7 +405,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (policyBindingsBuilder_ == null) {
         policyBindings_ = java.util.Collections.emptyList();
       } else {
@@ -414,6 +413,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -441,16 +441,7 @@ public com.google.iam.v3beta.ListPolicyBindingsResponse build() {
     public com.google.iam.v3beta.ListPolicyBindingsResponse buildPartial() {
       com.google.iam.v3beta.ListPolicyBindingsResponse result =
           new com.google.iam.v3beta.ListPolicyBindingsResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(
-        com.google.iam.v3beta.ListPolicyBindingsResponse result) {
+      int from_bitField0_ = bitField0_;
       if (policyBindingsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           policyBindings_ = java.util.Collections.unmodifiableList(policyBindings_);
@@ -460,13 +451,9 @@ private void buildPartialRepeatedFields(
       } else {
         result.policyBindings_ = policyBindingsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.iam.v3beta.ListPolicyBindingsResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -544,7 +531,6 @@ public Builder mergeFrom(com.google.iam.v3beta.ListPolicyBindingsResponse other)
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -589,7 +575,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1048,8 +1034,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1067,8 +1053,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1091,8 +1077,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsResponseOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsResponseOrBuilder.java
index 9a1b9f8447..f204fef476 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsResponseOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface ListPolicyBindingsResponseOrBuilder
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesRequest.java
index dc8f24f4b7..3d3b5dd67f 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListPrincipalAccessBoundaryPoliciesRequest();
   }
 
+  @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.iam.v3beta.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3beta_ListPrincipalAccessBoundaryPoliciesRequest_descriptor;
@@ -68,9 +72,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -78,7 +80,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * 
    * Required. The parent resource, which owns the collection of principal
    * access boundary policies.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}`
    * 

@@ -108,7 +109,6 @@ public java.lang.String getParent() {
    * 
    * Required. The parent resource, which owns the collection of principal
    * access boundary policies.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}`
    * 

@@ -133,7 +133,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -141,7 +141,6 @@ public com.google.protobuf.ByteString getParentBytes() {
    * 
    * Optional. The maximum number of principal access boundary policies to
    * return. The service may return fewer than this value.
-   *
    * If unspecified, at most 50 principal access boundary policies will be
    * returned. The maximum value is 1000; values above 1000 will be coerced to
    * 1000.
@@ -157,9 +156,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -168,7 +165,6 @@ public int getPageSize() {
    * Optional. A page token, received from a previous
    * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
    * subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
    * page token.
@@ -198,7 +194,6 @@ public java.lang.String getPageToken() {
    * Optional. A page token, received from a previous
    * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
    * subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
    * page token.
@@ -438,10 +433,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       parent_ = "";
+
       pageSize_ = 0;
+
       pageToken_ = "";
+
       return this;
     }
 
@@ -470,27 +467,13 @@ public com.google.iam.v3beta.ListPrincipalAccessBoundaryPoliciesRequest build()
     public com.google.iam.v3beta.ListPrincipalAccessBoundaryPoliciesRequest buildPartial() {
       com.google.iam.v3beta.ListPrincipalAccessBoundaryPoliciesRequest result =
           new com.google.iam.v3beta.ListPrincipalAccessBoundaryPoliciesRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.parent_ = parent_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(
-        com.google.iam.v3beta.ListPrincipalAccessBoundaryPoliciesRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.parent_ = parent_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -541,7 +524,6 @@ public Builder mergeFrom(
         return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -549,7 +531,6 @@ public Builder mergeFrom(
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -581,19 +562,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -613,8 +594,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object parent_ = "";
 
     /**
@@ -623,7 +602,6 @@ public Builder mergeFrom(
      * 
      * Required. The parent resource, which owns the collection of principal
      * access boundary policies.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -652,7 +630,6 @@ public java.lang.String getParent() {
      * 
      * Required. The parent resource, which owns the collection of principal
      * access boundary policies.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -681,7 +658,6 @@ public com.google.protobuf.ByteString getParentBytes() {
      * 
      * Required. The parent resource, which owns the collection of principal
      * access boundary policies.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -697,8 +673,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -709,7 +685,6 @@ public Builder setParent(java.lang.String value) {
      * 
      * Required. The parent resource, which owns the collection of principal
      * access boundary policies.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -721,8 +696,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -733,7 +708,6 @@ public Builder clearParent() {
      * 
      * Required. The parent resource, which owns the collection of principal
      * access boundary policies.
-     *
      * Format:
      *   `organizations/{organization_id}/locations/{location}`
      * 

@@ -750,8 +724,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -764,7 +738,6 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * 
      * Optional. The maximum number of principal access boundary policies to
      * return. The service may return fewer than this value.
-     *
      * If unspecified, at most 50 principal access boundary policies will be
      * returned. The maximum value is 1000; values above 1000 will be coerced to
      * 1000.
@@ -785,7 +758,6 @@ public int getPageSize() {
      * 
      * Optional. The maximum number of principal access boundary policies to
      * return. The service may return fewer than this value.
-     *
      * If unspecified, at most 50 principal access boundary policies will be
      * returned. The maximum value is 1000; values above 1000 will be coerced to
      * 1000.
@@ -799,7 +771,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -810,7 +781,6 @@ public Builder setPageSize(int value) {
      * 
      * Optional. The maximum number of principal access boundary policies to
      * return. The service may return fewer than this value.
-     *
      * If unspecified, at most 50 principal access boundary policies will be
      * returned. The maximum value is 1000; values above 1000 will be coerced to
      * 1000.
@@ -821,7 +791,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -836,7 +806,6 @@ public Builder clearPageSize() {
      * Optional. A page token, received from a previous
      * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
      * page token.
@@ -865,7 +834,6 @@ public java.lang.String getPageToken() {
      * Optional. A page token, received from a previous
      * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
      * page token.
@@ -894,7 +862,6 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
      * Optional. A page token, received from a previous
      * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
      * page token.
@@ -909,8 +876,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -922,7 +889,6 @@ public Builder setPageToken(java.lang.String value) {
      * Optional. A page token, received from a previous
      * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
      * page token.
@@ -933,8 +899,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -946,7 +912,6 @@ public Builder clearPageToken() {
      * Optional. A page token, received from a previous
      * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
      * page token.
@@ -962,8 +927,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesRequestOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesRequestOrBuilder.java
index 64c537e44d..de318f2d6d 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface ListPrincipalAccessBoundaryPoliciesRequestOrBuilder
@@ -30,7 +29,6 @@ public interface ListPrincipalAccessBoundaryPoliciesRequestOrBuilder
    * 
    * Required. The parent resource, which owns the collection of principal
    * access boundary policies.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}`
    * 

@@ -49,7 +47,6 @@ public interface ListPrincipalAccessBoundaryPoliciesRequestOrBuilder
    * 
    * Required. The parent resource, which owns the collection of principal
    * access boundary policies.
-   *
    * Format:
    *   `organizations/{organization_id}/locations/{location}`
    * 

@@ -68,7 +65,6 @@ public interface ListPrincipalAccessBoundaryPoliciesRequestOrBuilder
    * 
    * Optional. The maximum number of principal access boundary policies to
    * return. The service may return fewer than this value.
-   *
    * If unspecified, at most 50 principal access boundary policies will be
    * returned. The maximum value is 1000; values above 1000 will be coerced to
    * 1000.
@@ -87,7 +83,6 @@ public interface ListPrincipalAccessBoundaryPoliciesRequestOrBuilder
    * Optional. A page token, received from a previous
    * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
    * subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
    * page token.
@@ -106,7 +101,6 @@ public interface ListPrincipalAccessBoundaryPoliciesRequestOrBuilder
    * Optional. A page token, received from a previous
    * `ListPrincipalAccessBoundaryPolicies` call. Provide this to retrieve the
    * subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `ListPrincipalAccessBoundaryPolicies` must match the call that provided the
    * page token.
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesResponse.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesResponse.java
index 9eccb509d0..0a5ced2d79 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesResponse.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListPrincipalAccessBoundaryPoliciesResponse();
   }
 
+  @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.iam.v3beta.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3beta_ListPrincipalAccessBoundaryPoliciesResponse_descriptor;
@@ -68,8 +72,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PRINCIPAL_ACCESS_BOUNDARY_POLICIES_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List
       principalAccessBoundaryPolicies_;
 
@@ -158,9 +160,7 @@ public com.google.iam.v3beta.PrincipalAccessBoundaryPolicy getPrincipalAccessBou
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -427,7 +427,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (principalAccessBoundaryPoliciesBuilder_ == null) {
         principalAccessBoundaryPolicies_ = java.util.Collections.emptyList();
       } else {
@@ -436,6 +435,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -464,16 +464,7 @@ public com.google.iam.v3beta.ListPrincipalAccessBoundaryPoliciesResponse build()
     public com.google.iam.v3beta.ListPrincipalAccessBoundaryPoliciesResponse buildPartial() {
       com.google.iam.v3beta.ListPrincipalAccessBoundaryPoliciesResponse result =
           new com.google.iam.v3beta.ListPrincipalAccessBoundaryPoliciesResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(
-        com.google.iam.v3beta.ListPrincipalAccessBoundaryPoliciesResponse result) {
+      int from_bitField0_ = bitField0_;
       if (principalAccessBoundaryPoliciesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           principalAccessBoundaryPolicies_ =
@@ -484,14 +475,9 @@ private void buildPartialRepeatedFields(
       } else {
         result.principalAccessBoundaryPolicies_ = principalAccessBoundaryPoliciesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(
-        com.google.iam.v3beta.ListPrincipalAccessBoundaryPoliciesResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -572,7 +558,6 @@ public Builder mergeFrom(
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -618,7 +603,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1126,8 +1111,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1145,8 +1130,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1169,8 +1154,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesResponseOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesResponseOrBuilder.java
index 56eedfbc84..d98fbf9b75 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesResponseOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface ListPrincipalAccessBoundaryPoliciesResponseOrBuilder
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/OperationMetadata.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/OperationMetadata.java
index 5319524475..bb16a697b1 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/OperationMetadata.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/OperationMetadata.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/operation_metadata.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new OperationMetadata();
   }
 
+  @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.iam.v3beta.OperationMetadataProto
         .internal_static_google_iam_v3beta_OperationMetadata_descriptor;
@@ -67,7 +71,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v3beta.OperationMetadata.Builder.class);
   }
 
-  private int bitField0_;
   public static final int CREATE_TIME_FIELD_NUMBER = 1;
   private com.google.protobuf.Timestamp createTime_;
 
@@ -85,7 +88,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return createTime_ != null;
   }
 
   /**
@@ -117,7 +120,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+    return getCreateTime();
   }
 
   public static final int END_TIME_FIELD_NUMBER = 2;
@@ -137,7 +140,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasEndTime() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return endTime_ != null;
   }
 
   /**
@@ -169,13 +172,11 @@ public com.google.protobuf.Timestamp getEndTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
-    return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_;
+    return getEndTime();
   }
 
   public static final int TARGET_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object target_ = "";
+  private volatile java.lang.Object target_;
 
   /**
    *
@@ -226,9 +227,7 @@ public com.google.protobuf.ByteString getTargetBytes() {
   }
 
   public static final int VERB_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object verb_ = "";
+  private volatile java.lang.Object verb_;
 
   /**
    *
@@ -279,9 +278,7 @@ public com.google.protobuf.ByteString getVerbBytes() {
   }
 
   public static final int STATUS_MESSAGE_FIELD_NUMBER = 5;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object statusMessage_ = "";
+  private volatile java.lang.Object statusMessage_;
 
   /**
    *
@@ -332,7 +329,7 @@ public com.google.protobuf.ByteString getStatusMessageBytes() {
   }
 
   public static final int REQUESTED_CANCELLATION_FIELD_NUMBER = 6;
-  private boolean requestedCancellation_ = false;
+  private boolean requestedCancellation_;
 
   /**
    *
@@ -355,9 +352,7 @@ public boolean getRequestedCancellation() {
   }
 
   public static final int API_VERSION_FIELD_NUMBER = 7;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object apiVersion_ = "";
+  private volatile java.lang.Object apiVersion_;
 
   /**
    *
@@ -421,10 +416,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       output.writeMessage(1, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (endTime_ != null) {
       output.writeMessage(2, getEndTime());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(target_)) {
@@ -451,10 +446,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (endTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getEndTime());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(target_)) {
@@ -659,41 +654,37 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.OperationMetadata.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCreateTimeFieldBuilder();
-        getEndTimeFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      endTime_ = null;
-      if (endTimeBuilder_ != null) {
-        endTimeBuilder_.dispose();
+      if (endTimeBuilder_ == null) {
+        endTime_ = null;
+      } else {
+        endTime_ = null;
         endTimeBuilder_ = null;
       }
       target_ = "";
+
       verb_ = "";
+
       statusMessage_ = "";
+
       requestedCancellation_ = false;
+
       apiVersion_ = "";
+
       return this;
     }
 
@@ -721,42 +712,25 @@ public com.google.iam.v3beta.OperationMetadata build() {
     public com.google.iam.v3beta.OperationMetadata buildPartial() {
       com.google.iam.v3beta.OperationMetadata result =
           new com.google.iam.v3beta.OperationMetadata(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (createTimeBuilder_ == null) {
+        result.createTime_ = createTime_;
+      } else {
+        result.createTime_ = createTimeBuilder_.build();
+      }
+      if (endTimeBuilder_ == null) {
+        result.endTime_ = endTime_;
+      } else {
+        result.endTime_ = endTimeBuilder_.build();
       }
+      result.target_ = target_;
+      result.verb_ = verb_;
+      result.statusMessage_ = statusMessage_;
+      result.requestedCancellation_ = requestedCancellation_;
+      result.apiVersion_ = apiVersion_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v3beta.OperationMetadata result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.target_ = target_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.verb_ = verb_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.statusMessage_ = statusMessage_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.requestedCancellation_ = requestedCancellation_;
-      }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.apiVersion_ = apiVersion_;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -810,17 +784,14 @@ public Builder mergeFrom(com.google.iam.v3beta.OperationMetadata other) {
       }
       if (!other.getTarget().isEmpty()) {
         target_ = other.target_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getVerb().isEmpty()) {
         verb_ = other.verb_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (!other.getStatusMessage().isEmpty()) {
         statusMessage_ = other.statusMessage_;
-        bitField0_ |= 0x00000010;
         onChanged();
       }
       if (other.getRequestedCancellation() != false) {
@@ -828,7 +799,6 @@ public Builder mergeFrom(com.google.iam.v3beta.OperationMetadata other) {
       }
       if (!other.getApiVersion().isEmpty()) {
         apiVersion_ = other.apiVersion_;
-        bitField0_ |= 0x00000040;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -860,43 +830,43 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 target_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 verb_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             case 42:
               {
                 statusMessage_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 42
             case 48:
               {
                 requestedCancellation_ = input.readBool();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 48
             case 58:
               {
                 apiVersion_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 58
             default:
@@ -916,8 +886,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.protobuf.Timestamp createTime_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.protobuf.Timestamp,
@@ -939,7 +907,7 @@ public Builder mergeFrom(
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return createTimeBuilder_ != null || createTime_ != null;
     }
 
     /**
@@ -982,11 +950,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -1004,11 +972,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -1025,20 +993,17 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && createTime_ != null
-            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getCreateTimeBuilder().mergeFrom(value);
+        if (createTime_ != null) {
+          createTime_ =
+              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
         } else {
           createTime_ = value;
         }
+        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-      if (createTime_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1054,13 +1019,14 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearCreateTime() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+        onChanged();
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1076,7 +1042,7 @@ public Builder clearCreateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -1150,7 +1116,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      * @return Whether the endTime field is set.
      */
     public boolean hasEndTime() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return endTimeBuilder_ != null || endTime_ != null;
     }
 
     /**
@@ -1189,11 +1155,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         endTime_ = value;
+        onChanged();
       } else {
         endTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -1210,11 +1176,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
     public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (endTimeBuilder_ == null) {
         endTime_ = builderForValue.build();
+        onChanged();
       } else {
         endTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -1230,20 +1196,17 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue)
      */
     public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
       if (endTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && endTime_ != null
-            && endTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getEndTimeBuilder().mergeFrom(value);
+        if (endTime_ != null) {
+          endTime_ =
+              com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial();
         } else {
           endTime_ = value;
         }
+        onChanged();
       } else {
         endTimeBuilder_.mergeFrom(value);
       }
-      if (endTime_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1258,13 +1221,14 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearEndTime() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      endTime_ = null;
-      if (endTimeBuilder_ != null) {
-        endTimeBuilder_.dispose();
+      if (endTimeBuilder_ == null) {
+        endTime_ = null;
+        onChanged();
+      } else {
+        endTime_ = null;
         endTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1279,7 +1243,7 @@ public Builder clearEndTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getEndTimeFieldBuilder().getBuilder();
     }
@@ -1393,8 +1357,8 @@ public Builder setTarget(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       target_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1411,8 +1375,8 @@ public Builder setTarget(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTarget() {
+
       target_ = getDefaultInstance().getTarget();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1434,8 +1398,8 @@ public Builder setTargetBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       target_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1504,8 +1468,8 @@ public Builder setVerb(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       verb_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1522,8 +1486,8 @@ public Builder setVerb(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearVerb() {
+
       verb_ = getDefaultInstance().getVerb();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1545,8 +1509,8 @@ public Builder setVerbBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       verb_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1615,8 +1579,8 @@ public Builder setStatusMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       statusMessage_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1633,8 +1597,8 @@ public Builder setStatusMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearStatusMessage() {
+
       statusMessage_ = getDefaultInstance().getStatusMessage();
-      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -1656,8 +1620,8 @@ public Builder setStatusMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       statusMessage_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1703,7 +1667,6 @@ public boolean getRequestedCancellation() {
     public Builder setRequestedCancellation(boolean value) {
 
       requestedCancellation_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1724,7 +1687,7 @@ public Builder setRequestedCancellation(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearRequestedCancellation() {
-      bitField0_ = (bitField0_ & ~0x00000020);
+
       requestedCancellation_ = false;
       onChanged();
       return this;
@@ -1794,8 +1757,8 @@ public Builder setApiVersion(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       apiVersion_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1812,8 +1775,8 @@ public Builder setApiVersion(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearApiVersion() {
+
       apiVersion_ = getDefaultInstance().getApiVersion();
-      bitField0_ = (bitField0_ & ~0x00000040);
       onChanged();
       return this;
     }
@@ -1835,8 +1798,8 @@ public Builder setApiVersionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       apiVersion_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/OperationMetadataOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/OperationMetadataOrBuilder.java
index ef5a7f81fc..fa9e74aa70 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/OperationMetadataOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/OperationMetadataOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/operation_metadata.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface OperationMetadataOrBuilder
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/OperationMetadataProto.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/OperationMetadataProto.java
index cefd6c3b91..cfddfe0e1d 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/OperationMetadataProto.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/OperationMetadataProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/operation_metadata.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public final class OperationMetadataProto {
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBinding.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBinding.java
index a0d18cb389..7361798047 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBinding.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBinding.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_binding_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -55,6 +54,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PolicyBinding();
   }
 
+  @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.iam.v3beta.PolicyBindingResourcesProto
         .internal_static_google_iam_v3beta_PolicyBinding_descriptor;
@@ -62,8 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 5:
         return internalGetAnnotations();
@@ -231,7 +234,6 @@ public interface TargetOrBuilder
      * bindings. The principal set must be directly parented by the policy
      * binding's parent or same as the parent if the target is a
      * project/folder/organization.
-     *
      * Examples:
      * * For binding's parented by an organization:
      *   * Organization:
@@ -265,7 +267,6 @@ public interface TargetOrBuilder
      * bindings. The principal set must be directly parented by the policy
      * binding's parent or same as the parent if the target is a
      * project/folder/organization.
-     *
      * Examples:
      * * For binding's parented by an organization:
      *   * Organization:
@@ -299,7 +300,6 @@ public interface TargetOrBuilder
      * bindings. The principal set must be directly parented by the policy
      * binding's parent or same as the parent if the target is a
      * project/folder/organization.
-     *
      * Examples:
      * * For binding's parented by an organization:
      *   * Organization:
@@ -325,7 +325,7 @@ public interface TargetOrBuilder
      */
     com.google.protobuf.ByteString getPrincipalSetBytes();
 
-    com.google.iam.v3beta.PolicyBinding.Target.TargetCase getTargetCase();
+    public com.google.iam.v3beta.PolicyBinding.Target.TargetCase getTargetCase();
   }
 
   /**
@@ -357,6 +357,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Target();
     }
 
+    @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.iam.v3beta.PolicyBindingResourcesProto
           .internal_static_google_iam_v3beta_PolicyBinding_Target_descriptor;
@@ -373,8 +378,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     private int targetCase_ = 0;
-
-    @SuppressWarnings("serial")
     private java.lang.Object target_;
 
     public enum TargetCase
@@ -429,7 +432,6 @@ public TargetCase getTargetCase() {
      * bindings. The principal set must be directly parented by the policy
      * binding's parent or same as the parent if the target is a
      * project/folder/organization.
-     *
      * Examples:
      * * For binding's parented by an organization:
      *   * Organization:
@@ -465,7 +467,6 @@ public boolean hasPrincipalSet() {
      * bindings. The principal set must be directly parented by the policy
      * binding's parent or same as the parent if the target is a
      * project/folder/organization.
-     *
      * Examples:
      * * For binding's parented by an organization:
      *   * Organization:
@@ -514,7 +515,6 @@ public java.lang.String getPrincipalSet() {
      * bindings. The principal set must be directly parented by the policy
      * binding's parent or same as the parent if the target is a
      * project/folder/organization.
-     *
      * Examples:
      * * For binding's parented by an organization:
      *   * Organization:
@@ -769,7 +769,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         targetCase_ = 0;
         target_ = null;
         return this;
@@ -799,23 +798,14 @@ public com.google.iam.v3beta.PolicyBinding.Target build() {
       public com.google.iam.v3beta.PolicyBinding.Target buildPartial() {
         com.google.iam.v3beta.PolicyBinding.Target result =
             new com.google.iam.v3beta.PolicyBinding.Target(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        if (targetCase_ == 1) {
+          result.target_ = target_;
         }
-        buildPartialOneofs(result);
+        result.targetCase_ = targetCase_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.iam.v3beta.PolicyBinding.Target result) {
-        int from_bitField0_ = bitField0_;
-      }
-
-      private void buildPartialOneofs(com.google.iam.v3beta.PolicyBinding.Target result) {
-        result.targetCase_ = targetCase_;
-        result.target_ = this.target_;
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -940,8 +930,6 @@ public Builder clearTarget() {
         return this;
       }
 
-      private int bitField0_;
-
       /**
        *
        *
@@ -950,7 +938,6 @@ public Builder clearTarget() {
        * bindings. The principal set must be directly parented by the policy
        * binding's parent or same as the parent if the target is a
        * project/folder/organization.
-       *
        * Examples:
        * * For binding's parented by an organization:
        *   * Organization:
@@ -987,7 +974,6 @@ public boolean hasPrincipalSet() {
        * bindings. The principal set must be directly parented by the policy
        * binding's parent or same as the parent if the target is a
        * project/folder/organization.
-       *
        * Examples:
        * * For binding's parented by an organization:
        *   * Organization:
@@ -1037,7 +1023,6 @@ public java.lang.String getPrincipalSet() {
        * bindings. The principal set must be directly parented by the policy
        * binding's parent or same as the parent if the target is a
        * project/folder/organization.
-       *
        * Examples:
        * * For binding's parented by an organization:
        *   * Organization:
@@ -1087,7 +1072,6 @@ public com.google.protobuf.ByteString getPrincipalSetBytes() {
        * bindings. The principal set must be directly parented by the policy
        * binding's parent or same as the parent if the target is a
        * project/folder/organization.
-       *
        * Examples:
        * * For binding's parented by an organization:
        *   * Organization:
@@ -1130,7 +1114,6 @@ public Builder setPrincipalSet(java.lang.String value) {
        * bindings. The principal set must be directly parented by the policy
        * binding's parent or same as the parent if the target is a
        * project/folder/organization.
-       *
        * Examples:
        * * For binding's parented by an organization:
        *   * Organization:
@@ -1171,7 +1154,6 @@ public Builder clearPrincipalSet() {
        * bindings. The principal set must be directly parented by the policy
        * binding's parent or same as the parent if the target is a
        * project/folder/organization.
-       *
        * Examples:
        * * For binding's parented by an organization:
        *   * Organization:
@@ -1271,11 +1253,8 @@ public com.google.iam.v3beta.PolicyBinding.Target getDefaultInstanceForType() {
     }
   }
 
-  private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -1285,9 +1264,7 @@ public com.google.iam.v3beta.PolicyBinding.Target getDefaultInstanceForType() {
    * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
    * The binding parent is the closest Resource Manager resource (project,
    * folder, or organization) to the binding target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -1319,9 +1296,7 @@ public java.lang.String getName() {
    * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
    * The binding parent is the closest Resource Manager resource (project,
    * folder, or organization) to the binding target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -1346,9 +1321,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int UID_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object uid_ = "";
+  private volatile java.lang.Object uid_;
 
   /**
    *
@@ -1405,9 +1378,7 @@ public com.google.protobuf.ByteString getUidBytes() {
   }
 
   public static final int ETAG_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object etag_ = "";
+  private volatile java.lang.Object etag_;
 
   /**
    *
@@ -1460,9 +1431,7 @@ public com.google.protobuf.ByteString getEtagBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object displayName_ = "";
+  private volatile java.lang.Object displayName_;
 
   /**
    *
@@ -1527,7 +1496,6 @@ private static final class AnnotationsDefaultEntryHolder {
             "");
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField annotations_;
 
   private com.google.protobuf.MapField
@@ -1599,10 +1567,8 @@ public java.util.Map getAnnotationsMap() {
    * 
    */
   @java.lang.Override
-  public /* nullable */ java.lang.String getAnnotationsOrDefault(
-      java.lang.String key,
-      /* nullable */
-      java.lang.String defaultValue) {
+  public java.lang.String getAnnotationsOrDefault(
+      java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -1653,7 +1619,7 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
    */
   @java.lang.Override
   public boolean hasTarget() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return target_ != null;
   }
 
   /**
@@ -1691,13 +1657,11 @@ public com.google.iam.v3beta.PolicyBinding.Target getTarget() {
    */
   @java.lang.Override
   public com.google.iam.v3beta.PolicyBinding.TargetOrBuilder getTargetOrBuilder() {
-    return target_ == null
-        ? com.google.iam.v3beta.PolicyBinding.Target.getDefaultInstance()
-        : target_;
+    return getTarget();
   }
 
   public static final int POLICY_KIND_FIELD_NUMBER = 11;
-  private int policyKind_ = 0;
+  private int policyKind_;
 
   /**
    *
@@ -1705,7 +1669,6 @@ public com.google.iam.v3beta.PolicyBinding.TargetOrBuilder getTargetOrBuilder()
    * 
    * Immutable. The kind of the policy to attach in this binding. This field
    * must be one of the following:
-   *
    * - Left empty (will be automatically set to the policy kind)
    * - The input policy kind
    * 

@@ -1727,7 +1690,6 @@ public int getPolicyKindValue() {
    * 
    * Immutable. The kind of the policy to attach in this binding. This field
    * must be one of the following:
-   *
    * - Left empty (will be automatically set to the policy kind)
    * - The input policy kind
    * 

@@ -1740,15 +1702,14 @@ public int getPolicyKindValue() {
    */
   @java.lang.Override
   public com.google.iam.v3beta.PolicyBinding.PolicyKind getPolicyKind() {
+    @SuppressWarnings("deprecation")
     com.google.iam.v3beta.PolicyBinding.PolicyKind result =
-        com.google.iam.v3beta.PolicyBinding.PolicyKind.forNumber(policyKind_);
+        com.google.iam.v3beta.PolicyBinding.PolicyKind.valueOf(policyKind_);
     return result == null ? com.google.iam.v3beta.PolicyBinding.PolicyKind.UNRECOGNIZED : result;
   }
 
   public static final int POLICY_FIELD_NUMBER = 7;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object policy_ = "";
+  private volatile java.lang.Object policy_;
 
   /**
    *
@@ -1805,9 +1766,7 @@ public com.google.protobuf.ByteString getPolicyBytes() {
   }
 
   public static final int POLICY_UID_FIELD_NUMBER = 12;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object policyUid_ = "";
+  private volatile java.lang.Object policyUid_;
 
   /**
    *
@@ -1869,33 +1828,25 @@ public com.google.protobuf.ByteString getPolicyUidBytes() {
    * joined by the
    * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
    * cannot contain more than 250 characters.
-   *
    * The condition is currently only supported when bound to policies of kind
    * principal access boundary.
-   *
    * When the bound policy is a principal access boundary policy, the only
    * supported attributes in any subexpression are `principal.type` and
    * `principal.subject`. An example expression is: "principal.type ==
    * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
    * 'bob@example.com'".
-   *
    * Allowed operations for `principal.subject`:
-   *
    * - `principal.subject == <principal subject string>`
    * - `principal.subject != <principal subject string>`
    * - `principal.subject in [<list of principal subjects>]`
    * - `principal.subject.startsWith(<string>)`
    * - `principal.subject.endsWith(<string>)`
-   *
    * Allowed operations for `principal.type`:
-   *
    * - `principal.type == <principal type string>`
    * - `principal.type != <principal type string>`
    * - `principal.type in [<list of principal types>]`
-   *
    * Supported principal types are Workspace, Workforce Pool, Workload Pool and
    * Service Account. Allowed string must be one of:
-   *
    * - iam.googleapis.com/WorkspaceIdentity
    * - iam.googleapis.com/WorkforcePoolIdentity
    * - iam.googleapis.com/WorkloadPoolIdentity
@@ -1908,7 +1859,7 @@ public com.google.protobuf.ByteString getPolicyUidBytes() {
    */
   @java.lang.Override
   public boolean hasCondition() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return condition_ != null;
   }
 
   /**
@@ -1920,33 +1871,25 @@ public boolean hasCondition() {
    * joined by the
    * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
    * cannot contain more than 250 characters.
-   *
    * The condition is currently only supported when bound to policies of kind
    * principal access boundary.
-   *
    * When the bound policy is a principal access boundary policy, the only
    * supported attributes in any subexpression are `principal.type` and
    * `principal.subject`. An example expression is: "principal.type ==
    * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
    * 'bob@example.com'".
-   *
    * Allowed operations for `principal.subject`:
-   *
    * - `principal.subject == <principal subject string>`
    * - `principal.subject != <principal subject string>`
    * - `principal.subject in [<list of principal subjects>]`
    * - `principal.subject.startsWith(<string>)`
    * - `principal.subject.endsWith(<string>)`
-   *
    * Allowed operations for `principal.type`:
-   *
    * - `principal.type == <principal type string>`
    * - `principal.type != <principal type string>`
    * - `principal.type in [<list of principal types>]`
-   *
    * Supported principal types are Workspace, Workforce Pool, Workload Pool and
    * Service Account. Allowed string must be one of:
-   *
    * - iam.googleapis.com/WorkspaceIdentity
    * - iam.googleapis.com/WorkforcePoolIdentity
    * - iam.googleapis.com/WorkloadPoolIdentity
@@ -1971,33 +1914,25 @@ public com.google.type.Expr getCondition() {
    * joined by the
    * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
    * cannot contain more than 250 characters.
-   *
    * The condition is currently only supported when bound to policies of kind
    * principal access boundary.
-   *
    * When the bound policy is a principal access boundary policy, the only
    * supported attributes in any subexpression are `principal.type` and
    * `principal.subject`. An example expression is: "principal.type ==
    * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
    * 'bob@example.com'".
-   *
    * Allowed operations for `principal.subject`:
-   *
    * - `principal.subject == <principal subject string>`
    * - `principal.subject != <principal subject string>`
    * - `principal.subject in [<list of principal subjects>]`
    * - `principal.subject.startsWith(<string>)`
    * - `principal.subject.endsWith(<string>)`
-   *
    * Allowed operations for `principal.type`:
-   *
    * - `principal.type == <principal type string>`
    * - `principal.type != <principal type string>`
    * - `principal.type in [<list of principal types>]`
-   *
    * Supported principal types are Workspace, Workforce Pool, Workload Pool and
    * Service Account. Allowed string must be one of:
-   *
    * - iam.googleapis.com/WorkspaceIdentity
    * - iam.googleapis.com/WorkforcePoolIdentity
    * - iam.googleapis.com/WorkloadPoolIdentity
@@ -2008,7 +1943,7 @@ public com.google.type.Expr getCondition() {
    */
   @java.lang.Override
   public com.google.type.ExprOrBuilder getConditionOrBuilder() {
-    return condition_ == null ? com.google.type.Expr.getDefaultInstance() : condition_;
+    return getCondition();
   }
 
   public static final int CREATE_TIME_FIELD_NUMBER = 9;
@@ -2028,7 +1963,7 @@ public com.google.type.ExprOrBuilder getConditionOrBuilder() {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return createTime_ != null;
   }
 
   /**
@@ -2060,7 +1995,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+    return getCreateTime();
   }
 
   public static final int UPDATE_TIME_FIELD_NUMBER = 10;
@@ -2080,7 +2015,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateTime() {
-    return ((bitField0_ & 0x00000008) != 0);
+    return updateTime_ != null;
   }
 
   /**
@@ -2112,7 +2047,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+    return getUpdateTime();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -2143,19 +2078,19 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
         output, internalGetAnnotations(), AnnotationsDefaultEntryHolder.defaultEntry, 5);
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (target_ != null) {
       output.writeMessage(6, getTarget());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policy_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 7, policy_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (condition_ != null) {
       output.writeMessage(8, getCondition());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (createTime_ != null) {
       output.writeMessage(9, getCreateTime());
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (updateTime_ != null) {
       output.writeMessage(10, getUpdateTime());
     }
     if (policyKind_
@@ -2196,19 +2131,19 @@ public int getSerializedSize() {
               .build();
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, annotations__);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (target_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getTarget());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policy_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, policy_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (condition_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getCondition());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (createTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getCreateTime());
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (updateTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getUpdateTime());
     }
     if (policyKind_
@@ -2421,8 +2356,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 5:
           return internalGetAnnotations();
@@ -2432,8 +2366,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 5:
           return internalGetMutableAnnotations();
@@ -2453,54 +2386,52 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     }
 
     // Construct using com.google.iam.v3beta.PolicyBinding.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getTargetFieldBuilder();
-        getConditionFieldBuilder();
-        getCreateTimeFieldBuilder();
-        getUpdateTimeFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       uid_ = "";
+
       etag_ = "";
+
       displayName_ = "";
+
       internalGetMutableAnnotations().clear();
-      target_ = null;
-      if (targetBuilder_ != null) {
-        targetBuilder_.dispose();
+      if (targetBuilder_ == null) {
+        target_ = null;
+      } else {
+        target_ = null;
         targetBuilder_ = null;
       }
       policyKind_ = 0;
+
       policy_ = "";
+
       policyUid_ = "";
-      condition_ = null;
-      if (conditionBuilder_ != null) {
-        conditionBuilder_.dispose();
+
+      if (conditionBuilder_ == null) {
+        condition_ = null;
+      } else {
+        condition_ = null;
         conditionBuilder_ = null;
       }
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
       return this;
@@ -2529,58 +2460,38 @@ public com.google.iam.v3beta.PolicyBinding build() {
     @java.lang.Override
     public com.google.iam.v3beta.PolicyBinding buildPartial() {
       com.google.iam.v3beta.PolicyBinding result = new com.google.iam.v3beta.PolicyBinding(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.iam.v3beta.PolicyBinding result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.uid_ = uid_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.etag_ = etag_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.displayName_ = displayName_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.annotations_ = internalGetAnnotations();
-        result.annotations_.makeImmutable();
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.target_ = targetBuilder_ == null ? target_ : targetBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.policyKind_ = policyKind_;
-      }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.policy_ = policy_;
-      }
-      if (((from_bitField0_ & 0x00000100) != 0)) {
-        result.policyUid_ = policyUid_;
+      result.name_ = name_;
+      result.uid_ = uid_;
+      result.etag_ = etag_;
+      result.displayName_ = displayName_;
+      result.annotations_ = internalGetAnnotations();
+      result.annotations_.makeImmutable();
+      if (targetBuilder_ == null) {
+        result.target_ = target_;
+      } else {
+        result.target_ = targetBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000200) != 0)) {
-        result.condition_ = conditionBuilder_ == null ? condition_ : conditionBuilder_.build();
-        to_bitField0_ |= 0x00000002;
+      result.policyKind_ = policyKind_;
+      result.policy_ = policy_;
+      result.policyUid_ = policyUid_;
+      if (conditionBuilder_ == null) {
+        result.condition_ = condition_;
+      } else {
+        result.condition_ = conditionBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000400) != 0)) {
-        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
-        to_bitField0_ |= 0x00000004;
+      if (createTimeBuilder_ == null) {
+        result.createTime_ = createTime_;
+      } else {
+        result.createTime_ = createTimeBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000800) != 0)) {
-        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
-        to_bitField0_ |= 0x00000008;
+      if (updateTimeBuilder_ == null) {
+        result.updateTime_ = updateTime_;
+      } else {
+        result.updateTime_ = updateTimeBuilder_.build();
       }
-      result.bitField0_ |= to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -2630,26 +2541,21 @@ public Builder mergeFrom(com.google.iam.v3beta.PolicyBinding other) {
       if (other == com.google.iam.v3beta.PolicyBinding.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getUid().isEmpty()) {
         uid_ = other.uid_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getEtag().isEmpty()) {
         etag_ = other.etag_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       internalGetMutableAnnotations().mergeFrom(other.internalGetAnnotations());
-      bitField0_ |= 0x00000010;
       if (other.hasTarget()) {
         mergeTarget(other.getTarget());
       }
@@ -2658,12 +2564,10 @@ public Builder mergeFrom(com.google.iam.v3beta.PolicyBinding other) {
       }
       if (!other.getPolicy().isEmpty()) {
         policy_ = other.policy_;
-        bitField0_ |= 0x00000080;
         onChanged();
       }
       if (!other.getPolicyUid().isEmpty()) {
         policyUid_ = other.policyUid_;
-        bitField0_ |= 0x00000100;
         onChanged();
       }
       if (other.hasCondition()) {
@@ -2704,25 +2608,25 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 uid_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 etag_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 displayName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             case 42:
@@ -2734,49 +2638,48 @@ public Builder mergeFrom(
                 internalGetMutableAnnotations()
                     .getMutableMap()
                     .put(annotations__.getKey(), annotations__.getValue());
-                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 50:
               {
                 input.readMessage(getTargetFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 50
             case 58:
               {
                 policy_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 58
             case 66:
               {
                 input.readMessage(getConditionFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000200;
+
                 break;
               } // case 66
             case 74:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000400;
+
                 break;
               } // case 74
             case 82:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000800;
+
                 break;
               } // case 82
             case 88:
               {
                 policyKind_ = input.readEnum();
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 88
             case 98:
               {
                 policyUid_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000100;
+
                 break;
               } // case 98
             default:
@@ -2808,9 +2711,7 @@ public Builder mergeFrom(
      * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
      * The binding parent is the closest Resource Manager resource (project,
      * folder, or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -2841,9 +2742,7 @@ public java.lang.String getName() {
      * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
      * The binding parent is the closest Resource Manager resource (project,
      * folder, or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -2874,9 +2773,7 @@ public com.google.protobuf.ByteString getNameBytes() {
      * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
      * The binding parent is the closest Resource Manager resource (project,
      * folder, or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -2892,8 +2789,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2906,9 +2803,7 @@ public Builder setName(java.lang.String value) {
      * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
      * The binding parent is the closest Resource Manager resource (project,
      * folder, or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -2920,8 +2815,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -2934,9 +2829,7 @@ public Builder clearName() {
      * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
      * The binding parent is the closest Resource Manager resource (project,
      * folder, or organization) to the binding target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
      * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -2953,8 +2846,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3032,8 +2925,8 @@ public Builder setUid(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       uid_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3053,8 +2946,8 @@ public Builder setUid(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearUid() {
+
       uid_ = getDefaultInstance().getUid();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -3079,8 +2972,8 @@ public Builder setUidBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       uid_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3152,8 +3045,8 @@ public Builder setEtag(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       etag_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -3171,8 +3064,8 @@ public Builder setEtag(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEtag() {
+
       etag_ = getDefaultInstance().getEtag();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -3195,8 +3088,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       etag_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -3268,8 +3161,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       displayName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -3287,8 +3180,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
+
       displayName_ = getDefaultInstance().getDisplayName();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -3311,8 +3204,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       displayName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -3330,6 +3223,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
 
     private com.google.protobuf.MapField
         internalGetMutableAnnotations() {
+      onChanged();
+      ;
       if (annotations_ == null) {
         annotations_ =
             com.google.protobuf.MapField.newMapField(AnnotationsDefaultEntryHolder.defaultEntry);
@@ -3337,8 +3232,6 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
       if (!annotations_.isMutable()) {
         annotations_ = annotations_.copy();
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
       return annotations_;
     }
 
@@ -3403,10 +3296,8 @@ public java.util.Map getAnnotationsMap() {
      * 
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getAnnotationsOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getAnnotationsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -3439,7 +3330,6 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
     }
 
     public Builder clearAnnotations() {
-      bitField0_ = (bitField0_ & ~0x00000010);
       internalGetMutableAnnotations().getMutableMap().clear();
       return this;
     }
@@ -3467,7 +3357,6 @@ public Builder removeAnnotations(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableAnnotations() {
-      bitField0_ |= 0x00000010;
       return internalGetMutableAnnotations().getMutableMap();
     }
 
@@ -3490,8 +3379,8 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
+
       internalGetMutableAnnotations().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000010;
       return this;
     }
 
@@ -3509,7 +3398,6 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllAnnotations(java.util.Map values) {
       internalGetMutableAnnotations().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000010;
       return this;
     }
 
@@ -3535,7 +3423,7 @@ public Builder putAllAnnotations(java.util.Map
      */
     public Builder clearTarget() {
-      bitField0_ = (bitField0_ & ~0x00000020);
-      target_ = null;
-      if (targetBuilder_ != null) {
-        targetBuilder_.dispose();
+      if (targetBuilder_ == null) {
+        target_ = null;
+        onChanged();
+      } else {
+        target_ = null;
         targetBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -3678,7 +3566,7 @@ public Builder clearTarget() {
      * 
      */
     public com.google.iam.v3beta.PolicyBinding.Target.Builder getTargetBuilder() {
-      bitField0_ |= 0x00000020;
+
       onChanged();
       return getTargetFieldBuilder().getBuilder();
     }
@@ -3742,7 +3630,6 @@ public com.google.iam.v3beta.PolicyBinding.TargetOrBuilder getTargetOrBuilder()
      * 
      * Immutable. The kind of the policy to attach in this binding. This field
      * must be one of the following:
-     *
      * - Left empty (will be automatically set to the policy kind)
      * - The input policy kind
      * 

@@ -3764,7 +3651,6 @@ public int getPolicyKindValue() {
      * 
      * Immutable. The kind of the policy to attach in this binding. This field
      * must be one of the following:
-     *
      * - Left empty (will be automatically set to the policy kind)
      * - The input policy kind
      * 

@@ -3777,8 +3663,8 @@ public int getPolicyKindValue() {
      * @return This builder for chaining.
      */
     public Builder setPolicyKindValue(int value) {
+
       policyKind_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -3789,7 +3675,6 @@ public Builder setPolicyKindValue(int value) {
      * 
      * Immutable. The kind of the policy to attach in this binding. This field
      * must be one of the following:
-     *
      * - Left empty (will be automatically set to the policy kind)
      * - The input policy kind
      * 

@@ -3802,8 +3687,9 @@ public Builder setPolicyKindValue(int value) {
      */
     @java.lang.Override
     public com.google.iam.v3beta.PolicyBinding.PolicyKind getPolicyKind() {
+      @SuppressWarnings("deprecation")
       com.google.iam.v3beta.PolicyBinding.PolicyKind result =
-          com.google.iam.v3beta.PolicyBinding.PolicyKind.forNumber(policyKind_);
+          com.google.iam.v3beta.PolicyBinding.PolicyKind.valueOf(policyKind_);
       return result == null ? com.google.iam.v3beta.PolicyBinding.PolicyKind.UNRECOGNIZED : result;
     }
 
@@ -3813,7 +3699,6 @@ public com.google.iam.v3beta.PolicyBinding.PolicyKind getPolicyKind() {
      * 
      * Immutable. The kind of the policy to attach in this binding. This field
      * must be one of the following:
-     *
      * - Left empty (will be automatically set to the policy kind)
      * - The input policy kind
      * 

@@ -3829,7 +3714,7 @@ public Builder setPolicyKind(com.google.iam.v3beta.PolicyBinding.PolicyKind valu
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000040;
+
       policyKind_ = value.getNumber();
       onChanged();
       return this;
@@ -3841,7 +3726,6 @@ public Builder setPolicyKind(com.google.iam.v3beta.PolicyBinding.PolicyKind valu
      * 
      * Immutable. The kind of the policy to attach in this binding. This field
      * must be one of the following:
-     *
      * - Left empty (will be automatically set to the policy kind)
      * - The input policy kind
      * 

@@ -3853,7 +3737,7 @@ public Builder setPolicyKind(com.google.iam.v3beta.PolicyBinding.PolicyKind valu
      * @return This builder for chaining.
      */
     public Builder clearPolicyKind() {
-      bitField0_ = (bitField0_ & ~0x00000040);
+
       policyKind_ = 0;
       onChanged();
       return this;
@@ -3932,8 +3816,8 @@ public Builder setPolicy(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       policy_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -3953,8 +3837,8 @@ public Builder setPolicy(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPolicy() {
+
       policy_ = getDefaultInstance().getPolicy();
-      bitField0_ = (bitField0_ & ~0x00000080);
       onChanged();
       return this;
     }
@@ -3979,8 +3863,8 @@ public Builder setPolicyBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       policy_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -4049,8 +3933,8 @@ public Builder setPolicyUid(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       policyUid_ = value;
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -4067,8 +3951,8 @@ public Builder setPolicyUid(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPolicyUid() {
+
       policyUid_ = getDefaultInstance().getPolicyUid();
-      bitField0_ = (bitField0_ & ~0x00000100);
       onChanged();
       return this;
     }
@@ -4090,8 +3974,8 @@ public Builder setPolicyUidBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       policyUid_ = value;
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -4110,33 +3994,25 @@ public Builder setPolicyUidBytes(com.google.protobuf.ByteString value) {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4148,7 +4024,7 @@ public Builder setPolicyUidBytes(com.google.protobuf.ByteString value) {
      * @return Whether the condition field is set.
      */
     public boolean hasCondition() {
-      return ((bitField0_ & 0x00000200) != 0);
+      return conditionBuilder_ != null || condition_ != null;
     }
 
     /**
@@ -4160,33 +4036,25 @@ public boolean hasCondition() {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4214,33 +4082,25 @@ public com.google.type.Expr getCondition() {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4255,11 +4115,11 @@ public Builder setCondition(com.google.type.Expr value) {
           throw new NullPointerException();
         }
         condition_ = value;
+        onChanged();
       } else {
         conditionBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000200;
-      onChanged();
+
       return this;
     }
 
@@ -4272,33 +4132,25 @@ public Builder setCondition(com.google.type.Expr value) {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4310,11 +4162,11 @@ public Builder setCondition(com.google.type.Expr value) {
     public Builder setCondition(com.google.type.Expr.Builder builderForValue) {
       if (conditionBuilder_ == null) {
         condition_ = builderForValue.build();
+        onChanged();
       } else {
         conditionBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000200;
-      onChanged();
+
       return this;
     }
 
@@ -4327,33 +4179,25 @@ public Builder setCondition(com.google.type.Expr.Builder builderForValue) {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4364,20 +4208,16 @@ public Builder setCondition(com.google.type.Expr.Builder builderForValue) {
      */
     public Builder mergeCondition(com.google.type.Expr value) {
       if (conditionBuilder_ == null) {
-        if (((bitField0_ & 0x00000200) != 0)
-            && condition_ != null
-            && condition_ != com.google.type.Expr.getDefaultInstance()) {
-          getConditionBuilder().mergeFrom(value);
+        if (condition_ != null) {
+          condition_ = com.google.type.Expr.newBuilder(condition_).mergeFrom(value).buildPartial();
         } else {
           condition_ = value;
         }
+        onChanged();
       } else {
         conditionBuilder_.mergeFrom(value);
       }
-      if (condition_ != null) {
-        bitField0_ |= 0x00000200;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -4390,33 +4230,25 @@ public Builder mergeCondition(com.google.type.Expr value) {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4426,13 +4258,14 @@ public Builder mergeCondition(com.google.type.Expr value) {
      * .google.type.Expr condition = 8 [(.google.api.field_behavior) = OPTIONAL];
      */
     public Builder clearCondition() {
-      bitField0_ = (bitField0_ & ~0x00000200);
-      condition_ = null;
-      if (conditionBuilder_ != null) {
-        conditionBuilder_.dispose();
+      if (conditionBuilder_ == null) {
+        condition_ = null;
+        onChanged();
+      } else {
+        condition_ = null;
         conditionBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -4445,33 +4278,25 @@ public Builder clearCondition() {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4481,7 +4306,7 @@ public Builder clearCondition() {
      * .google.type.Expr condition = 8 [(.google.api.field_behavior) = OPTIONAL];
      */
     public com.google.type.Expr.Builder getConditionBuilder() {
-      bitField0_ |= 0x00000200;
+
       onChanged();
       return getConditionFieldBuilder().getBuilder();
     }
@@ -4495,33 +4320,25 @@ public com.google.type.Expr.Builder getConditionBuilder() {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4547,33 +4364,25 @@ public com.google.type.ExprOrBuilder getConditionOrBuilder() {
      * joined by the
      * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
      * cannot contain more than 250 characters.
-     *
      * The condition is currently only supported when bound to policies of kind
      * principal access boundary.
-     *
      * When the bound policy is a principal access boundary policy, the only
      * supported attributes in any subexpression are `principal.type` and
      * `principal.subject`. An example expression is: "principal.type ==
      * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
      * 'bob@example.com'".
-     *
      * Allowed operations for `principal.subject`:
-     *
      * - `principal.subject == <principal subject string>`
      * - `principal.subject != <principal subject string>`
      * - `principal.subject in [<list of principal subjects>]`
      * - `principal.subject.startsWith(<string>)`
      * - `principal.subject.endsWith(<string>)`
-     *
      * Allowed operations for `principal.type`:
-     *
      * - `principal.type == <principal type string>`
      * - `principal.type != <principal type string>`
      * - `principal.type in [<list of principal types>]`
-     *
      * Supported principal types are Workspace, Workforce Pool, Workload Pool and
      * Service Account. Allowed string must be one of:
-     *
      * - iam.googleapis.com/WorkspaceIdentity
      * - iam.googleapis.com/WorkforcePoolIdentity
      * - iam.googleapis.com/WorkloadPoolIdentity
@@ -4616,7 +4425,7 @@ public com.google.type.ExprOrBuilder getConditionOrBuilder() {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return ((bitField0_ & 0x00000400) != 0);
+      return createTimeBuilder_ != null || createTime_ != null;
     }
 
     /**
@@ -4659,11 +4468,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000400;
-      onChanged();
+
       return this;
     }
 
@@ -4681,11 +4490,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000400;
-      onChanged();
+
       return this;
     }
 
@@ -4702,20 +4511,17 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000400) != 0)
-            && createTime_ != null
-            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getCreateTimeBuilder().mergeFrom(value);
+        if (createTime_ != null) {
+          createTime_ =
+              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
         } else {
           createTime_ = value;
         }
+        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-      if (createTime_ != null) {
-        bitField0_ |= 0x00000400;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -4731,13 +4537,14 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearCreateTime() {
-      bitField0_ = (bitField0_ & ~0x00000400);
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+        onChanged();
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -4753,7 +4560,7 @@ public Builder clearCreateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-      bitField0_ |= 0x00000400;
+
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -4828,7 +4635,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      * @return Whether the updateTime field is set.
      */
     public boolean hasUpdateTime() {
-      return ((bitField0_ & 0x00000800) != 0);
+      return updateTimeBuilder_ != null || updateTime_ != null;
     }
 
     /**
@@ -4871,11 +4678,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         updateTime_ = value;
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000800;
-      onChanged();
+
       return this;
     }
 
@@ -4893,11 +4700,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
     public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (updateTimeBuilder_ == null) {
         updateTime_ = builderForValue.build();
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000800;
-      onChanged();
+
       return this;
     }
 
@@ -4914,20 +4721,17 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       if (updateTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000800) != 0)
-            && updateTime_ != null
-            && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getUpdateTimeBuilder().mergeFrom(value);
+        if (updateTime_ != null) {
+          updateTime_ =
+              com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
         } else {
           updateTime_ = value;
         }
+        onChanged();
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-      if (updateTime_ != null) {
-        bitField0_ |= 0x00000800;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -4943,13 +4747,14 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearUpdateTime() {
-      bitField0_ = (bitField0_ & ~0x00000800);
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+        onChanged();
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -4965,7 +4770,7 @@ public Builder clearUpdateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-      bitField0_ |= 0x00000800;
+
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBindingOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBindingOrBuilder.java
index c99e5bc690..7ab59b2241 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBindingOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBindingOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_binding_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface PolicyBindingOrBuilder
@@ -32,9 +31,7 @@ public interface PolicyBindingOrBuilder
    * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
    * The binding parent is the closest Resource Manager resource (project,
    * folder, or organization) to the binding target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -55,9 +52,7 @@ public interface PolicyBindingOrBuilder
    * `{binding_parent/locations/{location}/policyBindings/{policy_binding_id}`.
    * The binding parent is the closest Resource Manager resource (project,
    * folder, or organization) to the binding target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `projects/{project_number}/locations/{location}/policyBindings/{policy_binding_id}`
    * * `folders/{folder_id}/locations/{location}/policyBindings/{policy_binding_id}`
@@ -216,6 +211,7 @@ public interface PolicyBindingOrBuilder
    * map<string, string> annotations = 5 [(.google.api.field_behavior) = OPTIONAL];
    * 
    */
+
   /* nullable */
   java.lang.String getAnnotationsOrDefault(
       java.lang.String key,
@@ -288,7 +284,6 @@ java.lang.String getAnnotationsOrDefault(
    * 
    * Immutable. The kind of the policy to attach in this binding. This field
    * must be one of the following:
-   *
    * - Left empty (will be automatically set to the policy kind)
    * - The input policy kind
    * 

@@ -307,7 +302,6 @@ java.lang.String getAnnotationsOrDefault(
    * 
    * Immutable. The kind of the policy to attach in this binding. This field
    * must be one of the following:
-   *
    * - Left empty (will be automatically set to the policy kind)
    * - The input policy kind
    * 

@@ -387,33 +381,25 @@ java.lang.String getAnnotationsOrDefault(
    * joined by the
    * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
    * cannot contain more than 250 characters.
-   *
    * The condition is currently only supported when bound to policies of kind
    * principal access boundary.
-   *
    * When the bound policy is a principal access boundary policy, the only
    * supported attributes in any subexpression are `principal.type` and
    * `principal.subject`. An example expression is: "principal.type ==
    * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
    * 'bob@example.com'".
-   *
    * Allowed operations for `principal.subject`:
-   *
    * - `principal.subject == <principal subject string>`
    * - `principal.subject != <principal subject string>`
    * - `principal.subject in [<list of principal subjects>]`
    * - `principal.subject.startsWith(<string>)`
    * - `principal.subject.endsWith(<string>)`
-   *
    * Allowed operations for `principal.type`:
-   *
    * - `principal.type == <principal type string>`
    * - `principal.type != <principal type string>`
    * - `principal.type in [<list of principal types>]`
-   *
    * Supported principal types are Workspace, Workforce Pool, Workload Pool and
    * Service Account. Allowed string must be one of:
-   *
    * - iam.googleapis.com/WorkspaceIdentity
    * - iam.googleapis.com/WorkforcePoolIdentity
    * - iam.googleapis.com/WorkloadPoolIdentity
@@ -435,33 +421,25 @@ java.lang.String getAnnotationsOrDefault(
    * joined by the
    * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
    * cannot contain more than 250 characters.
-   *
    * The condition is currently only supported when bound to policies of kind
    * principal access boundary.
-   *
    * When the bound policy is a principal access boundary policy, the only
    * supported attributes in any subexpression are `principal.type` and
    * `principal.subject`. An example expression is: "principal.type ==
    * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
    * 'bob@example.com'".
-   *
    * Allowed operations for `principal.subject`:
-   *
    * - `principal.subject == <principal subject string>`
    * - `principal.subject != <principal subject string>`
    * - `principal.subject in [<list of principal subjects>]`
    * - `principal.subject.startsWith(<string>)`
    * - `principal.subject.endsWith(<string>)`
-   *
    * Allowed operations for `principal.type`:
-   *
    * - `principal.type == <principal type string>`
    * - `principal.type != <principal type string>`
    * - `principal.type in [<list of principal types>]`
-   *
    * Supported principal types are Workspace, Workforce Pool, Workload Pool and
    * Service Account. Allowed string must be one of:
-   *
    * - iam.googleapis.com/WorkspaceIdentity
    * - iam.googleapis.com/WorkforcePoolIdentity
    * - iam.googleapis.com/WorkloadPoolIdentity
@@ -483,33 +461,25 @@ java.lang.String getAnnotationsOrDefault(
    * joined by the
    * "||"(Logical OR), "&&"(Logical AND) or "!"(Logical NOT) operators and
    * cannot contain more than 250 characters.
-   *
    * The condition is currently only supported when bound to policies of kind
    * principal access boundary.
-   *
    * When the bound policy is a principal access boundary policy, the only
    * supported attributes in any subexpression are `principal.type` and
    * `principal.subject`. An example expression is: "principal.type ==
    * 'iam.googleapis.com/ServiceAccount'" or "principal.subject ==
    * 'bob@example.com'".
-   *
    * Allowed operations for `principal.subject`:
-   *
    * - `principal.subject == <principal subject string>`
    * - `principal.subject != <principal subject string>`
    * - `principal.subject in [<list of principal subjects>]`
    * - `principal.subject.startsWith(<string>)`
    * - `principal.subject.endsWith(<string>)`
-   *
    * Allowed operations for `principal.type`:
-   *
    * - `principal.type == <principal type string>`
    * - `principal.type != <principal type string>`
    * - `principal.type in [<list of principal types>]`
-   *
    * Supported principal types are Workspace, Workforce Pool, Workload Pool and
    * Service Account. Allowed string must be one of:
-   *
    * - iam.googleapis.com/WorkspaceIdentity
    * - iam.googleapis.com/WorkforcePoolIdentity
    * - iam.googleapis.com/WorkloadPoolIdentity
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBindingResourcesProto.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBindingResourcesProto.java
index d7237528ca..33d400a26d 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBindingResourcesProto.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBindingResourcesProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_binding_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public final class PolicyBindingResourcesProto {
@@ -57,7 +56,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "google/protobuf/timestamp.proto\032\026google/type/expr.proto\"\342\007\n\r"
           + "PolicyBinding\022\021\n"
           + "\004name\030\001 \001(\tB\003\340A\010\022\030\n"
-          + "\003uid\030\002 \001(\tB\013\340A\003\342\214\317\327\010\002\010\001\022\021\n"
+          + "\003uid\030\002 \001(\tB\013\342\214\317\327\010\002\010\001\340A\003\022\021\n"
           + "\004etag\030\003 \001(\tB\003\340A\001\022\031\n"
           + "\014display_name\030\004 \001(\tB\003\340A\001\022K\n"
           + "\013annotations\030\005 \003(\01321.google.iam.v"
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBindingsServiceProto.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBindingsServiceProto.java
index ecb12861e6..f7d8c08731 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBindingsServiceProto.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBindingsServiceProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public final class PolicyBindingsServiceProto {
@@ -117,48 +116,47 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\017policy_bindings\030\001 \003(\0132 .google.iam.v3beta.PolicyBinding\022\034\n"
           + "\017next_page_token\030\002 \001(\tB\003\340A\0012\214\022\n"
           + "\016PolicyBindings\022\234\003\n"
-          + "\023CreatePolicyBinding\022-.go"
-          + "ogle.iam.v3beta.CreatePolicyBindingRequest\032\035.google.longrunning.Operation\"\266\002\312A\"\n"
-          + "\r"
-          + "PolicyBinding\022\021OperationMetadata\332A\'pare"
-          + "nt,policy_binding,policy_binding_id\202\323\344\223\002"
-          + "\340\001\"6/v3beta/{parent=projects/*/locations"
-          + "/*}/policyBindings:\016policy_bindingZG\"5/v3beta/{parent=folders/*/locations/*}/pol"
-          + "icyBindings:\016policy_bindingZM\";/v3beta/{"
-          + "parent=organizations/*/locations/*}/policyBindings:\016policy_binding\022\241\002\n"
+          + "\023CreatePolicyBinding\022-.google.iam.v3beta.CreatePolicyBindingReque"
+          + "st\032\035.google.longrunning.Operation\"\266\002\202\323\344\223"
+          + "\002\340\001\"6/v3beta/{parent=projects/*/location"
+          + "s/*}/policyBindings:\016policy_bindingZG\"5/v3beta/{parent=folders/*/locations/*}/po"
+          + "licyBindings:\016policy_bindingZM\";/v3beta/{parent=organizations/*/locations/*}/pol"
+          + "icyBindings:\016policy_binding\332A\'parent,policy_binding,policy_binding_id\312A\"\n\r"
+          + "PolicyBinding\022\021OperationMetadata\022\241\002\n"
           + "\020GetPolicyBinding\022*.google.iam.v3beta.GetPolicyBindingRequest\032"
           + " .google.iam.v3beta.PolicyBi"
-          + "nding\"\276\001\332A\004name\202\323\344\223\002\260\001\0226/v3beta/{name=pr"
-          + "ojects/*/locations/*/policyBindings/*}Z7\0225/v3beta/{name=folders/*/locations/*/po"
-          + "licyBindings/*}Z=\022;/v3beta/{name=organiz"
-          + "ations/*/locations/*/policyBindings/*}\022\274\003\n"
+          + "nding\"\276\001\202\323\344\223\002\260\001\0226/v3beta/{name=projects/"
+          + "*/locations/*/policyBindings/*}Z7\0225/v3beta/{name=folders/*/locations/*/policyBin"
+          + "dings/*}Z=\022;/v3beta/{name=organizations/"
+          + "*/locations/*/policyBindings/*}\332A\004name\022\274\003\n"
           + "\023UpdatePolicyBinding\022-.google.iam.v3be"
-          + "ta.UpdatePolicyBindingRequest\032\035.google.longrunning.Operation\"\326\002\312A\"\n\r"
-          + "PolicyBinding\022\021OperationMetadata\332A\032policy_binding,up"
-          + "date_mask\202\323\344\223\002\215\0022E/v3beta/{policy_bindin"
-          + "g.name=projects/*/locations/*/policyBindings/*}:\016policy_bindingZV2D/v3beta/{poli"
-          + "cy_binding.name=folders/*/locations/*/policyBindings/*}:\016policy_bindingZ\\2J/v3be"
-          + "ta/{policy_binding.name=organizations/*/"
-          + "locations/*/policyBindings/*}:\016policy_binding\022\321\002\n"
-          + "\023DeletePolicyBinding\022-.google.i"
-          + "am.v3beta.DeletePolicyBindingRequest\032\035.google.longrunning.Operation\"\353\001\312A*\n"
-          + "\025google.protobuf.Empty\022\021OperationMetadata\332A\004na"
-          + "me\202\323\344\223\002\260\001*6/v3beta/{name=projects/*/loca"
-          + "tions/*/policyBindings/*}Z7*5/v3beta/{name=folders/*/locations/*/policyBindings/"
-          + "*}Z=*;/v3beta/{name=organizations/*/locations/*/policyBindings/*}\022\264\002\n"
+          + "ta.UpdatePolicyBindingRequest\032\035.google.l"
+          + "ongrunning.Operation\"\326\002\202\323\344\223\002\215\0022E/v3beta/"
+          + "{policy_binding.name=projects/*/locations/*/policyBindings/*}:\016policy_bindingZV2"
+          + "D/v3beta/{policy_binding.name=folders/*/locations/*/policyBindings/*}:\016policy_bi"
+          + "ndingZ\\2J/v3beta/{policy_binding.name=organizations/*/locations/*/policyBindings"
+          + "/*}:\016policy_binding\332A\032policy_binding,update_mask\312A\"\n\r"
+          + "PolicyBinding\022\021OperationMetadata\022\321\002\n"
+          + "\023DeletePolicyBinding\022-.google.iam.v3beta.DeletePolicyBindingRequest\032\035.g"
+          + "oogle.longrunning.Operation\"\353\001\202\323\344\223\002\260\001*6/"
+          + "v3beta/{name=projects/*/locations/*/policyBindings/*}Z7*5/v3beta/{name=folders/*"
+          + "/locations/*/policyBindings/*}Z=*;/v3bet"
+          + "a/{name=organizations/*/locations/*/policyBindings/*}\332A\004name\312A*\n"
+          + "\025google.protobuf.Empty\022\021OperationMetadata\022\264\002\n"
           + "\022ListPolicyBindings\022,.google.iam.v3beta.ListPolicyB"
           + "indingsRequest\032-.google.iam.v3beta.ListP"
-          + "olicyBindingsResponse\"\300\001\332A\006parent\202\323\344\223\002\260\001"
-          + "\0226/v3beta/{parent=projects/*/locations/*}/policyBindingsZ7\0225/v3beta/{parent=fold"
-          + "ers/*/locations/*}/policyBindingsZ=\022;/v3"
-          + "beta/{parent=organizations/*/locations/*}/policyBindings\022\244\003\n"
+          + "olicyBindingsResponse\"\300\001\202\323\344\223\002\260\001\0226/v3beta"
+          + "/{parent=projects/*/locations/*}/policyBindingsZ7\0225/v3beta/{parent=folders/*/loc"
+          + "ations/*}/policyBindingsZ=\022;/v3beta/{par"
+          + "ent=organizations/*/locations/*}/policyBindings\332A\006parent\022\244\003\n"
           + "\032SearchTargetPolicyBindings\0224.google.iam.v3beta.SearchTarget"
           + "PolicyBindingsRequest\0325.google.iam.v3bet"
-          + "a.SearchTargetPolicyBindingsResponse\"\230\002\332A\r"
-          + "parent,target\202\323\344\223\002\201\002\022Q/v3beta/{parent="
-          + "projects/*/locations/*}/policyBindings:searchTargetPolicyBindingsZR\022P/v3beta/{pa"
-          + "rent=folders/*/locations/*}/policyBindings:searchTargetPolicyBindingsZX\022V/v3beta"
-          + "/{parent=organizations/*/locations/*}/policyBindings:searchTargetPolicyBindings\032"
+          + "a.SearchTargetPolicyBindingsResponse\"\230\002\202"
+          + "\323\344\223\002\201\002\022Q/v3beta/{parent=projects/*/locat"
+          + "ions/*}/policyBindings:searchTargetPolicyBindingsZR\022P/v3beta/{parent=folders/*/l"
+          + "ocations/*}/policyBindings:searchTargetPolicyBindingsZX\022V/v3beta/{parent=organiz"
+          + "ations/*/locations/*}/policyBindings:searchTargetPolicyBindings\332A\r"
+          + "parent,target\032"
           + "F\312A\022iam.googleapis.com\322A.https://www.googleapis.com/auth/cloud-platformB\304\002\n"
           + "\025com.google.iam.v3betaB\032PolicyBindingsService"
           + "ProtoP\001Z-cloud.google.com/go/iam/apiv3be"
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesServiceProto.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesServiceProto.java
index 136dd226ad..0d117f0745 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesServiceProto.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesServiceProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public final class PrincipalAccessBoundaryPoliciesServiceProto {
@@ -122,50 +121,50 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "ncipalAccessBoundaryPolicy\022=.google.iam."
           + "v3beta.CreatePrincipalAccessBoundaryPoli"
           + "cyRequest\032\035.google.longrunning.Operation"
-          + "\"\371\001\312A2\n\035PrincipalAccessBoundaryPolicy\022\021O"
-          + "perationMetadata\332AKparent,principal_acce"
-          + "ss_boundary_policy,principal_access_boun"
-          + "dary_policy_id\202\323\344\223\002p\"L/v3beta/{parent=or"
-          + "ganizations/*/locations/*}/principalAcce"
-          + "ssBoundaryPolicies: principal_access_bou"
-          + "ndary_policy\022\355\001\n GetPrincipalAccessBound"
+          + "\"\371\001\202\323\344\223\002p\"L/v3beta/{parent=organizations"
+          + "/*/locations/*}/principalAccessBoundaryP"
+          + "olicies: principal_access_boundary_polic"
+          + "y\332AKparent,principal_access_boundary_pol"
+          + "icy,principal_access_boundary_policy_id\312"
+          + "A2\n\035PrincipalAccessBoundaryPolicy\022\021Opera"
+          + "tionMetadata\022\355\001\n GetPrincipalAccessBound"
           + "aryPolicy\022:.google.iam.v3beta.GetPrincip"
           + "alAccessBoundaryPolicyRequest\0320.google.i"
           + "am.v3beta.PrincipalAccessBoundaryPolicy\""
-          + "[\332A\004name\202\323\344\223\002N\022L/v3beta/{name=organizati"
-          + "ons/*/locations/*/principalAccessBoundar"
-          + "yPolicies/*}\022\202\003\n#UpdatePrincipalAccessBo"
+          + "[\202\323\344\223\002N\022L/v3beta/{name=organizations/*/l"
+          + "ocations/*/principalAccessBoundaryPolici"
+          + "es/*}\332A\004name\022\202\003\n#UpdatePrincipalAccessBo"
           + "undaryPolicy\022=.google.iam.v3beta.UpdateP"
           + "rincipalAccessBoundaryPolicyRequest\032\035.go"
-          + "ogle.longrunning.Operation\"\374\001\312A2\n\035Princi"
-          + "palAccessBoundaryPolicy\022\021OperationMetada"
-          + "ta\332A,principal_access_boundary_policy,up"
-          + "date_mask\202\323\344\223\002\221\0012m/v3beta/{principal_acc"
-          + "ess_boundary_policy.name=organizations/*"
-          + "/locations/*/principalAccessBoundaryPoli"
-          + "cies/*}: principal_access_boundary_polic"
-          + "y\022\216\002\n#DeletePrincipalAccessBoundaryPolic"
+          + "ogle.longrunning.Operation\"\374\001\202\323\344\223\002\221\0012m/v"
+          + "3beta/{principal_access_boundary_policy."
+          + "name=organizations/*/locations/*/princip"
+          + "alAccessBoundaryPolicies/*}: principal_a"
+          + "ccess_boundary_policy\332A,principal_access"
+          + "_boundary_policy,update_mask\312A2\n\035Princip"
+          + "alAccessBoundaryPolicy\022\021OperationMetadat"
+          + "a\022\216\002\n#DeletePrincipalAccessBoundaryPolic"
           + "y\022=.google.iam.v3beta.DeletePrincipalAcc"
           + "essBoundaryPolicyRequest\032\035.google.longru"
-          + "nning.Operation\"\210\001\312A*\n\025google.protobuf.E"
-          + "mpty\022\021OperationMetadata\332A\004name\202\323\344\223\002N*L/v"
-          + "3beta/{name=organizations/*/locations/*/"
-          + "principalAccessBoundaryPolicies/*}\022\203\002\n#L"
+          + "nning.Operation\"\210\001\202\323\344\223\002N*L/v3beta/{name="
+          + "organizations/*/locations/*/principalAcc"
+          + "essBoundaryPolicies/*}\332A\004name\312A*\n\025google"
+          + ".protobuf.Empty\022\021OperationMetadata\022\203\002\n#L"
           + "istPrincipalAccessBoundaryPolicies\022=.goo"
           + "gle.iam.v3beta.ListPrincipalAccessBounda"
           + "ryPoliciesRequest\032>.google.iam.v3beta.Li"
           + "stPrincipalAccessBoundaryPoliciesRespons"
-          + "e\"]\332A\006parent\202\323\344\223\002N\022L/v3beta/{parent=orga"
-          + "nizations/*/locations/*}/principalAccess"
-          + "BoundaryPolicies\022\256\002\n+SearchPrincipalAcce"
+          + "e\"]\202\323\344\223\002N\022L/v3beta/{parent=organizations"
+          + "/*/locations/*}/principalAccessBoundaryP"
+          + "olicies\332A\006parent\022\256\002\n+SearchPrincipalAcce"
           + "ssBoundaryPolicyBindings\022E.google.iam.v3"
           + "beta.SearchPrincipalAccessBoundaryPolicy"
           + "BindingsRequest\032F.google.iam.v3beta.Sear"
           + "chPrincipalAccessBoundaryPolicyBindingsR"
-          + "esponse\"p\332A\004name\202\323\344\223\002c\022a/v3beta/{name=or"
-          + "ganizations/*/locations/*/principalAcces"
-          + "sBoundaryPolicies/*}:searchPolicyBinding"
-          + "s\032F\312A\022iam.googleapis.com\322A.https://www.g"
+          + "esponse\"p\202\323\344\223\002c\022a/v3beta/{name=organizat"
+          + "ions/*/locations/*/principalAccessBounda"
+          + "ryPolicies/*}:searchPolicyBindings\332A\004nam"
+          + "e\032F\312A\022iam.googleapis.com\322A.https://www.g"
           + "oogleapis.com/auth/cloud-platformB\251\001\n\025co"
           + "m.google.iam.v3betaB+PrincipalAccessBoun"
           + "daryPoliciesServiceProtoP\001Z-cloud.google"
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicy.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicy.java
index fe639cc2fb..d9522754d9 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicy.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicy.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policy_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PrincipalAccessBoundaryPolicy();
   }
 
+  @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.iam.v3beta.PrincipalAccessBoundaryPolicyResourcesProto
         .internal_static_google_iam_v3beta_PrincipalAccessBoundaryPolicy_descriptor;
@@ -59,8 +63,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 5:
         return internalGetAnnotations();
@@ -79,18 +82,14 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
             com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.Builder.class);
   }
 
-  private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
    *
    * 
    * Identifier. The resource name of the principal access boundary policy.
-   *
    * The following format is supported:
    * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
    * 

@@ -117,7 +116,6 @@ public java.lang.String getName() {
    *
    * 
    * Identifier. The resource name of the principal access boundary policy.
-   *
    * The following format is supported:
    * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
    * 

@@ -140,9 +138,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int UID_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object uid_ = "";
+  private volatile java.lang.Object uid_;
 
   /**
    *
@@ -199,9 +195,7 @@ public com.google.protobuf.ByteString getUidBytes() {
   }
 
   public static final int ETAG_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object etag_ = "";
+  private volatile java.lang.Object etag_;
 
   /**
    *
@@ -254,9 +248,7 @@ public com.google.protobuf.ByteString getEtagBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object displayName_ = "";
+  private volatile java.lang.Object displayName_;
 
   /**
    *
@@ -321,7 +313,6 @@ private static final class AnnotationsDefaultEntryHolder {
             "");
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField annotations_;
 
   private com.google.protobuf.MapField
@@ -393,10 +384,8 @@ public java.util.Map getAnnotationsMap() {
    * 
    */
   @java.lang.Override
-  public /* nullable */ java.lang.String getAnnotationsOrDefault(
-      java.lang.String key,
-      /* nullable */
-      java.lang.String defaultValue) {
+  public java.lang.String getAnnotationsOrDefault(
+      java.lang.String key, java.lang.String defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -446,7 +435,7 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return createTime_ != null;
   }
 
   /**
@@ -480,7 +469,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+    return getCreateTime();
   }
 
   public static final int UPDATE_TIME_FIELD_NUMBER = 7;
@@ -501,7 +490,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateTime() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return updateTime_ != null;
   }
 
   /**
@@ -535,7 +524,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+    return getUpdateTime();
   }
 
   public static final int DETAILS_FIELD_NUMBER = 8;
@@ -556,7 +545,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasDetails() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return details_ != null;
   }
 
   /**
@@ -592,9 +581,7 @@ public com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails getDetails() {
    */
   @java.lang.Override
   public com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetailsOrBuilder getDetailsOrBuilder() {
-    return details_ == null
-        ? com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails.getDefaultInstance()
-        : details_;
+    return getDetails();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -625,13 +612,13 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
         output, internalGetAnnotations(), AnnotationsDefaultEntryHolder.defaultEntry, 5);
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       output.writeMessage(6, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateTime_ != null) {
       output.writeMessage(7, getUpdateTime());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (details_ != null) {
       output.writeMessage(8, getDetails());
     }
     getUnknownFields().writeTo(output);
@@ -665,13 +652,13 @@ public int getSerializedSize() {
               .build();
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, annotations__);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getUpdateTime());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (details_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getDetails());
     }
     size += getUnknownFields().getSerializedSize();
@@ -862,8 +849,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 5:
           return internalGetAnnotations();
@@ -873,8 +859,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 5:
           return internalGetMutableAnnotations();
@@ -894,45 +879,40 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     }
 
     // Construct using com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCreateTimeFieldBuilder();
-        getUpdateTimeFieldBuilder();
-        getDetailsFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       uid_ = "";
+
       etag_ = "";
+
       displayName_ = "";
+
       internalGetMutableAnnotations().clear();
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
-      details_ = null;
-      if (detailsBuilder_ != null) {
-        detailsBuilder_.dispose();
+      if (detailsBuilder_ == null) {
+        details_ = null;
+      } else {
+        details_ = null;
         detailsBuilder_ = null;
       }
       return this;
@@ -962,45 +942,30 @@ public com.google.iam.v3beta.PrincipalAccessBoundaryPolicy build() {
     public com.google.iam.v3beta.PrincipalAccessBoundaryPolicy buildPartial() {
       com.google.iam.v3beta.PrincipalAccessBoundaryPolicy result =
           new com.google.iam.v3beta.PrincipalAccessBoundaryPolicy(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.iam.v3beta.PrincipalAccessBoundaryPolicy result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.uid_ = uid_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.etag_ = etag_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.displayName_ = displayName_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.annotations_ = internalGetAnnotations();
-        result.annotations_.makeImmutable();
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
-        to_bitField0_ |= 0x00000001;
+      result.name_ = name_;
+      result.uid_ = uid_;
+      result.etag_ = etag_;
+      result.displayName_ = displayName_;
+      result.annotations_ = internalGetAnnotations();
+      result.annotations_.makeImmutable();
+      if (createTimeBuilder_ == null) {
+        result.createTime_ = createTime_;
+      } else {
+        result.createTime_ = createTimeBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
-        to_bitField0_ |= 0x00000002;
+      if (updateTimeBuilder_ == null) {
+        result.updateTime_ = updateTime_;
+      } else {
+        result.updateTime_ = updateTimeBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.details_ = detailsBuilder_ == null ? details_ : detailsBuilder_.build();
-        to_bitField0_ |= 0x00000004;
+      if (detailsBuilder_ == null) {
+        result.details_ = details_;
+      } else {
+        result.details_ = detailsBuilder_.build();
       }
-      result.bitField0_ |= to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1051,26 +1016,21 @@ public Builder mergeFrom(com.google.iam.v3beta.PrincipalAccessBoundaryPolicy oth
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getUid().isEmpty()) {
         uid_ = other.uid_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getEtag().isEmpty()) {
         etag_ = other.etag_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       internalGetMutableAnnotations().mergeFrom(other.internalGetAnnotations());
-      bitField0_ |= 0x00000010;
       if (other.hasCreateTime()) {
         mergeCreateTime(other.getCreateTime());
       }
@@ -1109,25 +1069,25 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 uid_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 etag_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 displayName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             case 42:
@@ -1139,25 +1099,24 @@ public Builder mergeFrom(
                 internalGetMutableAnnotations()
                     .getMutableMap()
                     .put(annotations__.getKey(), annotations__.getValue());
-                bitField0_ |= 0x00000010;
                 break;
               } // case 42
             case 50:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 50
             case 58:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 58
             case 66:
               {
                 input.readMessage(getDetailsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 66
             default:
@@ -1186,7 +1145,6 @@ public Builder mergeFrom(
      *
      * 
      * Identifier. The resource name of the principal access boundary policy.
-     *
      * The following format is supported:
      * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
      * 

@@ -1212,7 +1170,6 @@ public java.lang.String getName() {
      *
      * 
      * Identifier. The resource name of the principal access boundary policy.
-     *
      * The following format is supported:
      * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
      * 

@@ -1238,7 +1195,6 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      * 
      * Identifier. The resource name of the principal access boundary policy.
-     *
      * The following format is supported:
      * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
      * 

@@ -1252,8 +1208,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1263,7 +1219,6 @@ public Builder setName(java.lang.String value) {
      *
      * 
      * Identifier. The resource name of the principal access boundary policy.
-     *
      * The following format is supported:
      * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
      * 

@@ -1273,8 +1228,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1284,7 +1239,6 @@ public Builder clearName() {
      *
      * 
      * Identifier. The resource name of the principal access boundary policy.
-     *
      * The following format is supported:
      * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
      * 

@@ -1299,8 +1253,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1378,8 +1332,8 @@ public Builder setUid(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       uid_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1399,8 +1353,8 @@ public Builder setUid(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearUid() {
+
       uid_ = getDefaultInstance().getUid();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1425,8 +1379,8 @@ public Builder setUidBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       uid_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1498,8 +1452,8 @@ public Builder setEtag(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       etag_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1517,8 +1471,8 @@ public Builder setEtag(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEtag() {
+
       etag_ = getDefaultInstance().getEtag();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1541,8 +1495,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       etag_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1614,8 +1568,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       displayName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1633,8 +1587,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
+
       displayName_ = getDefaultInstance().getDisplayName();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1657,8 +1611,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       displayName_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1676,6 +1630,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
 
     private com.google.protobuf.MapField
         internalGetMutableAnnotations() {
+      onChanged();
+      ;
       if (annotations_ == null) {
         annotations_ =
             com.google.protobuf.MapField.newMapField(AnnotationsDefaultEntryHolder.defaultEntry);
@@ -1683,8 +1639,6 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
       if (!annotations_.isMutable()) {
         annotations_ = annotations_.copy();
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
       return annotations_;
     }
 
@@ -1749,10 +1703,8 @@ public java.util.Map getAnnotationsMap() {
      * 
      */
     @java.lang.Override
-    public /* nullable */ java.lang.String getAnnotationsOrDefault(
-        java.lang.String key,
-        /* nullable */
-        java.lang.String defaultValue) {
+    public java.lang.String getAnnotationsOrDefault(
+        java.lang.String key, java.lang.String defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
@@ -1785,7 +1737,6 @@ public java.lang.String getAnnotationsOrThrow(java.lang.String key) {
     }
 
     public Builder clearAnnotations() {
-      bitField0_ = (bitField0_ & ~0x00000010);
       internalGetMutableAnnotations().getMutableMap().clear();
       return this;
     }
@@ -1813,7 +1764,6 @@ public Builder removeAnnotations(java.lang.String key) {
     /** Use alternate mutation accessors instead. */
     @java.lang.Deprecated
     public java.util.Map getMutableAnnotations() {
-      bitField0_ |= 0x00000010;
       return internalGetMutableAnnotations().getMutableMap();
     }
 
@@ -1836,8 +1786,8 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) {
       if (value == null) {
         throw new NullPointerException("map value");
       }
+
       internalGetMutableAnnotations().getMutableMap().put(key, value);
-      bitField0_ |= 0x00000010;
       return this;
     }
 
@@ -1855,7 +1805,6 @@ public Builder putAnnotations(java.lang.String key, java.lang.String value) {
      */
     public Builder putAllAnnotations(java.util.Map values) {
       internalGetMutableAnnotations().getMutableMap().putAll(values);
-      bitField0_ |= 0x00000010;
       return this;
     }
 
@@ -1881,7 +1830,7 @@ public Builder putAllAnnotations(java.util.Map
      */
     public Builder clearCreateTime() {
-      bitField0_ = (bitField0_ & ~0x00000020);
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+        onChanged();
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2024,7 +1971,7 @@ public Builder clearCreateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-      bitField0_ |= 0x00000020;
+
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -2102,7 +2049,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      * @return Whether the updateTime field is set.
      */
     public boolean hasUpdateTime() {
-      return ((bitField0_ & 0x00000040) != 0);
+      return updateTimeBuilder_ != null || updateTime_ != null;
     }
 
     /**
@@ -2147,11 +2094,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         updateTime_ = value;
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -2170,11 +2117,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
     public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (updateTimeBuilder_ == null) {
         updateTime_ = builderForValue.build();
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000040;
-      onChanged();
+
       return this;
     }
 
@@ -2192,20 +2139,17 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       if (updateTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000040) != 0)
-            && updateTime_ != null
-            && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getUpdateTimeBuilder().mergeFrom(value);
+        if (updateTime_ != null) {
+          updateTime_ =
+              com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
         } else {
           updateTime_ = value;
         }
+        onChanged();
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-      if (updateTime_ != null) {
-        bitField0_ |= 0x00000040;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2222,13 +2166,14 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearUpdateTime() {
-      bitField0_ = (bitField0_ & ~0x00000040);
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+        onChanged();
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2245,7 +2190,7 @@ public Builder clearUpdateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-      bitField0_ |= 0x00000040;
+
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
@@ -2322,7 +2267,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
      * @return Whether the details field is set.
      */
     public boolean hasDetails() {
-      return ((bitField0_ & 0x00000080) != 0);
+      return detailsBuilder_ != null || details_ != null;
     }
 
     /**
@@ -2365,11 +2310,11 @@ public Builder setDetails(com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDet
           throw new NullPointerException();
         }
         details_ = value;
+        onChanged();
       } else {
         detailsBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -2388,11 +2333,11 @@ public Builder setDetails(
         com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails.Builder builderForValue) {
       if (detailsBuilder_ == null) {
         details_ = builderForValue.build();
+        onChanged();
       } else {
         detailsBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000080;
-      onChanged();
+
       return this;
     }
 
@@ -2409,22 +2354,19 @@ public Builder setDetails(
      */
     public Builder mergeDetails(com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails value) {
       if (detailsBuilder_ == null) {
-        if (((bitField0_ & 0x00000080) != 0)
-            && details_ != null
-            && details_
-                != com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails
-                    .getDefaultInstance()) {
-          getDetailsBuilder().mergeFrom(value);
+        if (details_ != null) {
+          details_ =
+              com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails.newBuilder(details_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           details_ = value;
         }
+        onChanged();
       } else {
         detailsBuilder_.mergeFrom(value);
       }
-      if (details_ != null) {
-        bitField0_ |= 0x00000080;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2440,13 +2382,14 @@ public Builder mergeDetails(com.google.iam.v3beta.PrincipalAccessBoundaryPolicyD
      * 
      */
     public Builder clearDetails() {
-      bitField0_ = (bitField0_ & ~0x00000080);
-      details_ = null;
-      if (detailsBuilder_ != null) {
-        detailsBuilder_.dispose();
+      if (detailsBuilder_ == null) {
+        details_ = null;
+        onChanged();
+      } else {
+        details_ = null;
         detailsBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2462,7 +2405,7 @@ public Builder clearDetails() {
      * 
      */
     public com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails.Builder getDetailsBuilder() {
-      bitField0_ |= 0x00000080;
+
       onChanged();
       return getDetailsFieldBuilder().getBuilder();
     }
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyDetails.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyDetails.java
index ac832dc1c2..9c79fd5fe5 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyDetails.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyDetails.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policy_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PrincipalAccessBoundaryPolicyDetails();
   }
 
+  @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.iam.v3beta.PrincipalAccessBoundaryPolicyResourcesProto
         .internal_static_google_iam_v3beta_PrincipalAccessBoundaryPolicyDetails_descriptor;
@@ -68,8 +72,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RULES_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List rules_;
 
   /**
@@ -160,9 +162,7 @@ public com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRuleOrBuilder getRules
   }
 
   public static final int ENFORCEMENT_VERSION_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object enforcementVersion_ = "";
+  private volatile java.lang.Object enforcementVersion_;
 
   /**
    *
@@ -430,7 +430,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
       } else {
@@ -439,6 +438,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       enforcementVersion_ = "";
+
       return this;
     }
 
@@ -466,16 +466,7 @@ public com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails build() {
     public com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails buildPartial() {
       com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails result =
           new com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(
-        com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails result) {
+      int from_bitField0_ = bitField0_;
       if (rulesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           rules_ = java.util.Collections.unmodifiableList(rules_);
@@ -485,13 +476,9 @@ private void buildPartialRepeatedFields(
       } else {
         result.rules_ = rulesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.enforcementVersion_ = enforcementVersion_;
-      }
+      result.enforcementVersion_ = enforcementVersion_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -569,7 +556,6 @@ public Builder mergeFrom(com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDeta
       }
       if (!other.getEnforcementVersion().isEmpty()) {
         enforcementVersion_ = other.enforcementVersion_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -615,7 +601,7 @@ public Builder mergeFrom(
             case 34:
               {
                 enforcementVersion_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 34
             default:
@@ -1146,8 +1132,8 @@ public Builder setEnforcementVersion(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       enforcementVersion_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1168,8 +1154,8 @@ public Builder setEnforcementVersion(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEnforcementVersion() {
+
       enforcementVersion_ = getDefaultInstance().getEnforcementVersion();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1195,8 +1181,8 @@ public Builder setEnforcementVersionBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       enforcementVersion_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyDetailsOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyDetailsOrBuilder.java
index b2743dbdb9..08496eab1c 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyDetailsOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyDetailsOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policy_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface PrincipalAccessBoundaryPolicyDetailsOrBuilder
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyOrBuilder.java
index 77ae00574c..c30eea122e 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policy_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface PrincipalAccessBoundaryPolicyOrBuilder
@@ -29,7 +28,6 @@ public interface PrincipalAccessBoundaryPolicyOrBuilder
    *
    * 
    * Identifier. The resource name of the principal access boundary policy.
-   *
    * The following format is supported:
    * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
    * 

@@ -45,7 +43,6 @@ public interface PrincipalAccessBoundaryPolicyOrBuilder
    *
    * 
    * Identifier. The resource name of the principal access boundary policy.
-   *
    * The following format is supported:
    * `organizations/{organization_id}/locations/{location}/principalAccessBoundaryPolicies/{policy_id}`
    * 

@@ -202,6 +199,7 @@ public interface PrincipalAccessBoundaryPolicyOrBuilder
    * map<string, string> annotations = 5 [(.google.api.field_behavior) = OPTIONAL];
    * 
    */
+
   /* nullable */
   java.lang.String getAnnotationsOrDefault(
       java.lang.String key,
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyResourcesProto.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyResourcesProto.java
index da51b3b1aa..c54fcafc4c 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyResourcesProto.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyResourcesProto.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policy_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public final class PrincipalAccessBoundaryPolicyResourcesProto {
@@ -60,7 +59,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "i/resource.proto\032\037google/protobuf/timestamp.proto\"\265\005\n"
           + "\035PrincipalAccessBoundaryPolicy\022\021\n"
           + "\004name\030\001 \001(\tB\003\340A\010\022\030\n"
-          + "\003uid\030\002 \001(\tB\013\340A\003\342\214\317\327\010\002\010\001\022\021\n"
+          + "\003uid\030\002 \001(\tB\013\342\214\317\327\010\002\010\001\340A\003\022\021\n"
           + "\004etag\030\003 \001(\tB\003\340A\001\022\031\n"
           + "\014display_name\030\004 \001(\tB\003\340A\001\022[\n"
           + "\013annotations\030\005 \003(\0132A.go"
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyRule.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyRule.java
index 4ed7e2e686..021d67b267 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyRule.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyRule.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policy_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -42,7 +41,7 @@ private PrincipalAccessBoundaryPolicyRule(
 
   private PrincipalAccessBoundaryPolicyRule() {
     description_ = "";
-    resources_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    resources_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     effect_ = 0;
   }
 
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PrincipalAccessBoundaryPolicyRule();
   }
 
+  @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.iam.v3beta.PrincipalAccessBoundaryPolicyResourcesProto
         .internal_static_google_iam_v3beta_PrincipalAccessBoundaryPolicyRule_descriptor;
@@ -206,9 +210,7 @@ private Effect(int value) {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object description_ = "";
+  private volatile java.lang.Object description_;
 
   /**
    *
@@ -261,10 +263,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int RESOURCES_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList resources_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList resources_;
 
   /**
    *
@@ -274,9 +273,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    * the rule, then the rule applies for that resource and its descendants. The
    * number of resources in a policy is limited to 500 across all rules in the
    * policy.
-   *
    * The following resource types are supported:
-   *
    * * Organizations, such as
    * `//cloudresourcemanager.googleapis.com/organizations/123`.
    * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -300,9 +297,7 @@ public com.google.protobuf.ProtocolStringList getResourcesList() {
    * the rule, then the rule applies for that resource and its descendants. The
    * number of resources in a policy is limited to 500 across all rules in the
    * policy.
-   *
    * The following resource types are supported:
-   *
    * * Organizations, such as
    * `//cloudresourcemanager.googleapis.com/organizations/123`.
    * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -326,9 +321,7 @@ public int getResourcesCount() {
    * the rule, then the rule applies for that resource and its descendants. The
    * number of resources in a policy is limited to 500 across all rules in the
    * policy.
-   *
    * The following resource types are supported:
-   *
    * * Organizations, such as
    * `//cloudresourcemanager.googleapis.com/organizations/123`.
    * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -353,9 +346,7 @@ public java.lang.String getResources(int index) {
    * the rule, then the rule applies for that resource and its descendants. The
    * number of resources in a policy is limited to 500 across all rules in the
    * policy.
-   *
    * The following resource types are supported:
-   *
    * * Organizations, such as
    * `//cloudresourcemanager.googleapis.com/organizations/123`.
    * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -373,7 +364,7 @@ public com.google.protobuf.ByteString getResourcesBytes(int index) {
   }
 
   public static final int EFFECT_FIELD_NUMBER = 3;
-  private int effect_ = 0;
+  private int effect_;
 
   /**
    *
@@ -410,8 +401,9 @@ public int getEffectValue() {
    */
   @java.lang.Override
   public com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule.Effect getEffect() {
+    @SuppressWarnings("deprecation")
     com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule.Effect result =
-        com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule.Effect.forNumber(effect_);
+        com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule.Effect.valueOf(effect_);
     return result == null
         ? com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule.Effect.UNRECOGNIZED
         : result;
@@ -645,10 +637,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       description_ = "";
-      resources_ = com.google.protobuf.LazyStringArrayList.emptyList();
+
+      resources_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       effect_ = 0;
+
       return this;
     }
 
@@ -676,27 +670,18 @@ public com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule build() {
     public com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule buildPartial() {
       com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule result =
           new com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      result.description_ = description_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        resources_ = resources_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
+      result.resources_ = resources_;
+      result.effect_ = effect_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.description_ = description_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        resources_.makeImmutable();
-        result.resources_ = resources_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.effect_ = effect_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -745,13 +730,12 @@ public Builder mergeFrom(com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule
         return this;
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.resources_.isEmpty()) {
         if (resources_.isEmpty()) {
           resources_ = other.resources_;
-          bitField0_ |= 0x00000002;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureResourcesIsMutable();
           resources_.addAll(other.resources_);
@@ -790,7 +774,7 @@ public Builder mergeFrom(
             case 10:
               {
                 description_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -803,7 +787,7 @@ public Builder mergeFrom(
             case 24:
               {
                 effect_ = input.readEnum();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             default:
@@ -892,8 +876,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       description_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -911,8 +895,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
+
       description_ = getDefaultInstance().getDescription();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -935,20 +919,20 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       description_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList resources_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList resources_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureResourcesIsMutable() {
-      if (!resources_.isModifiable()) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         resources_ = new com.google.protobuf.LazyStringArrayList(resources_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000002;
     }
 
     /**
@@ -959,9 +943,7 @@ private void ensureResourcesIsMutable() {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -974,8 +956,7 @@ private void ensureResourcesIsMutable() {
      * @return A list containing the resources.
      */
     public com.google.protobuf.ProtocolStringList getResourcesList() {
-      resources_.makeImmutable();
-      return resources_;
+      return resources_.getUnmodifiableView();
     }
 
     /**
@@ -986,9 +967,7 @@ public com.google.protobuf.ProtocolStringList getResourcesList() {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -1012,9 +991,7 @@ public int getResourcesCount() {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -1039,9 +1016,7 @@ public java.lang.String getResources(int index) {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -1066,9 +1041,7 @@ public com.google.protobuf.ByteString getResourcesBytes(int index) {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -1088,7 +1061,6 @@ public Builder setResources(int index, java.lang.String value) {
       }
       ensureResourcesIsMutable();
       resources_.set(index, value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1101,9 +1073,7 @@ public Builder setResources(int index, java.lang.String value) {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -1122,7 +1092,6 @@ public Builder addResources(java.lang.String value) {
       }
       ensureResourcesIsMutable();
       resources_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1135,9 +1104,7 @@ public Builder addResources(java.lang.String value) {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -1153,7 +1120,6 @@ public Builder addResources(java.lang.String value) {
     public Builder addAllResources(java.lang.Iterable values) {
       ensureResourcesIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, resources_);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1166,9 +1132,7 @@ public Builder addAllResources(java.lang.Iterable values) {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -1181,9 +1145,8 @@ public Builder addAllResources(java.lang.Iterable values) {
      * @return This builder for chaining.
      */
     public Builder clearResources() {
-      resources_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000002);
-      ;
+      resources_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1196,9 +1159,7 @@ public Builder clearResources() {
      * the rule, then the rule applies for that resource and its descendants. The
      * number of resources in a policy is limited to 500 across all rules in the
      * policy.
-     *
      * The following resource types are supported:
-     *
      * * Organizations, such as
      * `//cloudresourcemanager.googleapis.com/organizations/123`.
      * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -1218,7 +1179,6 @@ public Builder addResourcesBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureResourcesIsMutable();
       resources_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1260,8 +1220,8 @@ public int getEffectValue() {
      * @return This builder for chaining.
      */
     public Builder setEffectValue(int value) {
+
       effect_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1282,8 +1242,9 @@ public Builder setEffectValue(int value) {
      */
     @java.lang.Override
     public com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule.Effect getEffect() {
+      @SuppressWarnings("deprecation")
       com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule.Effect result =
-          com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule.Effect.forNumber(effect_);
+          com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule.Effect.valueOf(effect_);
       return result == null
           ? com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule.Effect.UNRECOGNIZED
           : result;
@@ -1308,7 +1269,7 @@ public Builder setEffect(com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000004;
+
       effect_ = value.getNumber();
       onChanged();
       return this;
@@ -1329,7 +1290,7 @@ public Builder setEffect(com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule
      * @return This builder for chaining.
      */
     public Builder clearEffect() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       effect_ = 0;
       onChanged();
       return this;
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyRuleOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyRuleOrBuilder.java
index 908a74c5bf..63f79ea350 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyRuleOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyRuleOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policy_resources.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface PrincipalAccessBoundaryPolicyRuleOrBuilder
@@ -60,9 +59,7 @@ public interface PrincipalAccessBoundaryPolicyRuleOrBuilder
    * the rule, then the rule applies for that resource and its descendants. The
    * number of resources in a policy is limited to 500 across all rules in the
    * policy.
-   *
    * The following resource types are supported:
-   *
    * * Organizations, such as
    * `//cloudresourcemanager.googleapis.com/organizations/123`.
    * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -84,9 +81,7 @@ public interface PrincipalAccessBoundaryPolicyRuleOrBuilder
    * the rule, then the rule applies for that resource and its descendants. The
    * number of resources in a policy is limited to 500 across all rules in the
    * policy.
-   *
    * The following resource types are supported:
-   *
    * * Organizations, such as
    * `//cloudresourcemanager.googleapis.com/organizations/123`.
    * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -108,9 +103,7 @@ public interface PrincipalAccessBoundaryPolicyRuleOrBuilder
    * the rule, then the rule applies for that resource and its descendants. The
    * number of resources in a policy is limited to 500 across all rules in the
    * policy.
-   *
    * The following resource types are supported:
-   *
    * * Organizations, such as
    * `//cloudresourcemanager.googleapis.com/organizations/123`.
    * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
@@ -133,9 +126,7 @@ public interface PrincipalAccessBoundaryPolicyRuleOrBuilder
    * the rule, then the rule applies for that resource and its descendants. The
    * number of resources in a policy is limited to 500 across all rules in the
    * policy.
-   *
    * The following resource types are supported:
-   *
    * * Organizations, such as
    * `//cloudresourcemanager.googleapis.com/organizations/123`.
    * * Folders, such as `//cloudresourcemanager.googleapis.com/folders/123`.
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsRequest.java
index 0f05159f5f..255ce5cff2 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SearchPrincipalAccessBoundaryPolicyBindingsRequest();
   }
 
+  @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.iam.v3beta.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3beta_SearchPrincipalAccessBoundaryPolicyBindingsRequest_descriptor;
@@ -68,9 +72,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -129,7 +131,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 3;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -137,7 +139,6 @@ public com.google.protobuf.ByteString getNameBytes() {
    * 
    * Optional. The maximum number of policy bindings to return. The service may
    * return fewer than this value.
-   *
    * If unspecified, at most 50 policy bindings will be returned.
    * The maximum value is 1000; values above 1000 will be coerced to 1000.
    * 

@@ -152,9 +153,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -163,7 +162,6 @@ public int getPageSize() {
    * Optional. A page token, received from a previous
    * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
    * retrieve the subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
    * that provided the page token.
@@ -193,7 +191,6 @@ public java.lang.String getPageToken() {
    * Optional. A page token, received from a previous
    * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
    * retrieve the subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
    * that provided the page token.
@@ -437,10 +434,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       pageSize_ = 0;
+
       pageToken_ = "";
+
       return this;
     }
 
@@ -471,27 +470,13 @@ public com.google.iam.v3beta.SearchPrincipalAccessBoundaryPolicyBindingsRequest
     public com.google.iam.v3beta.SearchPrincipalAccessBoundaryPolicyBindingsRequest buildPartial() {
       com.google.iam.v3beta.SearchPrincipalAccessBoundaryPolicyBindingsRequest result =
           new com.google.iam.v3beta.SearchPrincipalAccessBoundaryPolicyBindingsRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(
-        com.google.iam.v3beta.SearchPrincipalAccessBoundaryPolicyBindingsRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -544,7 +529,6 @@ public Builder mergeFrom(
               .getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -552,7 +536,6 @@ public Builder mergeFrom(
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -584,19 +567,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 24:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 24
             case 34:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 34
             default:
@@ -616,8 +599,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -694,8 +675,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -716,8 +697,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -743,8 +724,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -757,7 +738,6 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -777,7 +757,6 @@ public int getPageSize() {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -790,7 +769,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -801,7 +779,6 @@ public Builder setPageSize(int value) {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -811,7 +788,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -826,7 +803,6 @@ public Builder clearPageSize() {
      * Optional. A page token, received from a previous
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
      * retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
      * that provided the page token.
@@ -855,7 +831,6 @@ public java.lang.String getPageToken() {
      * Optional. A page token, received from a previous
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
      * retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
      * that provided the page token.
@@ -884,7 +859,6 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
      * Optional. A page token, received from a previous
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
      * retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
      * that provided the page token.
@@ -899,8 +873,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -912,7 +886,6 @@ public Builder setPageToken(java.lang.String value) {
      * Optional. A page token, received from a previous
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
      * retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
      * that provided the page token.
@@ -923,8 +896,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -936,7 +909,6 @@ public Builder clearPageToken() {
      * Optional. A page token, received from a previous
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
      * retrieve the subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
      * that provided the page token.
@@ -952,8 +924,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsRequestOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsRequestOrBuilder.java
index 7bc45f0f32..d19f87a590 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface SearchPrincipalAccessBoundaryPolicyBindingsRequestOrBuilder
@@ -64,7 +63,6 @@ public interface SearchPrincipalAccessBoundaryPolicyBindingsRequestOrBuilder
    * 
    * Optional. The maximum number of policy bindings to return. The service may
    * return fewer than this value.
-   *
    * If unspecified, at most 50 policy bindings will be returned.
    * The maximum value is 1000; values above 1000 will be coerced to 1000.
    * 

@@ -82,7 +80,6 @@ public interface SearchPrincipalAccessBoundaryPolicyBindingsRequestOrBuilder
    * Optional. A page token, received from a previous
    * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
    * retrieve the subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
    * that provided the page token.
@@ -101,7 +98,6 @@ public interface SearchPrincipalAccessBoundaryPolicyBindingsRequestOrBuilder
    * Optional. A page token, received from a previous
    * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` call. Provide this to
    * retrieve the subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `SearchPrincipalAccessBoundaryPolicyBindingsRequest` must match the call
    * that provided the page token.
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsResponse.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsResponse.java
index 7e9b4a4988..35aea7e509 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsResponse.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SearchPrincipalAccessBoundaryPolicyBindingsResponse();
   }
 
+  @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.iam.v3beta.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3beta_SearchPrincipalAccessBoundaryPolicyBindingsResponse_descriptor;
@@ -69,8 +73,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int POLICY_BINDINGS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List policyBindings_;
 
   /**
@@ -145,9 +147,7 @@ public com.google.iam.v3beta.PolicyBindingOrBuilder getPolicyBindingsOrBuilder(i
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -413,7 +413,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (policyBindingsBuilder_ == null) {
         policyBindings_ = java.util.Collections.emptyList();
       } else {
@@ -422,6 +421,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -453,16 +453,7 @@ public com.google.iam.v3beta.SearchPrincipalAccessBoundaryPolicyBindingsResponse
         buildPartial() {
       com.google.iam.v3beta.SearchPrincipalAccessBoundaryPolicyBindingsResponse result =
           new com.google.iam.v3beta.SearchPrincipalAccessBoundaryPolicyBindingsResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(
-        com.google.iam.v3beta.SearchPrincipalAccessBoundaryPolicyBindingsResponse result) {
+      int from_bitField0_ = bitField0_;
       if (policyBindingsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           policyBindings_ = java.util.Collections.unmodifiableList(policyBindings_);
@@ -472,14 +463,9 @@ private void buildPartialRepeatedFields(
       } else {
         result.policyBindings_ = policyBindingsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(
-        com.google.iam.v3beta.SearchPrincipalAccessBoundaryPolicyBindingsResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -561,7 +547,6 @@ public Builder mergeFrom(
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -606,7 +591,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1065,8 +1050,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1084,8 +1069,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1108,8 +1093,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsResponseOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsResponseOrBuilder.java
index 1e0c8c9ea8..750bda1048 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsResponseOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface SearchPrincipalAccessBoundaryPolicyBindingsResponseOrBuilder
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsRequest.java
index 191b69efff..4f517a307c 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SearchTargetPolicyBindingsRequest();
   }
 
+  @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.iam.v3beta.PolicyBindingsServiceProto
         .internal_static_google_iam_v3beta_SearchTargetPolicyBindingsRequest_descriptor;
@@ -68,18 +72,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int TARGET_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object target_ = "";
+  private volatile java.lang.Object target_;
 
   /**
    *
    *
    * 
    * Required. The target resource, which is bound to the policy in the binding.
-   *
    * Format:
-   *
    * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
    * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
    * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -110,9 +110,7 @@ public java.lang.String getTarget() {
    *
    * 
    * Required. The target resource, which is bound to the policy in the binding.
-   *
    * Format:
-   *
    * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
    * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
    * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -139,7 +137,7 @@ public com.google.protobuf.ByteString getTargetBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -147,7 +145,6 @@ public com.google.protobuf.ByteString getTargetBytes() {
    * 
    * Optional. The maximum number of policy bindings to return. The service may
    * return fewer than this value.
-   *
    * If unspecified, at most 50 policy bindings will be returned.
    * The maximum value is 1000; values above 1000 will be coerced to 1000.
    * 

@@ -162,9 +159,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -173,7 +168,6 @@ public int getPageSize() {
    * Optional. A page token, received from a previous
    * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
    * subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `SearchTargetPolicyBindingsRequest` must match the call that provided the
    * page token.
@@ -203,7 +197,6 @@ public java.lang.String getPageToken() {
    * Optional. A page token, received from a previous
    * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
    * subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `SearchTargetPolicyBindingsRequest` must match the call that provided the
    * page token.
@@ -227,9 +220,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 5;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -238,9 +229,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
    * Required. The parent resource where this search will be performed. This
    * should be the nearest Resource Manager resource (project, folder, or
    * organization) to the target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -273,9 +262,7 @@ public java.lang.String getParent() {
    * Required. The parent resource where this search will be performed. This
    * should be the nearest Resource Manager resource (project, folder, or
    * organization) to the target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -527,11 +514,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       target_ = "";
+
       pageSize_ = 0;
+
       pageToken_ = "";
+
       parent_ = "";
+
       return this;
     }
 
@@ -559,29 +549,14 @@ public com.google.iam.v3beta.SearchTargetPolicyBindingsRequest build() {
     public com.google.iam.v3beta.SearchTargetPolicyBindingsRequest buildPartial() {
       com.google.iam.v3beta.SearchTargetPolicyBindingsRequest result =
           new com.google.iam.v3beta.SearchTargetPolicyBindingsRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.target_ = target_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
+      result.parent_ = parent_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v3beta.SearchTargetPolicyBindingsRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.target_ = target_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.parent_ = parent_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -630,7 +605,6 @@ public Builder mergeFrom(com.google.iam.v3beta.SearchTargetPolicyBindingsRequest
         return this;
       if (!other.getTarget().isEmpty()) {
         target_ = other.target_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -638,12 +612,10 @@ public Builder mergeFrom(com.google.iam.v3beta.SearchTargetPolicyBindingsRequest
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -675,25 +647,25 @@ public Builder mergeFrom(
             case 10:
               {
                 target_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 42:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 42
             default:
@@ -713,8 +685,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object target_ = "";
 
     /**
@@ -722,9 +692,7 @@ public Builder mergeFrom(
      *
      * 
      * Required. The target resource, which is bound to the policy in the binding.
-     *
      * Format:
-     *
      * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
      * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
      * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -754,9 +722,7 @@ public java.lang.String getTarget() {
      *
      * 
      * Required. The target resource, which is bound to the policy in the binding.
-     *
      * Format:
-     *
      * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
      * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
      * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -786,9 +752,7 @@ public com.google.protobuf.ByteString getTargetBytes() {
      *
      * 
      * Required. The target resource, which is bound to the policy in the binding.
-     *
      * Format:
-     *
      * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
      * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
      * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -806,8 +770,8 @@ public Builder setTarget(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       target_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -817,9 +781,7 @@ public Builder setTarget(java.lang.String value) {
      *
      * 
      * Required. The target resource, which is bound to the policy in the binding.
-     *
      * Format:
-     *
      * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
      * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
      * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -833,8 +795,8 @@ public Builder setTarget(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTarget() {
+
       target_ = getDefaultInstance().getTarget();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -844,9 +806,7 @@ public Builder clearTarget() {
      *
      * 
      * Required. The target resource, which is bound to the policy in the binding.
-     *
      * Format:
-     *
      * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
      * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
      * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -865,8 +825,8 @@ public Builder setTargetBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       target_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -879,7 +839,6 @@ public Builder setTargetBytes(com.google.protobuf.ByteString value) {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -899,7 +858,6 @@ public int getPageSize() {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -912,7 +870,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -923,7 +880,6 @@ public Builder setPageSize(int value) {
      * 
      * Optional. The maximum number of policy bindings to return. The service may
      * return fewer than this value.
-     *
      * If unspecified, at most 50 policy bindings will be returned.
      * The maximum value is 1000; values above 1000 will be coerced to 1000.
      * 

@@ -933,7 +889,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -948,7 +904,6 @@ public Builder clearPageSize() {
      * Optional. A page token, received from a previous
      * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchTargetPolicyBindingsRequest` must match the call that provided the
      * page token.
@@ -977,7 +932,6 @@ public java.lang.String getPageToken() {
      * Optional. A page token, received from a previous
      * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchTargetPolicyBindingsRequest` must match the call that provided the
      * page token.
@@ -1006,7 +960,6 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
      * Optional. A page token, received from a previous
      * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchTargetPolicyBindingsRequest` must match the call that provided the
      * page token.
@@ -1021,8 +974,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1034,7 +987,6 @@ public Builder setPageToken(java.lang.String value) {
      * Optional. A page token, received from a previous
      * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchTargetPolicyBindingsRequest` must match the call that provided the
      * page token.
@@ -1045,8 +997,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1058,7 +1010,6 @@ public Builder clearPageToken() {
      * Optional. A page token, received from a previous
      * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
      * subsequent page.
-     *
      * When paginating, all other parameters provided to
      * `SearchTargetPolicyBindingsRequest` must match the call that provided the
      * page token.
@@ -1074,8 +1025,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1089,9 +1040,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
      * Required. The parent resource where this search will be performed. This
      * should be the nearest Resource Manager resource (project, folder, or
      * organization) to the target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -1123,9 +1072,7 @@ public java.lang.String getParent() {
      * Required. The parent resource where this search will be performed. This
      * should be the nearest Resource Manager resource (project, folder, or
      * organization) to the target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -1157,9 +1104,7 @@ public com.google.protobuf.ByteString getParentBytes() {
      * Required. The parent resource where this search will be performed. This
      * should be the nearest Resource Manager resource (project, folder, or
      * organization) to the target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -1177,8 +1122,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1190,9 +1135,7 @@ public Builder setParent(java.lang.String value) {
      * Required. The parent resource where this search will be performed. This
      * should be the nearest Resource Manager resource (project, folder, or
      * organization) to the target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -1206,8 +1149,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1219,9 +1162,7 @@ public Builder clearParent() {
      * Required. The parent resource where this search will be performed. This
      * should be the nearest Resource Manager resource (project, folder, or
      * organization) to the target.
-     *
      * Format:
-     *
      * * `projects/{project_id}/locations/{location}`
      * * `projects/{project_number}/locations/{location}`
      * * `folders/{folder_id}/locations/{location}`
@@ -1240,8 +1181,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsRequestOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsRequestOrBuilder.java
index 806491498f..1c34ee6541 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface SearchTargetPolicyBindingsRequestOrBuilder
@@ -29,9 +28,7 @@ public interface SearchTargetPolicyBindingsRequestOrBuilder
    *
    * 
    * Required. The target resource, which is bound to the policy in the binding.
-   *
    * Format:
-   *
    * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
    * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
    * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -51,9 +48,7 @@ public interface SearchTargetPolicyBindingsRequestOrBuilder
    *
    * 
    * Required. The target resource, which is bound to the policy in the binding.
-   *
    * Format:
-   *
    * * `//iam.googleapis.com/locations/global/workforcePools/POOL_ID`
    * * `//iam.googleapis.com/projects/PROJECT_NUMBER/locations/global/workloadIdentityPools/POOL_ID`
    * * `//iam.googleapis.com/locations/global/workspace/WORKSPACE_ID`
@@ -74,7 +69,6 @@ public interface SearchTargetPolicyBindingsRequestOrBuilder
    * 
    * Optional. The maximum number of policy bindings to return. The service may
    * return fewer than this value.
-   *
    * If unspecified, at most 50 policy bindings will be returned.
    * The maximum value is 1000; values above 1000 will be coerced to 1000.
    * 

@@ -92,7 +86,6 @@ public interface SearchTargetPolicyBindingsRequestOrBuilder
    * Optional. A page token, received from a previous
    * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
    * subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `SearchTargetPolicyBindingsRequest` must match the call that provided the
    * page token.
@@ -111,7 +104,6 @@ public interface SearchTargetPolicyBindingsRequestOrBuilder
    * Optional. A page token, received from a previous
    * `SearchTargetPolicyBindingsRequest` call. Provide this to retrieve the
    * subsequent page.
-   *
    * When paginating, all other parameters provided to
    * `SearchTargetPolicyBindingsRequest` must match the call that provided the
    * page token.
@@ -130,9 +122,7 @@ public interface SearchTargetPolicyBindingsRequestOrBuilder
    * Required. The parent resource where this search will be performed. This
    * should be the nearest Resource Manager resource (project, folder, or
    * organization) to the target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
@@ -154,9 +144,7 @@ public interface SearchTargetPolicyBindingsRequestOrBuilder
    * Required. The parent resource where this search will be performed. This
    * should be the nearest Resource Manager resource (project, folder, or
    * organization) to the target.
-   *
    * Format:
-   *
    * * `projects/{project_id}/locations/{location}`
    * * `projects/{project_number}/locations/{location}`
    * * `folders/{folder_id}/locations/{location}`
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsResponse.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsResponse.java
index 991bdfd17a..621e566b4c 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsResponse.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SearchTargetPolicyBindingsResponse();
   }
 
+  @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.iam.v3beta.PolicyBindingsServiceProto
         .internal_static_google_iam_v3beta_SearchTargetPolicyBindingsResponse_descriptor;
@@ -67,8 +71,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int POLICY_BINDINGS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List policyBindings_;
 
   /**
@@ -143,9 +145,7 @@ public com.google.iam.v3beta.PolicyBindingOrBuilder getPolicyBindingsOrBuilder(i
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -407,7 +407,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (policyBindingsBuilder_ == null) {
         policyBindings_ = java.util.Collections.emptyList();
       } else {
@@ -416,6 +415,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -443,16 +443,7 @@ public com.google.iam.v3beta.SearchTargetPolicyBindingsResponse build() {
     public com.google.iam.v3beta.SearchTargetPolicyBindingsResponse buildPartial() {
       com.google.iam.v3beta.SearchTargetPolicyBindingsResponse result =
           new com.google.iam.v3beta.SearchTargetPolicyBindingsResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(
-        com.google.iam.v3beta.SearchTargetPolicyBindingsResponse result) {
+      int from_bitField0_ = bitField0_;
       if (policyBindingsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           policyBindings_ = java.util.Collections.unmodifiableList(policyBindings_);
@@ -462,13 +453,9 @@ private void buildPartialRepeatedFields(
       } else {
         result.policyBindings_ = policyBindingsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.iam.v3beta.SearchTargetPolicyBindingsResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -546,7 +533,6 @@ public Builder mergeFrom(com.google.iam.v3beta.SearchTargetPolicyBindingsRespons
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -591,7 +577,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1050,8 +1036,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1069,8 +1055,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1093,8 +1079,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsResponseOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsResponseOrBuilder.java
index 8d4ceaa152..7c9cbcbabe 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsResponseOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface SearchTargetPolicyBindingsResponseOrBuilder
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePolicyBindingRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePolicyBindingRequest.java
index c590baa28d..2ec60bf595 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePolicyBindingRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePolicyBindingRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -47,6 +46,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new UpdatePolicyBindingRequest();
   }
 
+  @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.iam.v3beta.PolicyBindingsServiceProto
         .internal_static_google_iam_v3beta_UpdatePolicyBindingRequest_descriptor;
@@ -62,7 +66,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v3beta.UpdatePolicyBindingRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int POLICY_BINDING_FIELD_NUMBER = 1;
   private com.google.iam.v3beta.PolicyBinding policyBinding_;
 
@@ -71,7 +74,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * Required. The policy binding to update.
-   *
    * The policy binding's `name` field is used to identify the policy binding to
    * update.
    * 

@@ -84,7 +86,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasPolicyBinding() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return policyBinding_ != null;
   }
 
   /**
@@ -92,7 +94,6 @@ public boolean hasPolicyBinding() {
    *
    * 
    * Required. The policy binding to update.
-   *
    * The policy binding's `name` field is used to identify the policy binding to
    * update.
    * 

@@ -115,7 +116,6 @@ public com.google.iam.v3beta.PolicyBinding getPolicyBinding() {
    *
    * 
    * Required. The policy binding to update.
-   *
    * The policy binding's `name` field is used to identify the policy binding to
    * update.
    * 

@@ -126,13 +126,11 @@ public com.google.iam.v3beta.PolicyBinding getPolicyBinding() {
    */
   @java.lang.Override
   public com.google.iam.v3beta.PolicyBindingOrBuilder getPolicyBindingOrBuilder() {
-    return policyBinding_ == null
-        ? com.google.iam.v3beta.PolicyBinding.getDefaultInstance()
-        : policyBinding_;
+    return getPolicyBinding();
   }
 
   public static final int VALIDATE_ONLY_FIELD_NUMBER = 2;
-  private boolean validateOnly_ = false;
+  private boolean validateOnly_;
 
   /**
    *
@@ -168,7 +166,7 @@ public boolean getValidateOnly() {
    */
   @java.lang.Override
   public boolean hasUpdateMask() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return updateMask_ != null;
   }
 
   /**
@@ -200,7 +198,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+    return getUpdateMask();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -217,13 +215,13 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policyBinding_ != null) {
       output.writeMessage(1, getPolicyBinding());
     }
     if (validateOnly_ != false) {
       output.writeBool(2, validateOnly_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateMask_ != null) {
       output.writeMessage(3, getUpdateMask());
     }
     getUnknownFields().writeTo(output);
@@ -235,13 +233,13 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (policyBinding_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getPolicyBinding());
     }
     if (validateOnly_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(2, validateOnly_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateMask_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getUpdateMask());
     }
     size += getUnknownFields().getSerializedSize();
@@ -420,35 +418,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.UpdatePolicyBindingRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPolicyBindingFieldBuilder();
-        getUpdateMaskFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      policyBinding_ = null;
-      if (policyBindingBuilder_ != null) {
-        policyBindingBuilder_.dispose();
+      if (policyBindingBuilder_ == null) {
+        policyBinding_ = null;
+      } else {
+        policyBinding_ = null;
         policyBindingBuilder_ = null;
       }
       validateOnly_ = false;
-      updateMask_ = null;
-      if (updateMaskBuilder_ != null) {
-        updateMaskBuilder_.dispose();
+
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+      } else {
+        updateMask_ = null;
         updateMaskBuilder_ = null;
       }
       return this;
@@ -478,31 +468,21 @@ public com.google.iam.v3beta.UpdatePolicyBindingRequest build() {
     public com.google.iam.v3beta.UpdatePolicyBindingRequest buildPartial() {
       com.google.iam.v3beta.UpdatePolicyBindingRequest result =
           new com.google.iam.v3beta.UpdatePolicyBindingRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (policyBindingBuilder_ == null) {
+        result.policyBinding_ = policyBinding_;
+      } else {
+        result.policyBinding_ = policyBindingBuilder_.build();
+      }
+      result.validateOnly_ = validateOnly_;
+      if (updateMaskBuilder_ == null) {
+        result.updateMask_ = updateMask_;
+      } else {
+        result.updateMask_ = updateMaskBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.iam.v3beta.UpdatePolicyBindingRequest result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.policyBinding_ =
-            policyBindingBuilder_ == null ? policyBinding_ : policyBindingBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.validateOnly_ = validateOnly_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -587,19 +567,19 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getPolicyBindingFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 validateOnly_ = input.readBool();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -619,8 +599,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.iam.v3beta.PolicyBinding policyBinding_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.iam.v3beta.PolicyBinding,
@@ -633,7 +611,6 @@ public Builder mergeFrom(
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -645,7 +622,7 @@ public Builder mergeFrom(
      * @return Whether the policyBinding field is set.
      */
     public boolean hasPolicyBinding() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return policyBindingBuilder_ != null || policyBinding_ != null;
     }
 
     /**
@@ -653,7 +630,6 @@ public boolean hasPolicyBinding() {
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -679,7 +655,6 @@ public com.google.iam.v3beta.PolicyBinding getPolicyBinding() {
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -694,11 +669,11 @@ public Builder setPolicyBinding(com.google.iam.v3beta.PolicyBinding value) {
           throw new NullPointerException();
         }
         policyBinding_ = value;
+        onChanged();
       } else {
         policyBindingBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -707,7 +682,6 @@ public Builder setPolicyBinding(com.google.iam.v3beta.PolicyBinding value) {
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -719,11 +693,11 @@ public Builder setPolicyBinding(com.google.iam.v3beta.PolicyBinding value) {
     public Builder setPolicyBinding(com.google.iam.v3beta.PolicyBinding.Builder builderForValue) {
       if (policyBindingBuilder_ == null) {
         policyBinding_ = builderForValue.build();
+        onChanged();
       } else {
         policyBindingBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -732,7 +706,6 @@ public Builder setPolicyBinding(com.google.iam.v3beta.PolicyBinding.Builder buil
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -743,20 +716,19 @@ public Builder setPolicyBinding(com.google.iam.v3beta.PolicyBinding.Builder buil
      */
     public Builder mergePolicyBinding(com.google.iam.v3beta.PolicyBinding value) {
       if (policyBindingBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && policyBinding_ != null
-            && policyBinding_ != com.google.iam.v3beta.PolicyBinding.getDefaultInstance()) {
-          getPolicyBindingBuilder().mergeFrom(value);
+        if (policyBinding_ != null) {
+          policyBinding_ =
+              com.google.iam.v3beta.PolicyBinding.newBuilder(policyBinding_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           policyBinding_ = value;
         }
+        onChanged();
       } else {
         policyBindingBuilder_.mergeFrom(value);
       }
-      if (policyBinding_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -765,7 +737,6 @@ public Builder mergePolicyBinding(com.google.iam.v3beta.PolicyBinding value) {
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -775,13 +746,14 @@ public Builder mergePolicyBinding(com.google.iam.v3beta.PolicyBinding value) {
      * 
      */
     public Builder clearPolicyBinding() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      policyBinding_ = null;
-      if (policyBindingBuilder_ != null) {
-        policyBindingBuilder_.dispose();
+      if (policyBindingBuilder_ == null) {
+        policyBinding_ = null;
+        onChanged();
+      } else {
+        policyBinding_ = null;
         policyBindingBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -790,7 +762,6 @@ public Builder clearPolicyBinding() {
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -800,7 +771,7 @@ public Builder clearPolicyBinding() {
      * 
      */
     public com.google.iam.v3beta.PolicyBinding.Builder getPolicyBindingBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getPolicyBindingFieldBuilder().getBuilder();
     }
@@ -810,7 +781,6 @@ public com.google.iam.v3beta.PolicyBinding.Builder getPolicyBindingBuilder() {
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -834,7 +804,6 @@ public com.google.iam.v3beta.PolicyBindingOrBuilder getPolicyBindingOrBuilder()
      *
      * 
      * Required. The policy binding to update.
-     *
      * The policy binding's `name` field is used to identify the policy binding to
      * update.
      * 

@@ -895,7 +864,6 @@ public boolean getValidateOnly() {
     public Builder setValidateOnly(boolean value) {
 
       validateOnly_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -913,7 +881,7 @@ public Builder setValidateOnly(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearValidateOnly() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       validateOnly_ = false;
       onChanged();
       return this;
@@ -939,7 +907,7 @@ public Builder clearValidateOnly() {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return updateMaskBuilder_ != null || updateMask_ != null;
     }
 
     /**
@@ -980,11 +948,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
+        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1001,11 +969,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
+        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1021,20 +989,17 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && updateMask_ != null
-            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
-          getUpdateMaskBuilder().mergeFrom(value);
+        if (updateMask_ != null) {
+          updateMask_ =
+              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
         } else {
           updateMask_ = value;
         }
+        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-      if (updateMask_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1049,13 +1014,14 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * 
      */
     public Builder clearUpdateMask() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      updateMask_ = null;
-      if (updateMaskBuilder_ != null) {
-        updateMaskBuilder_.dispose();
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+        onChanged();
+      } else {
+        updateMask_ = null;
         updateMaskBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1070,7 +1036,7 @@ public Builder clearUpdateMask() {
      * 
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePolicyBindingRequestOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePolicyBindingRequestOrBuilder.java
index d33a59f79f..b4ed7721bc 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePolicyBindingRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePolicyBindingRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/policy_bindings_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface UpdatePolicyBindingRequestOrBuilder
@@ -29,7 +28,6 @@ public interface UpdatePolicyBindingRequestOrBuilder
    *
    * 
    * Required. The policy binding to update.
-   *
    * The policy binding's `name` field is used to identify the policy binding to
    * update.
    * 

@@ -47,7 +45,6 @@ public interface UpdatePolicyBindingRequestOrBuilder
    *
    * 
    * Required. The policy binding to update.
-   *
    * The policy binding's `name` field is used to identify the policy binding to
    * update.
    * 

@@ -65,7 +62,6 @@ public interface UpdatePolicyBindingRequestOrBuilder
    *
    * 
    * Required. The policy binding to update.
-   *
    * The policy binding's `name` field is used to identify the policy binding to
    * update.
    * 

diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePrincipalAccessBoundaryPolicyRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePrincipalAccessBoundaryPolicyRequest.java
index e06dd2d0d3..d7cc0806c7 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePrincipalAccessBoundaryPolicyRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePrincipalAccessBoundaryPolicyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new UpdatePrincipalAccessBoundaryPolicyRequest();
   }
 
+  @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.iam.v3beta.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3beta_UpdatePrincipalAccessBoundaryPolicyRequest_descriptor;
@@ -64,7 +68,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.iam.v3beta.UpdatePrincipalAccessBoundaryPolicyRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int PRINCIPAL_ACCESS_BOUNDARY_POLICY_FIELD_NUMBER = 1;
   private com.google.iam.v3beta.PrincipalAccessBoundaryPolicy principalAccessBoundaryPolicy_;
 
@@ -73,7 +76,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * 
    * Required. The principal access boundary policy to update.
-   *
    * The principal access boundary policy's `name` field is used to identify the
    * policy to update.
    * 

@@ -86,7 +88,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasPrincipalAccessBoundaryPolicy() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return principalAccessBoundaryPolicy_ != null;
   }
 
   /**
@@ -94,7 +96,6 @@ public boolean hasPrincipalAccessBoundaryPolicy() {
    *
    * 
    * Required. The principal access boundary policy to update.
-   *
    * The principal access boundary policy's `name` field is used to identify the
    * policy to update.
    * 

@@ -117,7 +118,6 @@ public com.google.iam.v3beta.PrincipalAccessBoundaryPolicy getPrincipalAccessBou
    *
    * 
    * Required. The principal access boundary policy to update.
-   *
    * The principal access boundary policy's `name` field is used to identify the
    * policy to update.
    * 

@@ -129,13 +129,11 @@ public com.google.iam.v3beta.PrincipalAccessBoundaryPolicy getPrincipalAccessBou
   @java.lang.Override
   public com.google.iam.v3beta.PrincipalAccessBoundaryPolicyOrBuilder
       getPrincipalAccessBoundaryPolicyOrBuilder() {
-    return principalAccessBoundaryPolicy_ == null
-        ? com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.getDefaultInstance()
-        : principalAccessBoundaryPolicy_;
+    return getPrincipalAccessBoundaryPolicy();
   }
 
   public static final int VALIDATE_ONLY_FIELD_NUMBER = 2;
-  private boolean validateOnly_ = false;
+  private boolean validateOnly_;
 
   /**
    *
@@ -171,7 +169,7 @@ public boolean getValidateOnly() {
    */
   @java.lang.Override
   public boolean hasUpdateMask() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return updateMask_ != null;
   }
 
   /**
@@ -203,7 +201,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+    return getUpdateMask();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -220,13 +218,13 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (principalAccessBoundaryPolicy_ != null) {
       output.writeMessage(1, getPrincipalAccessBoundaryPolicy());
     }
     if (validateOnly_ != false) {
       output.writeBool(2, validateOnly_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateMask_ != null) {
       output.writeMessage(3, getUpdateMask());
     }
     getUnknownFields().writeTo(output);
@@ -238,7 +236,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (principalAccessBoundaryPolicy_ != null) {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               1, getPrincipalAccessBoundaryPolicy());
@@ -246,7 +244,7 @@ public int getSerializedSize() {
     if (validateOnly_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(2, validateOnly_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateMask_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getUpdateMask());
     }
     size += getUnknownFields().getSerializedSize();
@@ -428,35 +426,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.UpdatePrincipalAccessBoundaryPolicyRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getPrincipalAccessBoundaryPolicyFieldBuilder();
-        getUpdateMaskFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      principalAccessBoundaryPolicy_ = null;
-      if (principalAccessBoundaryPolicyBuilder_ != null) {
-        principalAccessBoundaryPolicyBuilder_.dispose();
+      if (principalAccessBoundaryPolicyBuilder_ == null) {
+        principalAccessBoundaryPolicy_ = null;
+      } else {
+        principalAccessBoundaryPolicy_ = null;
         principalAccessBoundaryPolicyBuilder_ = null;
       }
       validateOnly_ = false;
-      updateMask_ = null;
-      if (updateMaskBuilder_ != null) {
-        updateMaskBuilder_.dispose();
+
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+      } else {
+        updateMask_ = null;
         updateMaskBuilder_ = null;
       }
       return this;
@@ -487,34 +477,21 @@ public com.google.iam.v3beta.UpdatePrincipalAccessBoundaryPolicyRequest build()
     public com.google.iam.v3beta.UpdatePrincipalAccessBoundaryPolicyRequest buildPartial() {
       com.google.iam.v3beta.UpdatePrincipalAccessBoundaryPolicyRequest result =
           new com.google.iam.v3beta.UpdatePrincipalAccessBoundaryPolicyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (principalAccessBoundaryPolicyBuilder_ == null) {
+        result.principalAccessBoundaryPolicy_ = principalAccessBoundaryPolicy_;
+      } else {
+        result.principalAccessBoundaryPolicy_ = principalAccessBoundaryPolicyBuilder_.build();
+      }
+      result.validateOnly_ = validateOnly_;
+      if (updateMaskBuilder_ == null) {
+        result.updateMask_ = updateMask_;
+      } else {
+        result.updateMask_ = updateMaskBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(
-        com.google.iam.v3beta.UpdatePrincipalAccessBoundaryPolicyRequest result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.principalAccessBoundaryPolicy_ =
-            principalAccessBoundaryPolicyBuilder_ == null
-                ? principalAccessBoundaryPolicy_
-                : principalAccessBoundaryPolicyBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.validateOnly_ = validateOnly_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -602,19 +579,19 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getPrincipalAccessBoundaryPolicyFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 validateOnly_ = input.readBool();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -634,8 +611,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.iam.v3beta.PrincipalAccessBoundaryPolicy principalAccessBoundaryPolicy_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.iam.v3beta.PrincipalAccessBoundaryPolicy,
@@ -648,7 +623,6 @@ public Builder mergeFrom(
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -660,7 +634,8 @@ public Builder mergeFrom(
      * @return Whether the principalAccessBoundaryPolicy field is set.
      */
     public boolean hasPrincipalAccessBoundaryPolicy() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return principalAccessBoundaryPolicyBuilder_ != null
+          || principalAccessBoundaryPolicy_ != null;
     }
 
     /**
@@ -668,7 +643,6 @@ public boolean hasPrincipalAccessBoundaryPolicy() {
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -694,7 +668,6 @@ public com.google.iam.v3beta.PrincipalAccessBoundaryPolicy getPrincipalAccessBou
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -710,11 +683,11 @@ public Builder setPrincipalAccessBoundaryPolicy(
           throw new NullPointerException();
         }
         principalAccessBoundaryPolicy_ = value;
+        onChanged();
       } else {
         principalAccessBoundaryPolicyBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -723,7 +696,6 @@ public Builder setPrincipalAccessBoundaryPolicy(
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -736,11 +708,11 @@ public Builder setPrincipalAccessBoundaryPolicy(
         com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.Builder builderForValue) {
       if (principalAccessBoundaryPolicyBuilder_ == null) {
         principalAccessBoundaryPolicy_ = builderForValue.build();
+        onChanged();
       } else {
         principalAccessBoundaryPolicyBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -749,7 +721,6 @@ public Builder setPrincipalAccessBoundaryPolicy(
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -761,21 +732,20 @@ public Builder setPrincipalAccessBoundaryPolicy(
     public Builder mergePrincipalAccessBoundaryPolicy(
         com.google.iam.v3beta.PrincipalAccessBoundaryPolicy value) {
       if (principalAccessBoundaryPolicyBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && principalAccessBoundaryPolicy_ != null
-            && principalAccessBoundaryPolicy_
-                != com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.getDefaultInstance()) {
-          getPrincipalAccessBoundaryPolicyBuilder().mergeFrom(value);
+        if (principalAccessBoundaryPolicy_ != null) {
+          principalAccessBoundaryPolicy_ =
+              com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.newBuilder(
+                      principalAccessBoundaryPolicy_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           principalAccessBoundaryPolicy_ = value;
         }
+        onChanged();
       } else {
         principalAccessBoundaryPolicyBuilder_.mergeFrom(value);
       }
-      if (principalAccessBoundaryPolicy_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -784,7 +754,6 @@ public Builder mergePrincipalAccessBoundaryPolicy(
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -794,13 +763,14 @@ public Builder mergePrincipalAccessBoundaryPolicy(
      * 
      */
     public Builder clearPrincipalAccessBoundaryPolicy() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      principalAccessBoundaryPolicy_ = null;
-      if (principalAccessBoundaryPolicyBuilder_ != null) {
-        principalAccessBoundaryPolicyBuilder_.dispose();
+      if (principalAccessBoundaryPolicyBuilder_ == null) {
+        principalAccessBoundaryPolicy_ = null;
+        onChanged();
+      } else {
+        principalAccessBoundaryPolicy_ = null;
         principalAccessBoundaryPolicyBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -809,7 +779,6 @@ public Builder clearPrincipalAccessBoundaryPolicy() {
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -820,7 +789,7 @@ public Builder clearPrincipalAccessBoundaryPolicy() {
      */
     public com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.Builder
         getPrincipalAccessBoundaryPolicyBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getPrincipalAccessBoundaryPolicyFieldBuilder().getBuilder();
     }
@@ -830,7 +799,6 @@ public Builder clearPrincipalAccessBoundaryPolicy() {
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -855,7 +823,6 @@ public Builder clearPrincipalAccessBoundaryPolicy() {
      *
      * 
      * Required. The principal access boundary policy to update.
-     *
      * The principal access boundary policy's `name` field is used to identify the
      * policy to update.
      * 

@@ -916,7 +883,6 @@ public boolean getValidateOnly() {
     public Builder setValidateOnly(boolean value) {
 
       validateOnly_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -934,7 +900,7 @@ public Builder setValidateOnly(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearValidateOnly() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       validateOnly_ = false;
       onChanged();
       return this;
@@ -960,7 +926,7 @@ public Builder clearValidateOnly() {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return updateMaskBuilder_ != null || updateMask_ != null;
     }
 
     /**
@@ -1001,11 +967,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
+        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1022,11 +988,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
+        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1042,20 +1008,17 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && updateMask_ != null
-            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
-          getUpdateMaskBuilder().mergeFrom(value);
+        if (updateMask_ != null) {
+          updateMask_ =
+              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
         } else {
           updateMask_ = value;
         }
+        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-      if (updateMask_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1070,13 +1033,14 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * 
      */
     public Builder clearUpdateMask() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      updateMask_ = null;
-      if (updateMaskBuilder_ != null) {
-        updateMaskBuilder_.dispose();
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+        onChanged();
+      } else {
+        updateMask_ = null;
         updateMaskBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1091,7 +1055,7 @@ public Builder clearUpdateMask() {
      * 
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePrincipalAccessBoundaryPolicyRequestOrBuilder.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePrincipalAccessBoundaryPolicyRequestOrBuilder.java
index eb31426e9f..c3f1aad9b2 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePrincipalAccessBoundaryPolicyRequestOrBuilder.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePrincipalAccessBoundaryPolicyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v3beta/principal_access_boundary_policies_service.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.iam.v3beta;
 
 public interface UpdatePrincipalAccessBoundaryPolicyRequestOrBuilder
@@ -29,7 +28,6 @@ public interface UpdatePrincipalAccessBoundaryPolicyRequestOrBuilder
    *
    * 
    * Required. The principal access boundary policy to update.
-   *
    * The principal access boundary policy's `name` field is used to identify the
    * policy to update.
    * 

@@ -47,7 +45,6 @@ public interface UpdatePrincipalAccessBoundaryPolicyRequestOrBuilder
    *
    * 
    * Required. The principal access boundary policy to update.
-   *
    * The principal access boundary policy's `name` field is used to identify the
    * policy to update.
    * 

@@ -65,7 +62,6 @@ public interface UpdatePrincipalAccessBoundaryPolicyRequestOrBuilder
    *
    * 
    * Required. The principal access boundary policy to update.
-   *
    * The principal access boundary policy's `name` field is used to identify the
    * policy to update.
    * 

diff --git a/java-showcase/gapic-showcase/src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json b/java-showcase/gapic-showcase/src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json
index 328fa8f9db..077caee652 100644
--- a/java-showcase/gapic-showcase/src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json
+++ b/java-showcase/gapic-showcase/src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json
@@ -1025,15 +1025,6 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$Edition",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
   {
     "name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -1142,141 +1133,6 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Declaration",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$Declaration$Builder",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$ExtensionRangeOptions$VerificationState",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$FeatureSet",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Utf8Validation",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$Builder",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$FeatureSetEditionDefault",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$FeatureSetEditionDefault$Builder",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -1340,24 +1196,6 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
     "queryAllDeclaredConstructors": true,
@@ -1367,24 +1205,6 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$OptionRetention",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$OptionTargetType",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FileDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -1475,15 +1295,6 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
-  {
-    "name": "com.google.protobuf.DescriptorProtos$GeneratedCodeInfo$Annotation$Semantic",
-    "queryAllDeclaredConstructors": true,
-    "queryAllPublicConstructors": true,
-    "queryAllDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
-  },
   {
     "name": "com.google.protobuf.DescriptorProtos$GeneratedCodeInfo$Builder",
     "queryAllDeclaredConstructors": true,
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptSequenceRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptSequenceRequest.java
index 51dce8b55e..56a057335c 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptSequenceRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptSequenceRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.AttemptSequenceRequest} */
@@ -41,6 +40,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new AttemptSequenceRequest();
   }
 
+  @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.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_AttemptSequenceRequest_descriptor;
@@ -57,9 +61,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    * 
@@ -291,8 +293,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -320,20 +322,11 @@ public com.google.showcase.v1beta1.AttemptSequenceRequest build() {
     public com.google.showcase.v1beta1.AttemptSequenceRequest buildPartial() {
       com.google.showcase.v1beta1.AttemptSequenceRequest result =
           new com.google.showcase.v1beta1.AttemptSequenceRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.AttemptSequenceRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -382,7 +375,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.AttemptSequenceRequest othe
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -414,7 +406,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -434,8 +426,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -488,8 +478,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -502,8 +492,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -521,8 +511,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptSequenceRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptSequenceRequestOrBuilder.java
index 6522ace9d4..bbe1dcfbdb 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptSequenceRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptSequenceRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface AttemptSequenceRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceRequest.java
index c1572e275e..26215b39c0 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.AttemptStreamingSequenceRequest} */
@@ -42,6 +41,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new AttemptStreamingSequenceRequest();
   }
 
+  @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.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_AttemptStreamingSequenceRequest_descriptor;
@@ -58,9 +62,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    * 
@@ -103,7 +105,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int LAST_FAIL_INDEX_FIELD_NUMBER = 2;
-  private int lastFailIndex_ = 0;
+  private int lastFailIndex_;
 
   /**
    *
@@ -323,9 +325,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       lastFailIndex_ = 0;
+
       return this;
     }
 
@@ -353,23 +356,12 @@ public com.google.showcase.v1beta1.AttemptStreamingSequenceRequest build() {
     public com.google.showcase.v1beta1.AttemptStreamingSequenceRequest buildPartial() {
       com.google.showcase.v1beta1.AttemptStreamingSequenceRequest result =
           new com.google.showcase.v1beta1.AttemptStreamingSequenceRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
+      result.lastFailIndex_ = lastFailIndex_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.AttemptStreamingSequenceRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.lastFailIndex_ = lastFailIndex_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -418,7 +410,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.AttemptStreamingSequenceReq
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getLastFailIndex() != 0) {
@@ -453,13 +444,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 lastFailIndex_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             default:
@@ -479,8 +470,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -533,8 +522,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -547,8 +536,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -566,8 +555,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -609,7 +598,6 @@ public int getLastFailIndex() {
     public Builder setLastFailIndex(int value) {
 
       lastFailIndex_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -628,7 +616,7 @@ public Builder setLastFailIndex(int value) {
      * @return This builder for chaining.
      */
     public Builder clearLastFailIndex() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       lastFailIndex_ = 0;
       onChanged();
       return this;
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceRequestOrBuilder.java
index 698ffd7aa3..4e6cda9daf 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface AttemptStreamingSequenceRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceResponse.java
index 798a2328c8..c2718b9176 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new AttemptStreamingSequenceResponse();
   }
 
+  @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.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_AttemptStreamingSequenceResponse_descriptor;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONTENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object content_ = "";
+  private volatile java.lang.Object content_;
 
   /**
    *
@@ -317,8 +319,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       content_ = "";
+
       return this;
     }
 
@@ -347,21 +349,11 @@ public com.google.showcase.v1beta1.AttemptStreamingSequenceResponse build() {
     public com.google.showcase.v1beta1.AttemptStreamingSequenceResponse buildPartial() {
       com.google.showcase.v1beta1.AttemptStreamingSequenceResponse result =
           new com.google.showcase.v1beta1.AttemptStreamingSequenceResponse(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.content_ = content_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(
-        com.google.showcase.v1beta1.AttemptStreamingSequenceResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.content_ = content_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -411,7 +403,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.AttemptStreamingSequenceRes
         return this;
       if (!other.getContent().isEmpty()) {
         content_ = other.content_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -443,7 +434,7 @@ public Builder mergeFrom(
             case 10:
               {
                 content_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -463,8 +454,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object content_ = "";
 
     /**
@@ -529,8 +518,8 @@ public Builder setContent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       content_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -547,8 +536,8 @@ public Builder setContent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearContent() {
+
       content_ = getDefaultInstance().getContent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -570,8 +559,8 @@ public Builder setContentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       content_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceResponseOrBuilder.java
index ed9302cc52..b8ca583828 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface AttemptStreamingSequenceResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequest.java
index 413b9a852c..0eb603f62b 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -47,6 +46,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new BlockRequest();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_BlockRequest_descriptor;
@@ -62,10 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.BlockRequest.Builder.class);
   }
 
-  private int bitField0_;
   private int responseCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object response_;
 
   public enum ResponseCase
@@ -129,7 +130,7 @@ public ResponseCase getResponseCase() {
    */
   @java.lang.Override
   public boolean hasResponseDelay() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return responseDelay_ != null;
   }
 
   /**
@@ -161,9 +162,7 @@ public com.google.protobuf.Duration getResponseDelay() {
    */
   @java.lang.Override
   public com.google.protobuf.DurationOrBuilder getResponseDelayOrBuilder() {
-    return responseDelay_ == null
-        ? com.google.protobuf.Duration.getDefaultInstance()
-        : responseDelay_;
+    return getResponseDelay();
   }
 
   public static final int ERROR_FIELD_NUMBER = 2;
@@ -291,7 +290,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (responseDelay_ != null) {
       output.writeMessage(1, getResponseDelay());
     }
     if (responseCase_ == 2) {
@@ -309,7 +308,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (responseDelay_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getResponseDelay());
     }
     if (responseCase_ == 2) {
@@ -509,28 +508,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.BlockRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getResponseDelayFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      responseDelay_ = null;
-      if (responseDelayBuilder_ != null) {
-        responseDelayBuilder_.dispose();
+      if (responseDelayBuilder_ == null) {
+        responseDelay_ = null;
+      } else {
+        responseDelay_ = null;
         responseDelayBuilder_ = null;
       }
       if (errorBuilder_ != null) {
@@ -568,34 +558,28 @@ public com.google.showcase.v1beta1.BlockRequest build() {
     public com.google.showcase.v1beta1.BlockRequest buildPartial() {
       com.google.showcase.v1beta1.BlockRequest result =
           new com.google.showcase.v1beta1.BlockRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      buildPartialOneofs(result);
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.BlockRequest result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.responseDelay_ =
-            responseDelayBuilder_ == null ? responseDelay_ : responseDelayBuilder_.build();
-        to_bitField0_ |= 0x00000001;
+      if (responseDelayBuilder_ == null) {
+        result.responseDelay_ = responseDelay_;
+      } else {
+        result.responseDelay_ = responseDelayBuilder_.build();
       }
-      result.bitField0_ |= to_bitField0_;
-    }
-
-    private void buildPartialOneofs(com.google.showcase.v1beta1.BlockRequest result) {
-      result.responseCase_ = responseCase_;
-      result.response_ = this.response_;
-      if (responseCase_ == 2 && errorBuilder_ != null) {
-        result.response_ = errorBuilder_.build();
+      if (responseCase_ == 2) {
+        if (errorBuilder_ == null) {
+          result.response_ = response_;
+        } else {
+          result.response_ = errorBuilder_.build();
+        }
       }
-      if (responseCase_ == 3 && successBuilder_ != null) {
-        result.response_ = successBuilder_.build();
+      if (responseCase_ == 3) {
+        if (successBuilder_ == null) {
+          result.response_ = response_;
+        } else {
+          result.response_ = successBuilder_.build();
+        }
       }
+      result.responseCase_ = responseCase_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -691,7 +675,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getResponseDelayFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -737,8 +721,6 @@ public Builder clearResponse() {
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.protobuf.Duration responseDelay_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.protobuf.Duration,
@@ -758,7 +740,7 @@ public Builder clearResponse() {
      * @return Whether the responseDelay field is set.
      */
     public boolean hasResponseDelay() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return responseDelayBuilder_ != null || responseDelay_ != null;
     }
 
     /**
@@ -797,11 +779,11 @@ public Builder setResponseDelay(com.google.protobuf.Duration value) {
           throw new NullPointerException();
         }
         responseDelay_ = value;
+        onChanged();
       } else {
         responseDelayBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -817,11 +799,11 @@ public Builder setResponseDelay(com.google.protobuf.Duration value) {
     public Builder setResponseDelay(com.google.protobuf.Duration.Builder builderForValue) {
       if (responseDelayBuilder_ == null) {
         responseDelay_ = builderForValue.build();
+        onChanged();
       } else {
         responseDelayBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -836,20 +818,19 @@ public Builder setResponseDelay(com.google.protobuf.Duration.Builder builderForV
      */
     public Builder mergeResponseDelay(com.google.protobuf.Duration value) {
       if (responseDelayBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && responseDelay_ != null
-            && responseDelay_ != com.google.protobuf.Duration.getDefaultInstance()) {
-          getResponseDelayBuilder().mergeFrom(value);
+        if (responseDelay_ != null) {
+          responseDelay_ =
+              com.google.protobuf.Duration.newBuilder(responseDelay_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           responseDelay_ = value;
         }
+        onChanged();
       } else {
         responseDelayBuilder_.mergeFrom(value);
       }
-      if (responseDelay_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -863,13 +844,14 @@ public Builder mergeResponseDelay(com.google.protobuf.Duration value) {
      * .google.protobuf.Duration response_delay = 1;
      */
     public Builder clearResponseDelay() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      responseDelay_ = null;
-      if (responseDelayBuilder_ != null) {
-        responseDelayBuilder_.dispose();
+      if (responseDelayBuilder_ == null) {
+        responseDelay_ = null;
+        onChanged();
+      } else {
+        responseDelay_ = null;
         responseDelayBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -883,7 +865,7 @@ public Builder clearResponseDelay() {
      * .google.protobuf.Duration response_delay = 1;
      */
     public com.google.protobuf.Duration.Builder getResponseDelayBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getResponseDelayFieldBuilder().getBuilder();
     }
@@ -1148,6 +1130,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
       }
       responseCase_ = 2;
       onChanged();
+      ;
       return errorBuilder_;
     }
 
@@ -1365,6 +1348,7 @@ public com.google.showcase.v1beta1.BlockResponseOrBuilder getSuccessOrBuilder()
       }
       responseCase_ = 3;
       onChanged();
+      ;
       return successBuilder_;
     }
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequestOrBuilder.java
index 6c1bff9b58..6c60854c42 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface BlockRequestOrBuilder
@@ -138,5 +137,5 @@ public interface BlockRequestOrBuilder
    */
   com.google.showcase.v1beta1.BlockResponseOrBuilder getSuccessOrBuilder();
 
-  com.google.showcase.v1beta1.BlockRequest.ResponseCase getResponseCase();
+  public com.google.showcase.v1beta1.BlockRequest.ResponseCase getResponseCase();
 }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockResponse.java
index 81744f9463..c7fbe773b4 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new BlockResponse();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_BlockResponse_descriptor;
@@ -65,9 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONTENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object content_ = "";
+  private volatile java.lang.Object content_;
 
   /**
    *
@@ -317,8 +319,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       content_ = "";
+
       return this;
     }
 
@@ -346,20 +348,11 @@ public com.google.showcase.v1beta1.BlockResponse build() {
     public com.google.showcase.v1beta1.BlockResponse buildPartial() {
       com.google.showcase.v1beta1.BlockResponse result =
           new com.google.showcase.v1beta1.BlockResponse(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.content_ = content_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.BlockResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.content_ = content_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -407,7 +400,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.BlockResponse other) {
       if (other == com.google.showcase.v1beta1.BlockResponse.getDefaultInstance()) return this;
       if (!other.getContent().isEmpty()) {
         content_ = other.content_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -439,7 +431,7 @@ public Builder mergeFrom(
             case 10:
               {
                 content_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -459,8 +451,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object content_ = "";
 
     /**
@@ -528,8 +518,8 @@ public Builder setContent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       content_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -547,8 +537,8 @@ public Builder setContent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearContent() {
+
       content_ = getDefaultInstance().getContent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -571,8 +561,8 @@ public Builder setContentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       content_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockResponseOrBuilder.java
index 52243d9131..ca73f88030 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface BlockResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Blurb.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Blurb.java
index ba46d1aaf4..c4bcb705b8 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Blurb.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Blurb.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Blurb();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_Blurb_descriptor;
@@ -66,10 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.Blurb.Builder.class);
   }
 
-  private int bitField0_;
   private int contentCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object content_;
 
   public enum ContentCase
@@ -118,8 +119,6 @@ public ContentCase getContentCase() {
   }
 
   private int legacyIdCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object legacyId_;
 
   public enum LegacyIdCase
@@ -168,9 +167,7 @@ public LegacyIdCase getLegacyIdCase() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -221,9 +218,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int USER_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object user_ = "";
+  private volatile java.lang.Object user_;
 
   /**
    *
@@ -404,7 +399,7 @@ public com.google.protobuf.ByteString getImage() {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return createTime_ != null;
   }
 
   /**
@@ -436,7 +431,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+    return getCreateTime();
   }
 
   public static final int UPDATE_TIME_FIELD_NUMBER = 6;
@@ -456,7 +451,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateTime() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return updateTime_ != null;
   }
 
   /**
@@ -488,7 +483,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+    return getUpdateTime();
   }
 
   public static final int LEGACY_ROOM_ID_FIELD_NUMBER = 7;
@@ -675,10 +670,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (contentCase_ == 4) {
       output.writeBytes(4, (com.google.protobuf.ByteString) content_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       output.writeMessage(5, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateTime_ != null) {
       output.writeMessage(6, getUpdateTime());
     }
     if (legacyIdCase_ == 7) {
@@ -710,10 +705,10 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeBytesSize(
               4, (com.google.protobuf.ByteString) content_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getUpdateTime());
     }
     if (legacyIdCase_ == 7) {
@@ -946,36 +941,29 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.Blurb.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCreateTimeFieldBuilder();
-        getUpdateTimeFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       user_ = "";
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
       contentCase_ = 0;
@@ -1008,39 +996,34 @@ public com.google.showcase.v1beta1.Blurb build() {
     @java.lang.Override
     public com.google.showcase.v1beta1.Blurb buildPartial() {
       com.google.showcase.v1beta1.Blurb result = new com.google.showcase.v1beta1.Blurb(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.name_ = name_;
+      result.user_ = user_;
+      if (contentCase_ == 3) {
+        result.content_ = content_;
       }
-      buildPartialOneofs(result);
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.Blurb result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
+      if (contentCase_ == 4) {
+        result.content_ = content_;
       }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.user_ = user_;
+      if (createTimeBuilder_ == null) {
+        result.createTime_ = createTime_;
+      } else {
+        result.createTime_ = createTimeBuilder_.build();
       }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
-        to_bitField0_ |= 0x00000001;
+      if (updateTimeBuilder_ == null) {
+        result.updateTime_ = updateTime_;
+      } else {
+        result.updateTime_ = updateTimeBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
-        to_bitField0_ |= 0x00000002;
+      if (legacyIdCase_ == 7) {
+        result.legacyId_ = legacyId_;
+      }
+      if (legacyIdCase_ == 8) {
+        result.legacyId_ = legacyId_;
       }
-      result.bitField0_ |= to_bitField0_;
-    }
-
-    private void buildPartialOneofs(com.google.showcase.v1beta1.Blurb result) {
       result.contentCase_ = contentCase_;
-      result.content_ = this.content_;
       result.legacyIdCase_ = legacyIdCase_;
-      result.legacyId_ = this.legacyId_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1090,12 +1073,10 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Blurb other) {
       if (other == com.google.showcase.v1beta1.Blurb.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getUser().isEmpty()) {
         user_ = other.user_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.hasCreateTime()) {
@@ -1171,13 +1152,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 user_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
@@ -1196,13 +1177,13 @@ public Builder mergeFrom(
             case 42:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 42
             case 50:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 50
             case 58:
@@ -1264,8 +1245,6 @@ public Builder clearLegacyId() {
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -1330,8 +1309,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1348,8 +1327,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1371,8 +1350,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1447,8 +1426,8 @@ public Builder setUser(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       user_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1467,8 +1446,8 @@ public Builder setUser(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearUser() {
+
       user_ = getDefaultInstance().getUser();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1492,8 +1471,8 @@ public Builder setUserBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       user_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1733,7 +1712,7 @@ public Builder clearImage() {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return ((bitField0_ & 0x00000010) != 0);
+      return createTimeBuilder_ != null || createTime_ != null;
     }
 
     /**
@@ -1776,11 +1755,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -1798,11 +1777,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -1819,20 +1798,17 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)
-            && createTime_ != null
-            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getCreateTimeBuilder().mergeFrom(value);
+        if (createTime_ != null) {
+          createTime_ =
+              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
         } else {
           createTime_ = value;
         }
+        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-      if (createTime_ != null) {
-        bitField0_ |= 0x00000010;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1848,13 +1824,14 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearCreateTime() {
-      bitField0_ = (bitField0_ & ~0x00000010);
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+        onChanged();
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1870,7 +1847,7 @@ public Builder clearCreateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-      bitField0_ |= 0x00000010;
+
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -1945,7 +1922,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      * @return Whether the updateTime field is set.
      */
     public boolean hasUpdateTime() {
-      return ((bitField0_ & 0x00000020) != 0);
+      return updateTimeBuilder_ != null || updateTime_ != null;
     }
 
     /**
@@ -1988,11 +1965,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         updateTime_ = value;
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000020;
-      onChanged();
+
       return this;
     }
 
@@ -2010,11 +1987,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
     public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (updateTimeBuilder_ == null) {
         updateTime_ = builderForValue.build();
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000020;
-      onChanged();
+
       return this;
     }
 
@@ -2031,20 +2008,17 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       if (updateTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000020) != 0)
-            && updateTime_ != null
-            && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getUpdateTimeBuilder().mergeFrom(value);
+        if (updateTime_ != null) {
+          updateTime_ =
+              com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
         } else {
           updateTime_ = value;
         }
+        onChanged();
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-      if (updateTime_ != null) {
-        bitField0_ |= 0x00000020;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2060,13 +2034,14 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearUpdateTime() {
-      bitField0_ = (bitField0_ & ~0x00000020);
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+        onChanged();
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2082,7 +2057,7 @@ public Builder clearUpdateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-      bitField0_ |= 0x00000020;
+
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbOrBuilder.java
index d24cf1f7fc..6d1bbf363a 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface BlurbOrBuilder
@@ -315,7 +314,7 @@ public interface BlurbOrBuilder
    */
   com.google.protobuf.ByteString getLegacyUserIdBytes();
 
-  com.google.showcase.v1beta1.Blurb.ContentCase getContentCase();
+  public com.google.showcase.v1beta1.Blurb.ContentCase getContentCase();
 
-  com.google.showcase.v1beta1.Blurb.LegacyIdCase getLegacyIdCase();
+  public com.google.showcase.v1beta1.Blurb.LegacyIdCase getLegacyIdCase();
 }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceData.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceData.java
index 9b3990d7b1..080d05bc5c 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceData.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceData.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -54,6 +53,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ComplianceData();
   }
 
+  @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.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_ComplianceData_descriptor;
@@ -202,9 +206,7 @@ private LifeKingdom(int value) {
 
   private int bitField0_;
   public static final int F_STRING_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object fString_ = "";
+  private volatile java.lang.Object fString_;
 
   /**
    * string f_string = 1;
@@ -243,7 +245,7 @@ public com.google.protobuf.ByteString getFStringBytes() {
   }
 
   public static final int F_INT32_FIELD_NUMBER = 2;
-  private int fInt32_ = 0;
+  private int fInt32_;
 
   /**
    * int32 f_int32 = 2;
@@ -256,7 +258,7 @@ public int getFInt32() {
   }
 
   public static final int F_SINT32_FIELD_NUMBER = 3;
-  private int fSint32_ = 0;
+  private int fSint32_;
 
   /**
    * sint32 f_sint32 = 3;
@@ -269,7 +271,7 @@ public int getFSint32() {
   }
 
   public static final int F_SFIXED32_FIELD_NUMBER = 4;
-  private int fSfixed32_ = 0;
+  private int fSfixed32_;
 
   /**
    * sfixed32 f_sfixed32 = 4;
@@ -282,7 +284,7 @@ public int getFSfixed32() {
   }
 
   public static final int F_UINT32_FIELD_NUMBER = 5;
-  private int fUint32_ = 0;
+  private int fUint32_;
 
   /**
    * uint32 f_uint32 = 5;
@@ -295,7 +297,7 @@ public int getFUint32() {
   }
 
   public static final int F_FIXED32_FIELD_NUMBER = 6;
-  private int fFixed32_ = 0;
+  private int fFixed32_;
 
   /**
    * fixed32 f_fixed32 = 6;
@@ -308,7 +310,7 @@ public int getFFixed32() {
   }
 
   public static final int F_INT64_FIELD_NUMBER = 7;
-  private long fInt64_ = 0L;
+  private long fInt64_;
 
   /**
    * int64 f_int64 = 7;
@@ -321,7 +323,7 @@ public long getFInt64() {
   }
 
   public static final int F_SINT64_FIELD_NUMBER = 8;
-  private long fSint64_ = 0L;
+  private long fSint64_;
 
   /**
    * sint64 f_sint64 = 8;
@@ -334,7 +336,7 @@ public long getFSint64() {
   }
 
   public static final int F_SFIXED64_FIELD_NUMBER = 9;
-  private long fSfixed64_ = 0L;
+  private long fSfixed64_;
 
   /**
    * sfixed64 f_sfixed64 = 9;
@@ -347,7 +349,7 @@ public long getFSfixed64() {
   }
 
   public static final int F_UINT64_FIELD_NUMBER = 10;
-  private long fUint64_ = 0L;
+  private long fUint64_;
 
   /**
    * uint64 f_uint64 = 10;
@@ -360,7 +362,7 @@ public long getFUint64() {
   }
 
   public static final int F_FIXED64_FIELD_NUMBER = 11;
-  private long fFixed64_ = 0L;
+  private long fFixed64_;
 
   /**
    * fixed64 f_fixed64 = 11;
@@ -373,7 +375,7 @@ public long getFFixed64() {
   }
 
   public static final int F_DOUBLE_FIELD_NUMBER = 12;
-  private double fDouble_ = 0D;
+  private double fDouble_;
 
   /**
    * double f_double = 12;
@@ -386,7 +388,7 @@ public double getFDouble() {
   }
 
   public static final int F_FLOAT_FIELD_NUMBER = 13;
-  private float fFloat_ = 0F;
+  private float fFloat_;
 
   /**
    * float f_float = 13;
@@ -399,7 +401,7 @@ public float getFFloat() {
   }
 
   public static final int F_BOOL_FIELD_NUMBER = 14;
-  private boolean fBool_ = false;
+  private boolean fBool_;
 
   /**
    * bool f_bool = 14;
@@ -412,7 +414,7 @@ public boolean getFBool() {
   }
 
   public static final int F_BYTES_FIELD_NUMBER = 15;
-  private com.google.protobuf.ByteString fBytes_ = com.google.protobuf.ByteString.EMPTY;
+  private com.google.protobuf.ByteString fBytes_;
 
   /**
    * bytes f_bytes = 15;
@@ -425,7 +427,7 @@ public com.google.protobuf.ByteString getFBytes() {
   }
 
   public static final int F_KINGDOM_FIELD_NUMBER = 22;
-  private int fKingdom_ = 0;
+  private int fKingdom_;
 
   /**
    * .google.showcase.v1beta1.ComplianceData.LifeKingdom f_kingdom = 22;
@@ -444,8 +446,9 @@ public int getFKingdomValue() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.ComplianceData.LifeKingdom getFKingdom() {
+    @SuppressWarnings("deprecation")
     com.google.showcase.v1beta1.ComplianceData.LifeKingdom result =
-        com.google.showcase.v1beta1.ComplianceData.LifeKingdom.forNumber(fKingdom_);
+        com.google.showcase.v1beta1.ComplianceData.LifeKingdom.valueOf(fKingdom_);
     return result == null
         ? com.google.showcase.v1beta1.ComplianceData.LifeKingdom.UNRECOGNIZED
         : result;
@@ -461,7 +464,7 @@ public com.google.showcase.v1beta1.ComplianceData.LifeKingdom getFKingdom() {
    */
   @java.lang.Override
   public boolean hasFChild() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return fChild_ != null;
   }
 
   /**
@@ -479,15 +482,11 @@ public com.google.showcase.v1beta1.ComplianceDataChild getFChild() {
   /** .google.showcase.v1beta1.ComplianceDataChild f_child = 16; */
   @java.lang.Override
   public com.google.showcase.v1beta1.ComplianceDataChildOrBuilder getFChildOrBuilder() {
-    return fChild_ == null
-        ? com.google.showcase.v1beta1.ComplianceDataChild.getDefaultInstance()
-        : fChild_;
+    return getFChild();
   }
 
   public static final int P_STRING_FIELD_NUMBER = 17;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pString_ = "";
+  private volatile java.lang.Object pString_;
 
   /**
    * optional string p_string = 17;
@@ -496,7 +495,7 @@ public com.google.showcase.v1beta1.ComplianceDataChildOrBuilder getFChildOrBuild
    */
   @java.lang.Override
   public boolean hasPString() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return ((bitField0_ & 0x00000001) != 0);
   }
 
   /**
@@ -536,7 +535,7 @@ public com.google.protobuf.ByteString getPStringBytes() {
   }
 
   public static final int P_INT32_FIELD_NUMBER = 18;
-  private int pInt32_ = 0;
+  private int pInt32_;
 
   /**
    * optional int32 p_int32 = 18;
@@ -545,7 +544,7 @@ public com.google.protobuf.ByteString getPStringBytes() {
    */
   @java.lang.Override
   public boolean hasPInt32() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return ((bitField0_ & 0x00000002) != 0);
   }
 
   /**
@@ -559,7 +558,7 @@ public int getPInt32() {
   }
 
   public static final int P_DOUBLE_FIELD_NUMBER = 19;
-  private double pDouble_ = 0D;
+  private double pDouble_;
 
   /**
    * optional double p_double = 19;
@@ -568,7 +567,7 @@ public int getPInt32() {
    */
   @java.lang.Override
   public boolean hasPDouble() {
-    return ((bitField0_ & 0x00000008) != 0);
+    return ((bitField0_ & 0x00000004) != 0);
   }
 
   /**
@@ -582,7 +581,7 @@ public double getPDouble() {
   }
 
   public static final int P_BOOL_FIELD_NUMBER = 20;
-  private boolean pBool_ = false;
+  private boolean pBool_;
 
   /**
    * optional bool p_bool = 20;
@@ -591,7 +590,7 @@ public double getPDouble() {
    */
   @java.lang.Override
   public boolean hasPBool() {
-    return ((bitField0_ & 0x00000010) != 0);
+    return ((bitField0_ & 0x00000008) != 0);
   }
 
   /**
@@ -605,7 +604,7 @@ public boolean getPBool() {
   }
 
   public static final int P_KINGDOM_FIELD_NUMBER = 23;
-  private int pKingdom_ = 0;
+  private int pKingdom_;
 
   /**
    * optional .google.showcase.v1beta1.ComplianceData.LifeKingdom p_kingdom = 23;
@@ -614,7 +613,7 @@ public boolean getPBool() {
    */
   @java.lang.Override
   public boolean hasPKingdom() {
-    return ((bitField0_ & 0x00000020) != 0);
+    return ((bitField0_ & 0x00000010) != 0);
   }
 
   /**
@@ -634,8 +633,9 @@ public int getPKingdomValue() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.ComplianceData.LifeKingdom getPKingdom() {
+    @SuppressWarnings("deprecation")
     com.google.showcase.v1beta1.ComplianceData.LifeKingdom result =
-        com.google.showcase.v1beta1.ComplianceData.LifeKingdom.forNumber(pKingdom_);
+        com.google.showcase.v1beta1.ComplianceData.LifeKingdom.valueOf(pKingdom_);
     return result == null
         ? com.google.showcase.v1beta1.ComplianceData.LifeKingdom.UNRECOGNIZED
         : result;
@@ -651,7 +651,7 @@ public com.google.showcase.v1beta1.ComplianceData.LifeKingdom getPKingdom() {
    */
   @java.lang.Override
   public boolean hasPChild() {
-    return ((bitField0_ & 0x00000040) != 0);
+    return ((bitField0_ & 0x00000020) != 0);
   }
 
   /**
@@ -733,22 +733,22 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!fBytes_.isEmpty()) {
       output.writeBytes(15, fBytes_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (fChild_ != null) {
       output.writeMessage(16, getFChild());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 17, pString_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeInt32(18, pInt32_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       output.writeDouble(19, pDouble_);
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       output.writeBool(20, pBool_);
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
+    if (((bitField0_ & 0x00000020) != 0)) {
       output.writeMessage(21, getPChild());
     }
     if (fKingdom_
@@ -756,7 +756,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
             .getNumber()) {
       output.writeEnum(22, fKingdom_);
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (((bitField0_ & 0x00000010) != 0)) {
       output.writeEnum(23, pKingdom_);
     }
     getUnknownFields().writeTo(output);
@@ -813,22 +813,22 @@ public int getSerializedSize() {
     if (!fBytes_.isEmpty()) {
       size += com.google.protobuf.CodedOutputStream.computeBytesSize(15, fBytes_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (fChild_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(16, getFChild());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(17, pString_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(18, pInt32_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeDoubleSize(19, pDouble_);
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(20, pBool_);
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
+    if (((bitField0_ & 0x00000020) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(21, getPChild());
     }
     if (fKingdom_
@@ -836,7 +836,7 @@ public int getSerializedSize() {
             .getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(22, fKingdom_);
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (((bitField0_ & 0x00000010) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(23, pKingdom_);
     }
     size += getUnknownFields().getSerializedSize();
@@ -1121,7 +1121,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
 
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getFChildFieldBuilder();
         getPChildFieldBuilder();
       }
     }
@@ -1129,38 +1128,60 @@ private void maybeForceBuilderInitialization() {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       fString_ = "";
+
       fInt32_ = 0;
+
       fSint32_ = 0;
+
       fSfixed32_ = 0;
+
       fUint32_ = 0;
+
       fFixed32_ = 0;
+
       fInt64_ = 0L;
+
       fSint64_ = 0L;
+
       fSfixed64_ = 0L;
+
       fUint64_ = 0L;
+
       fFixed64_ = 0L;
+
       fDouble_ = 0D;
+
       fFloat_ = 0F;
+
       fBool_ = false;
+
       fBytes_ = com.google.protobuf.ByteString.EMPTY;
+
       fKingdom_ = 0;
-      fChild_ = null;
-      if (fChildBuilder_ != null) {
-        fChildBuilder_.dispose();
+
+      if (fChildBuilder_ == null) {
+        fChild_ = null;
+      } else {
+        fChild_ = null;
         fChildBuilder_ = null;
       }
       pString_ = "";
+      bitField0_ = (bitField0_ & ~0x00000001);
       pInt32_ = 0;
+      bitField0_ = (bitField0_ & ~0x00000002);
       pDouble_ = 0D;
+      bitField0_ = (bitField0_ & ~0x00000004);
       pBool_ = false;
+      bitField0_ = (bitField0_ & ~0x00000008);
       pKingdom_ = 0;
-      pChild_ = null;
-      if (pChildBuilder_ != null) {
-        pChildBuilder_.dispose();
-        pChildBuilder_ = null;
+      bitField0_ = (bitField0_ & ~0x00000010);
+      if (pChildBuilder_ == null) {
+        pChild_ = null;
+      } else {
+        pChildBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000020);
       return this;
     }
 
@@ -1188,93 +1209,60 @@ public com.google.showcase.v1beta1.ComplianceData build() {
     public com.google.showcase.v1beta1.ComplianceData buildPartial() {
       com.google.showcase.v1beta1.ComplianceData result =
           new com.google.showcase.v1beta1.ComplianceData(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.ComplianceData result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.fString_ = fString_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.fInt32_ = fInt32_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.fSint32_ = fSint32_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.fSfixed32_ = fSfixed32_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.fUint32_ = fUint32_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.fFixed32_ = fFixed32_;
-      }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.fInt64_ = fInt64_;
-      }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.fSint64_ = fSint64_;
-      }
-      if (((from_bitField0_ & 0x00000100) != 0)) {
-        result.fSfixed64_ = fSfixed64_;
-      }
-      if (((from_bitField0_ & 0x00000200) != 0)) {
-        result.fUint64_ = fUint64_;
-      }
-      if (((from_bitField0_ & 0x00000400) != 0)) {
-        result.fFixed64_ = fFixed64_;
-      }
-      if (((from_bitField0_ & 0x00000800) != 0)) {
-        result.fDouble_ = fDouble_;
-      }
-      if (((from_bitField0_ & 0x00001000) != 0)) {
-        result.fFloat_ = fFloat_;
-      }
-      if (((from_bitField0_ & 0x00002000) != 0)) {
-        result.fBool_ = fBool_;
-      }
-      if (((from_bitField0_ & 0x00004000) != 0)) {
-        result.fBytes_ = fBytes_;
-      }
-      if (((from_bitField0_ & 0x00008000) != 0)) {
-        result.fKingdom_ = fKingdom_;
-      }
       int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00010000) != 0)) {
-        result.fChild_ = fChildBuilder_ == null ? fChild_ : fChildBuilder_.build();
+      result.fString_ = fString_;
+      result.fInt32_ = fInt32_;
+      result.fSint32_ = fSint32_;
+      result.fSfixed32_ = fSfixed32_;
+      result.fUint32_ = fUint32_;
+      result.fFixed32_ = fFixed32_;
+      result.fInt64_ = fInt64_;
+      result.fSint64_ = fSint64_;
+      result.fSfixed64_ = fSfixed64_;
+      result.fUint64_ = fUint64_;
+      result.fFixed64_ = fFixed64_;
+      result.fDouble_ = fDouble_;
+      result.fFloat_ = fFloat_;
+      result.fBool_ = fBool_;
+      result.fBytes_ = fBytes_;
+      result.fKingdom_ = fKingdom_;
+      if (fChildBuilder_ == null) {
+        result.fChild_ = fChild_;
+      } else {
+        result.fChild_ = fChildBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000001) != 0)) {
         to_bitField0_ |= 0x00000001;
       }
-      if (((from_bitField0_ & 0x00020000) != 0)) {
-        result.pString_ = pString_;
+      result.pString_ = pString_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pInt32_ = pInt32_;
         to_bitField0_ |= 0x00000002;
       }
-      if (((from_bitField0_ & 0x00040000) != 0)) {
-        result.pInt32_ = pInt32_;
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pDouble_ = pDouble_;
         to_bitField0_ |= 0x00000004;
       }
-      if (((from_bitField0_ & 0x00080000) != 0)) {
-        result.pDouble_ = pDouble_;
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.pBool_ = pBool_;
         to_bitField0_ |= 0x00000008;
       }
-      if (((from_bitField0_ & 0x00100000) != 0)) {
-        result.pBool_ = pBool_;
+      if (((from_bitField0_ & 0x00000010) != 0)) {
         to_bitField0_ |= 0x00000010;
       }
-      if (((from_bitField0_ & 0x00200000) != 0)) {
-        result.pKingdom_ = pKingdom_;
+      result.pKingdom_ = pKingdom_;
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        if (pChildBuilder_ == null) {
+          result.pChild_ = pChild_;
+        } else {
+          result.pChild_ = pChildBuilder_.build();
+        }
         to_bitField0_ |= 0x00000020;
       }
-      if (((from_bitField0_ & 0x00400000) != 0)) {
-        result.pChild_ = pChildBuilder_ == null ? pChild_ : pChildBuilder_.build();
-        to_bitField0_ |= 0x00000040;
-      }
-      result.bitField0_ |= to_bitField0_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1324,7 +1312,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ComplianceData other) {
       if (other == com.google.showcase.v1beta1.ComplianceData.getDefaultInstance()) return this;
       if (!other.getFString().isEmpty()) {
         fString_ = other.fString_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getFInt32() != 0) {
@@ -1376,8 +1363,8 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ComplianceData other) {
         mergeFChild(other.getFChild());
       }
       if (other.hasPString()) {
+        bitField0_ |= 0x00000001;
         pString_ = other.pString_;
-        bitField0_ |= 0x00020000;
         onChanged();
       }
       if (other.hasPInt32()) {
@@ -1424,139 +1411,139 @@ public Builder mergeFrom(
             case 10:
               {
                 fString_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 fInt32_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 24:
               {
                 fSint32_ = input.readSInt32();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 37:
               {
                 fSfixed32_ = input.readSFixed32();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 37
             case 40:
               {
                 fUint32_ = input.readUInt32();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 40
             case 53:
               {
                 fFixed32_ = input.readFixed32();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 53
             case 56:
               {
                 fInt64_ = input.readInt64();
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 56
             case 64:
               {
                 fSint64_ = input.readSInt64();
-                bitField0_ |= 0x00000080;
+
                 break;
               } // case 64
             case 73:
               {
                 fSfixed64_ = input.readSFixed64();
-                bitField0_ |= 0x00000100;
+
                 break;
               } // case 73
             case 80:
               {
                 fUint64_ = input.readUInt64();
-                bitField0_ |= 0x00000200;
+
                 break;
               } // case 80
             case 89:
               {
                 fFixed64_ = input.readFixed64();
-                bitField0_ |= 0x00000400;
+
                 break;
               } // case 89
             case 97:
               {
                 fDouble_ = input.readDouble();
-                bitField0_ |= 0x00000800;
+
                 break;
               } // case 97
             case 109:
               {
                 fFloat_ = input.readFloat();
-                bitField0_ |= 0x00001000;
+
                 break;
               } // case 109
             case 112:
               {
                 fBool_ = input.readBool();
-                bitField0_ |= 0x00002000;
+
                 break;
               } // case 112
             case 122:
               {
                 fBytes_ = input.readBytes();
-                bitField0_ |= 0x00004000;
+
                 break;
               } // case 122
             case 130:
               {
                 input.readMessage(getFChildFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00010000;
+
                 break;
               } // case 130
             case 138:
               {
                 pString_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00020000;
+                bitField0_ |= 0x00000001;
                 break;
               } // case 138
             case 144:
               {
                 pInt32_ = input.readInt32();
-                bitField0_ |= 0x00040000;
+                bitField0_ |= 0x00000002;
                 break;
               } // case 144
             case 153:
               {
                 pDouble_ = input.readDouble();
-                bitField0_ |= 0x00080000;
+                bitField0_ |= 0x00000004;
                 break;
               } // case 153
             case 160:
               {
                 pBool_ = input.readBool();
-                bitField0_ |= 0x00100000;
+                bitField0_ |= 0x00000008;
                 break;
               } // case 160
             case 170:
               {
                 input.readMessage(getPChildFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00400000;
+                bitField0_ |= 0x00000020;
                 break;
               } // case 170
             case 176:
               {
                 fKingdom_ = input.readEnum();
-                bitField0_ |= 0x00008000;
+
                 break;
               } // case 176
             case 184:
               {
                 pKingdom_ = input.readEnum();
-                bitField0_ |= 0x00200000;
+                bitField0_ |= 0x00000010;
                 break;
               } // case 184
             default:
@@ -1624,8 +1611,8 @@ public Builder setFString(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       fString_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1636,8 +1623,8 @@ public Builder setFString(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFString() {
+
       fString_ = getDefaultInstance().getFString();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1653,8 +1640,8 @@ public Builder setFStringBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       fString_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1680,7 +1667,6 @@ public int getFInt32() {
     public Builder setFInt32(int value) {
 
       fInt32_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1691,7 +1677,7 @@ public Builder setFInt32(int value) {
      * @return This builder for chaining.
      */
     public Builder clearFInt32() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       fInt32_ = 0;
       onChanged();
       return this;
@@ -1718,7 +1704,6 @@ public int getFSint32() {
     public Builder setFSint32(int value) {
 
       fSint32_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1729,7 +1714,7 @@ public Builder setFSint32(int value) {
      * @return This builder for chaining.
      */
     public Builder clearFSint32() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       fSint32_ = 0;
       onChanged();
       return this;
@@ -1756,7 +1741,6 @@ public int getFSfixed32() {
     public Builder setFSfixed32(int value) {
 
       fSfixed32_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1767,7 +1751,7 @@ public Builder setFSfixed32(int value) {
      * @return This builder for chaining.
      */
     public Builder clearFSfixed32() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       fSfixed32_ = 0;
       onChanged();
       return this;
@@ -1794,7 +1778,6 @@ public int getFUint32() {
     public Builder setFUint32(int value) {
 
       fUint32_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1805,7 +1788,7 @@ public Builder setFUint32(int value) {
      * @return This builder for chaining.
      */
     public Builder clearFUint32() {
-      bitField0_ = (bitField0_ & ~0x00000010);
+
       fUint32_ = 0;
       onChanged();
       return this;
@@ -1832,7 +1815,6 @@ public int getFFixed32() {
     public Builder setFFixed32(int value) {
 
       fFixed32_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1843,7 +1825,7 @@ public Builder setFFixed32(int value) {
      * @return This builder for chaining.
      */
     public Builder clearFFixed32() {
-      bitField0_ = (bitField0_ & ~0x00000020);
+
       fFixed32_ = 0;
       onChanged();
       return this;
@@ -1870,7 +1852,6 @@ public long getFInt64() {
     public Builder setFInt64(long value) {
 
       fInt64_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1881,7 +1862,7 @@ public Builder setFInt64(long value) {
      * @return This builder for chaining.
      */
     public Builder clearFInt64() {
-      bitField0_ = (bitField0_ & ~0x00000040);
+
       fInt64_ = 0L;
       onChanged();
       return this;
@@ -1908,7 +1889,6 @@ public long getFSint64() {
     public Builder setFSint64(long value) {
 
       fSint64_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -1919,7 +1899,7 @@ public Builder setFSint64(long value) {
      * @return This builder for chaining.
      */
     public Builder clearFSint64() {
-      bitField0_ = (bitField0_ & ~0x00000080);
+
       fSint64_ = 0L;
       onChanged();
       return this;
@@ -1946,7 +1926,6 @@ public long getFSfixed64() {
     public Builder setFSfixed64(long value) {
 
       fSfixed64_ = value;
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -1957,7 +1936,7 @@ public Builder setFSfixed64(long value) {
      * @return This builder for chaining.
      */
     public Builder clearFSfixed64() {
-      bitField0_ = (bitField0_ & ~0x00000100);
+
       fSfixed64_ = 0L;
       onChanged();
       return this;
@@ -1984,7 +1963,6 @@ public long getFUint64() {
     public Builder setFUint64(long value) {
 
       fUint64_ = value;
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -1995,7 +1973,7 @@ public Builder setFUint64(long value) {
      * @return This builder for chaining.
      */
     public Builder clearFUint64() {
-      bitField0_ = (bitField0_ & ~0x00000200);
+
       fUint64_ = 0L;
       onChanged();
       return this;
@@ -2022,7 +2000,6 @@ public long getFFixed64() {
     public Builder setFFixed64(long value) {
 
       fFixed64_ = value;
-      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -2033,7 +2010,7 @@ public Builder setFFixed64(long value) {
      * @return This builder for chaining.
      */
     public Builder clearFFixed64() {
-      bitField0_ = (bitField0_ & ~0x00000400);
+
       fFixed64_ = 0L;
       onChanged();
       return this;
@@ -2060,7 +2037,6 @@ public double getFDouble() {
     public Builder setFDouble(double value) {
 
       fDouble_ = value;
-      bitField0_ |= 0x00000800;
       onChanged();
       return this;
     }
@@ -2071,7 +2047,7 @@ public Builder setFDouble(double value) {
      * @return This builder for chaining.
      */
     public Builder clearFDouble() {
-      bitField0_ = (bitField0_ & ~0x00000800);
+
       fDouble_ = 0D;
       onChanged();
       return this;
@@ -2098,7 +2074,6 @@ public float getFFloat() {
     public Builder setFFloat(float value) {
 
       fFloat_ = value;
-      bitField0_ |= 0x00001000;
       onChanged();
       return this;
     }
@@ -2109,7 +2084,7 @@ public Builder setFFloat(float value) {
      * @return This builder for chaining.
      */
     public Builder clearFFloat() {
-      bitField0_ = (bitField0_ & ~0x00001000);
+
       fFloat_ = 0F;
       onChanged();
       return this;
@@ -2136,7 +2111,6 @@ public boolean getFBool() {
     public Builder setFBool(boolean value) {
 
       fBool_ = value;
-      bitField0_ |= 0x00002000;
       onChanged();
       return this;
     }
@@ -2147,7 +2121,7 @@ public Builder setFBool(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearFBool() {
-      bitField0_ = (bitField0_ & ~0x00002000);
+
       fBool_ = false;
       onChanged();
       return this;
@@ -2175,8 +2149,8 @@ public Builder setFBytes(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       fBytes_ = value;
-      bitField0_ |= 0x00004000;
       onChanged();
       return this;
     }
@@ -2187,7 +2161,7 @@ public Builder setFBytes(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearFBytes() {
-      bitField0_ = (bitField0_ & ~0x00004000);
+
       fBytes_ = getDefaultInstance().getFBytes();
       onChanged();
       return this;
@@ -2212,8 +2186,8 @@ public int getFKingdomValue() {
      * @return This builder for chaining.
      */
     public Builder setFKingdomValue(int value) {
+
       fKingdom_ = value;
-      bitField0_ |= 0x00008000;
       onChanged();
       return this;
     }
@@ -2225,8 +2199,9 @@ public Builder setFKingdomValue(int value) {
      */
     @java.lang.Override
     public com.google.showcase.v1beta1.ComplianceData.LifeKingdom getFKingdom() {
+      @SuppressWarnings("deprecation")
       com.google.showcase.v1beta1.ComplianceData.LifeKingdom result =
-          com.google.showcase.v1beta1.ComplianceData.LifeKingdom.forNumber(fKingdom_);
+          com.google.showcase.v1beta1.ComplianceData.LifeKingdom.valueOf(fKingdom_);
       return result == null
           ? com.google.showcase.v1beta1.ComplianceData.LifeKingdom.UNRECOGNIZED
           : result;
@@ -2242,7 +2217,7 @@ public Builder setFKingdom(com.google.showcase.v1beta1.ComplianceData.LifeKingdo
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00008000;
+
       fKingdom_ = value.getNumber();
       onChanged();
       return this;
@@ -2254,7 +2229,7 @@ public Builder setFKingdom(com.google.showcase.v1beta1.ComplianceData.LifeKingdo
      * @return This builder for chaining.
      */
     public Builder clearFKingdom() {
-      bitField0_ = (bitField0_ & ~0x00008000);
+
       fKingdom_ = 0;
       onChanged();
       return this;
@@ -2273,7 +2248,7 @@ public Builder clearFKingdom() {
      * @return Whether the fChild field is set.
      */
     public boolean hasFChild() {
-      return ((bitField0_ & 0x00010000) != 0);
+      return fChildBuilder_ != null || fChild_ != null;
     }
 
     /**
@@ -2298,11 +2273,11 @@ public Builder setFChild(com.google.showcase.v1beta1.ComplianceDataChild value)
           throw new NullPointerException();
         }
         fChild_ = value;
+        onChanged();
       } else {
         fChildBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00010000;
-      onChanged();
+
       return this;
     }
 
@@ -2311,49 +2286,49 @@ public Builder setFChild(
         com.google.showcase.v1beta1.ComplianceDataChild.Builder builderForValue) {
       if (fChildBuilder_ == null) {
         fChild_ = builderForValue.build();
+        onChanged();
       } else {
         fChildBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00010000;
-      onChanged();
+
       return this;
     }
 
     /** .google.showcase.v1beta1.ComplianceDataChild f_child = 16; */
     public Builder mergeFChild(com.google.showcase.v1beta1.ComplianceDataChild value) {
       if (fChildBuilder_ == null) {
-        if (((bitField0_ & 0x00010000) != 0)
-            && fChild_ != null
-            && fChild_ != com.google.showcase.v1beta1.ComplianceDataChild.getDefaultInstance()) {
-          getFChildBuilder().mergeFrom(value);
+        if (fChild_ != null) {
+          fChild_ =
+              com.google.showcase.v1beta1.ComplianceDataChild.newBuilder(fChild_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           fChild_ = value;
         }
+        onChanged();
       } else {
         fChildBuilder_.mergeFrom(value);
       }
-      if (fChild_ != null) {
-        bitField0_ |= 0x00010000;
-        onChanged();
-      }
+
       return this;
     }
 
     /** .google.showcase.v1beta1.ComplianceDataChild f_child = 16; */
     public Builder clearFChild() {
-      bitField0_ = (bitField0_ & ~0x00010000);
-      fChild_ = null;
-      if (fChildBuilder_ != null) {
-        fChildBuilder_.dispose();
+      if (fChildBuilder_ == null) {
+        fChild_ = null;
+        onChanged();
+      } else {
+        fChild_ = null;
         fChildBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
     /** .google.showcase.v1beta1.ComplianceDataChild f_child = 16; */
     public com.google.showcase.v1beta1.ComplianceDataChild.Builder getFChildBuilder() {
-      bitField0_ |= 0x00010000;
+
       onChanged();
       return getFChildFieldBuilder().getBuilder();
     }
@@ -2395,7 +2370,7 @@ public com.google.showcase.v1beta1.ComplianceDataChildOrBuilder getFChildOrBuild
      * @return Whether the pString field is set.
      */
     public boolean hasPString() {
-      return ((bitField0_ & 0x00020000) != 0);
+      return ((bitField0_ & 0x00000001) != 0);
     }
 
     /**
@@ -2442,8 +2417,8 @@ public Builder setPString(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+      bitField0_ |= 0x00000001;
       pString_ = value;
-      bitField0_ |= 0x00020000;
       onChanged();
       return this;
     }
@@ -2454,8 +2429,8 @@ public Builder setPString(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPString() {
+      bitField0_ = (bitField0_ & ~0x00000001);
       pString_ = getDefaultInstance().getPString();
-      bitField0_ = (bitField0_ & ~0x00020000);
       onChanged();
       return this;
     }
@@ -2471,8 +2446,8 @@ public Builder setPStringBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+      bitField0_ |= 0x00000001;
       pString_ = value;
-      bitField0_ |= 0x00020000;
       onChanged();
       return this;
     }
@@ -2486,7 +2461,7 @@ public Builder setPStringBytes(com.google.protobuf.ByteString value) {
      */
     @java.lang.Override
     public boolean hasPInt32() {
-      return ((bitField0_ & 0x00040000) != 0);
+      return ((bitField0_ & 0x00000002) != 0);
     }
 
     /**
@@ -2506,9 +2481,8 @@ public int getPInt32() {
      * @return This builder for chaining.
      */
     public Builder setPInt32(int value) {
-
+      bitField0_ |= 0x00000002;
       pInt32_ = value;
-      bitField0_ |= 0x00040000;
       onChanged();
       return this;
     }
@@ -2519,7 +2493,7 @@ public Builder setPInt32(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPInt32() {
-      bitField0_ = (bitField0_ & ~0x00040000);
+      bitField0_ = (bitField0_ & ~0x00000002);
       pInt32_ = 0;
       onChanged();
       return this;
@@ -2534,7 +2508,7 @@ public Builder clearPInt32() {
      */
     @java.lang.Override
     public boolean hasPDouble() {
-      return ((bitField0_ & 0x00080000) != 0);
+      return ((bitField0_ & 0x00000004) != 0);
     }
 
     /**
@@ -2554,9 +2528,8 @@ public double getPDouble() {
      * @return This builder for chaining.
      */
     public Builder setPDouble(double value) {
-
+      bitField0_ |= 0x00000004;
       pDouble_ = value;
-      bitField0_ |= 0x00080000;
       onChanged();
       return this;
     }
@@ -2567,7 +2540,7 @@ public Builder setPDouble(double value) {
      * @return This builder for chaining.
      */
     public Builder clearPDouble() {
-      bitField0_ = (bitField0_ & ~0x00080000);
+      bitField0_ = (bitField0_ & ~0x00000004);
       pDouble_ = 0D;
       onChanged();
       return this;
@@ -2582,7 +2555,7 @@ public Builder clearPDouble() {
      */
     @java.lang.Override
     public boolean hasPBool() {
-      return ((bitField0_ & 0x00100000) != 0);
+      return ((bitField0_ & 0x00000008) != 0);
     }
 
     /**
@@ -2602,9 +2575,8 @@ public boolean getPBool() {
      * @return This builder for chaining.
      */
     public Builder setPBool(boolean value) {
-
+      bitField0_ |= 0x00000008;
       pBool_ = value;
-      bitField0_ |= 0x00100000;
       onChanged();
       return this;
     }
@@ -2615,7 +2587,7 @@ public Builder setPBool(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearPBool() {
-      bitField0_ = (bitField0_ & ~0x00100000);
+      bitField0_ = (bitField0_ & ~0x00000008);
       pBool_ = false;
       onChanged();
       return this;
@@ -2630,7 +2602,7 @@ public Builder clearPBool() {
      */
     @java.lang.Override
     public boolean hasPKingdom() {
-      return ((bitField0_ & 0x00200000) != 0);
+      return ((bitField0_ & 0x00000010) != 0);
     }
 
     /**
@@ -2650,8 +2622,8 @@ public int getPKingdomValue() {
      * @return This builder for chaining.
      */
     public Builder setPKingdomValue(int value) {
+      bitField0_ |= 0x00000010;
       pKingdom_ = value;
-      bitField0_ |= 0x00200000;
       onChanged();
       return this;
     }
@@ -2663,8 +2635,9 @@ public Builder setPKingdomValue(int value) {
      */
     @java.lang.Override
     public com.google.showcase.v1beta1.ComplianceData.LifeKingdom getPKingdom() {
+      @SuppressWarnings("deprecation")
       com.google.showcase.v1beta1.ComplianceData.LifeKingdom result =
-          com.google.showcase.v1beta1.ComplianceData.LifeKingdom.forNumber(pKingdom_);
+          com.google.showcase.v1beta1.ComplianceData.LifeKingdom.valueOf(pKingdom_);
       return result == null
           ? com.google.showcase.v1beta1.ComplianceData.LifeKingdom.UNRECOGNIZED
           : result;
@@ -2680,7 +2653,7 @@ public Builder setPKingdom(com.google.showcase.v1beta1.ComplianceData.LifeKingdo
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00200000;
+      bitField0_ |= 0x00000010;
       pKingdom_ = value.getNumber();
       onChanged();
       return this;
@@ -2692,7 +2665,7 @@ public Builder setPKingdom(com.google.showcase.v1beta1.ComplianceData.LifeKingdo
      * @return This builder for chaining.
      */
     public Builder clearPKingdom() {
-      bitField0_ = (bitField0_ & ~0x00200000);
+      bitField0_ = (bitField0_ & ~0x00000010);
       pKingdom_ = 0;
       onChanged();
       return this;
@@ -2711,7 +2684,7 @@ public Builder clearPKingdom() {
      * @return Whether the pChild field is set.
      */
     public boolean hasPChild() {
-      return ((bitField0_ & 0x00400000) != 0);
+      return ((bitField0_ & 0x00000020) != 0);
     }
 
     /**
@@ -2736,11 +2709,11 @@ public Builder setPChild(com.google.showcase.v1beta1.ComplianceDataChild value)
           throw new NullPointerException();
         }
         pChild_ = value;
+        onChanged();
       } else {
         pChildBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00400000;
-      onChanged();
+      bitField0_ |= 0x00000020;
       return this;
     }
 
@@ -2749,49 +2722,50 @@ public Builder setPChild(
         com.google.showcase.v1beta1.ComplianceDataChild.Builder builderForValue) {
       if (pChildBuilder_ == null) {
         pChild_ = builderForValue.build();
+        onChanged();
       } else {
         pChildBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00400000;
-      onChanged();
+      bitField0_ |= 0x00000020;
       return this;
     }
 
     /** optional .google.showcase.v1beta1.ComplianceDataChild p_child = 21; */
     public Builder mergePChild(com.google.showcase.v1beta1.ComplianceDataChild value) {
       if (pChildBuilder_ == null) {
-        if (((bitField0_ & 0x00400000) != 0)
+        if (((bitField0_ & 0x00000020) != 0)
             && pChild_ != null
             && pChild_ != com.google.showcase.v1beta1.ComplianceDataChild.getDefaultInstance()) {
-          getPChildBuilder().mergeFrom(value);
+          pChild_ =
+              com.google.showcase.v1beta1.ComplianceDataChild.newBuilder(pChild_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           pChild_ = value;
         }
+        onChanged();
       } else {
         pChildBuilder_.mergeFrom(value);
       }
-      if (pChild_ != null) {
-        bitField0_ |= 0x00400000;
-        onChanged();
-      }
+      bitField0_ |= 0x00000020;
       return this;
     }
 
     /** optional .google.showcase.v1beta1.ComplianceDataChild p_child = 21; */
     public Builder clearPChild() {
-      bitField0_ = (bitField0_ & ~0x00400000);
-      pChild_ = null;
-      if (pChildBuilder_ != null) {
-        pChildBuilder_.dispose();
-        pChildBuilder_ = null;
+      if (pChildBuilder_ == null) {
+        pChild_ = null;
+        onChanged();
+      } else {
+        pChildBuilder_.clear();
       }
-      onChanged();
+      bitField0_ = (bitField0_ & ~0x00000020);
       return this;
     }
 
     /** optional .google.showcase.v1beta1.ComplianceDataChild p_child = 21; */
     public com.google.showcase.v1beta1.ComplianceDataChild.Builder getPChildBuilder() {
-      bitField0_ |= 0x00400000;
+      bitField0_ |= 0x00000020;
       onChanged();
       return getPChildFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChild.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChild.java
index 8b910818b5..654e4c2715 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChild.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChild.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.ComplianceDataChild} */
@@ -44,6 +43,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ComplianceDataChild();
   }
 
+  @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.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_ComplianceDataChild_descriptor;
@@ -61,9 +65,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   private int bitField0_;
   public static final int F_STRING_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object fString_ = "";
+  private volatile java.lang.Object fString_;
 
   /**
    * string f_string = 1;
@@ -102,7 +104,7 @@ public com.google.protobuf.ByteString getFStringBytes() {
   }
 
   public static final int F_FLOAT_FIELD_NUMBER = 2;
-  private float fFloat_ = 0F;
+  private float fFloat_;
 
   /**
    * float f_float = 2;
@@ -115,7 +117,7 @@ public float getFFloat() {
   }
 
   public static final int F_DOUBLE_FIELD_NUMBER = 3;
-  private double fDouble_ = 0D;
+  private double fDouble_;
 
   /**
    * double f_double = 3;
@@ -128,7 +130,7 @@ public double getFDouble() {
   }
 
   public static final int F_BOOL_FIELD_NUMBER = 4;
-  private boolean fBool_ = false;
+  private boolean fBool_;
 
   /**
    * bool f_bool = 4;
@@ -141,7 +143,7 @@ public boolean getFBool() {
   }
 
   public static final int F_CONTINENT_FIELD_NUMBER = 11;
-  private int fContinent_ = 0;
+  private int fContinent_;
 
   /**
    * .google.showcase.v1beta1.Continent f_continent = 11;
@@ -160,8 +162,9 @@ public int getFContinentValue() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.Continent getFContinent() {
+    @SuppressWarnings("deprecation")
     com.google.showcase.v1beta1.Continent result =
-        com.google.showcase.v1beta1.Continent.forNumber(fContinent_);
+        com.google.showcase.v1beta1.Continent.valueOf(fContinent_);
     return result == null ? com.google.showcase.v1beta1.Continent.UNRECOGNIZED : result;
   }
 
@@ -175,7 +178,7 @@ public com.google.showcase.v1beta1.Continent getFContinent() {
    */
   @java.lang.Override
   public boolean hasFChild() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return fChild_ != null;
   }
 
   /**
@@ -193,15 +196,11 @@ public com.google.showcase.v1beta1.ComplianceDataGrandchild getFChild() {
   /** .google.showcase.v1beta1.ComplianceDataGrandchild f_child = 5; */
   @java.lang.Override
   public com.google.showcase.v1beta1.ComplianceDataGrandchildOrBuilder getFChildOrBuilder() {
-    return fChild_ == null
-        ? com.google.showcase.v1beta1.ComplianceDataGrandchild.getDefaultInstance()
-        : fChild_;
+    return getFChild();
   }
 
   public static final int P_STRING_FIELD_NUMBER = 6;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pString_ = "";
+  private volatile java.lang.Object pString_;
 
   /**
    * optional string p_string = 6;
@@ -210,7 +209,7 @@ public com.google.showcase.v1beta1.ComplianceDataGrandchildOrBuilder getFChildOr
    */
   @java.lang.Override
   public boolean hasPString() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return ((bitField0_ & 0x00000001) != 0);
   }
 
   /**
@@ -250,7 +249,7 @@ public com.google.protobuf.ByteString getPStringBytes() {
   }
 
   public static final int P_FLOAT_FIELD_NUMBER = 7;
-  private float pFloat_ = 0F;
+  private float pFloat_;
 
   /**
    * optional float p_float = 7;
@@ -259,7 +258,7 @@ public com.google.protobuf.ByteString getPStringBytes() {
    */
   @java.lang.Override
   public boolean hasPFloat() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return ((bitField0_ & 0x00000002) != 0);
   }
 
   /**
@@ -273,7 +272,7 @@ public float getPFloat() {
   }
 
   public static final int P_DOUBLE_FIELD_NUMBER = 8;
-  private double pDouble_ = 0D;
+  private double pDouble_;
 
   /**
    * optional double p_double = 8;
@@ -282,7 +281,7 @@ public float getPFloat() {
    */
   @java.lang.Override
   public boolean hasPDouble() {
-    return ((bitField0_ & 0x00000008) != 0);
+    return ((bitField0_ & 0x00000004) != 0);
   }
 
   /**
@@ -296,7 +295,7 @@ public double getPDouble() {
   }
 
   public static final int P_BOOL_FIELD_NUMBER = 9;
-  private boolean pBool_ = false;
+  private boolean pBool_;
 
   /**
    * optional bool p_bool = 9;
@@ -305,7 +304,7 @@ public double getPDouble() {
    */
   @java.lang.Override
   public boolean hasPBool() {
-    return ((bitField0_ & 0x00000010) != 0);
+    return ((bitField0_ & 0x00000008) != 0);
   }
 
   /**
@@ -319,7 +318,7 @@ public boolean getPBool() {
   }
 
   public static final int P_CONTINENT_FIELD_NUMBER = 12;
-  private int pContinent_ = 0;
+  private int pContinent_;
 
   /**
    * .google.showcase.v1beta1.Continent p_continent = 12;
@@ -338,8 +337,9 @@ public int getPContinentValue() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.Continent getPContinent() {
+    @SuppressWarnings("deprecation")
     com.google.showcase.v1beta1.Continent result =
-        com.google.showcase.v1beta1.Continent.forNumber(pContinent_);
+        com.google.showcase.v1beta1.Continent.valueOf(pContinent_);
     return result == null ? com.google.showcase.v1beta1.Continent.UNRECOGNIZED : result;
   }
 
@@ -353,7 +353,7 @@ public com.google.showcase.v1beta1.Continent getPContinent() {
    */
   @java.lang.Override
   public boolean hasPChild() {
-    return ((bitField0_ & 0x00000020) != 0);
+    return ((bitField0_ & 0x00000010) != 0);
   }
 
   /**
@@ -402,22 +402,22 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (fBool_ != false) {
       output.writeBool(4, fBool_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (fChild_ != null) {
       output.writeMessage(5, getFChild());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 6, pString_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeFloat(7, pFloat_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       output.writeDouble(8, pDouble_);
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       output.writeBool(9, pBool_);
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (((bitField0_ & 0x00000010) != 0)) {
       output.writeMessage(10, getPChild());
     }
     if (fContinent_ != com.google.showcase.v1beta1.Continent.CONTINENT_UNSPECIFIED.getNumber()) {
@@ -447,22 +447,22 @@ public int getSerializedSize() {
     if (fBool_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(4, fBool_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (fChild_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getFChild());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, pString_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeFloatSize(7, pFloat_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeDoubleSize(8, pDouble_);
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(9, pBool_);
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (((bitField0_ & 0x00000010) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getPChild());
     }
     if (fContinent_ != com.google.showcase.v1beta1.Continent.CONTINENT_UNSPECIFIED.getNumber()) {
@@ -707,7 +707,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
 
     private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getFChildFieldBuilder();
         getPChildFieldBuilder();
       }
     }
@@ -715,27 +714,38 @@ private void maybeForceBuilderInitialization() {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       fString_ = "";
+
       fFloat_ = 0F;
+
       fDouble_ = 0D;
+
       fBool_ = false;
+
       fContinent_ = 0;
-      fChild_ = null;
-      if (fChildBuilder_ != null) {
-        fChildBuilder_.dispose();
+
+      if (fChildBuilder_ == null) {
+        fChild_ = null;
+      } else {
+        fChild_ = null;
         fChildBuilder_ = null;
       }
       pString_ = "";
+      bitField0_ = (bitField0_ & ~0x00000001);
       pFloat_ = 0F;
+      bitField0_ = (bitField0_ & ~0x00000002);
       pDouble_ = 0D;
+      bitField0_ = (bitField0_ & ~0x00000004);
       pBool_ = false;
+      bitField0_ = (bitField0_ & ~0x00000008);
       pContinent_ = 0;
-      pChild_ = null;
-      if (pChildBuilder_ != null) {
-        pChildBuilder_.dispose();
-        pChildBuilder_ = null;
+
+      if (pChildBuilder_ == null) {
+        pChild_ = null;
+      } else {
+        pChildBuilder_.clear();
       }
+      bitField0_ = (bitField0_ & ~0x00000010);
       return this;
     }
 
@@ -763,59 +773,46 @@ public com.google.showcase.v1beta1.ComplianceDataChild build() {
     public com.google.showcase.v1beta1.ComplianceDataChild buildPartial() {
       com.google.showcase.v1beta1.ComplianceDataChild result =
           new com.google.showcase.v1beta1.ComplianceDataChild(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.ComplianceDataChild result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.fString_ = fString_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.fFloat_ = fFloat_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.fDouble_ = fDouble_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.fBool_ = fBool_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.fContinent_ = fContinent_;
-      }
       int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.fChild_ = fChildBuilder_ == null ? fChild_ : fChildBuilder_.build();
+      result.fString_ = fString_;
+      result.fFloat_ = fFloat_;
+      result.fDouble_ = fDouble_;
+      result.fBool_ = fBool_;
+      result.fContinent_ = fContinent_;
+      if (fChildBuilder_ == null) {
+        result.fChild_ = fChild_;
+      } else {
+        result.fChild_ = fChildBuilder_.build();
+      }
+      if (((from_bitField0_ & 0x00000001) != 0)) {
         to_bitField0_ |= 0x00000001;
       }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.pString_ = pString_;
+      result.pString_ = pString_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.pFloat_ = pFloat_;
         to_bitField0_ |= 0x00000002;
       }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.pFloat_ = pFloat_;
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.pDouble_ = pDouble_;
         to_bitField0_ |= 0x00000004;
       }
-      if (((from_bitField0_ & 0x00000100) != 0)) {
-        result.pDouble_ = pDouble_;
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.pBool_ = pBool_;
         to_bitField0_ |= 0x00000008;
       }
-      if (((from_bitField0_ & 0x00000200) != 0)) {
-        result.pBool_ = pBool_;
+      result.pContinent_ = pContinent_;
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        if (pChildBuilder_ == null) {
+          result.pChild_ = pChild_;
+        } else {
+          result.pChild_ = pChildBuilder_.build();
+        }
         to_bitField0_ |= 0x00000010;
       }
-      if (((from_bitField0_ & 0x00000400) != 0)) {
-        result.pContinent_ = pContinent_;
-      }
-      if (((from_bitField0_ & 0x00000800) != 0)) {
-        result.pChild_ = pChildBuilder_ == null ? pChild_ : pChildBuilder_.build();
-        to_bitField0_ |= 0x00000020;
-      }
-      result.bitField0_ |= to_bitField0_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -866,7 +863,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ComplianceDataChild other)
         return this;
       if (!other.getFString().isEmpty()) {
         fString_ = other.fString_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getFFloat() != 0F) {
@@ -885,8 +881,8 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ComplianceDataChild other)
         mergeFChild(other.getFChild());
       }
       if (other.hasPString()) {
+        bitField0_ |= 0x00000001;
         pString_ = other.pString_;
-        bitField0_ |= 0x00000040;
         onChanged();
       }
       if (other.hasPFloat()) {
@@ -933,73 +929,73 @@ public Builder mergeFrom(
             case 10:
               {
                 fString_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 21:
               {
                 fFloat_ = input.readFloat();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 21
             case 25:
               {
                 fDouble_ = input.readDouble();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 25
             case 32:
               {
                 fBool_ = input.readBool();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 32
             case 42:
               {
                 input.readMessage(getFChildFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 42
             case 50:
               {
                 pString_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000040;
+                bitField0_ |= 0x00000001;
                 break;
               } // case 50
             case 61:
               {
                 pFloat_ = input.readFloat();
-                bitField0_ |= 0x00000080;
+                bitField0_ |= 0x00000002;
                 break;
               } // case 61
             case 65:
               {
                 pDouble_ = input.readDouble();
-                bitField0_ |= 0x00000100;
+                bitField0_ |= 0x00000004;
                 break;
               } // case 65
             case 72:
               {
                 pBool_ = input.readBool();
-                bitField0_ |= 0x00000200;
+                bitField0_ |= 0x00000008;
                 break;
               } // case 72
             case 82:
               {
                 input.readMessage(getPChildFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000800;
+                bitField0_ |= 0x00000010;
                 break;
               } // case 82
             case 88:
               {
                 fContinent_ = input.readEnum();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 88
             case 96:
               {
                 pContinent_ = input.readEnum();
-                bitField0_ |= 0x00000400;
+
                 break;
               } // case 96
             default:
@@ -1067,8 +1063,8 @@ public Builder setFString(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       fString_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1079,8 +1075,8 @@ public Builder setFString(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFString() {
+
       fString_ = getDefaultInstance().getFString();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1096,8 +1092,8 @@ public Builder setFStringBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       fString_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1123,7 +1119,6 @@ public float getFFloat() {
     public Builder setFFloat(float value) {
 
       fFloat_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1134,7 +1129,7 @@ public Builder setFFloat(float value) {
      * @return This builder for chaining.
      */
     public Builder clearFFloat() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       fFloat_ = 0F;
       onChanged();
       return this;
@@ -1161,7 +1156,6 @@ public double getFDouble() {
     public Builder setFDouble(double value) {
 
       fDouble_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1172,7 +1166,7 @@ public Builder setFDouble(double value) {
      * @return This builder for chaining.
      */
     public Builder clearFDouble() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       fDouble_ = 0D;
       onChanged();
       return this;
@@ -1199,7 +1193,6 @@ public boolean getFBool() {
     public Builder setFBool(boolean value) {
 
       fBool_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1210,7 +1203,7 @@ public Builder setFBool(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearFBool() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+
       fBool_ = false;
       onChanged();
       return this;
@@ -1235,8 +1228,8 @@ public int getFContinentValue() {
      * @return This builder for chaining.
      */
     public Builder setFContinentValue(int value) {
+
       fContinent_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1248,8 +1241,9 @@ public Builder setFContinentValue(int value) {
      */
     @java.lang.Override
     public com.google.showcase.v1beta1.Continent getFContinent() {
+      @SuppressWarnings("deprecation")
       com.google.showcase.v1beta1.Continent result =
-          com.google.showcase.v1beta1.Continent.forNumber(fContinent_);
+          com.google.showcase.v1beta1.Continent.valueOf(fContinent_);
       return result == null ? com.google.showcase.v1beta1.Continent.UNRECOGNIZED : result;
     }
 
@@ -1263,7 +1257,7 @@ public Builder setFContinent(com.google.showcase.v1beta1.Continent value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000010;
+
       fContinent_ = value.getNumber();
       onChanged();
       return this;
@@ -1275,7 +1269,7 @@ public Builder setFContinent(com.google.showcase.v1beta1.Continent value) {
      * @return This builder for chaining.
      */
     public Builder clearFContinent() {
-      bitField0_ = (bitField0_ & ~0x00000010);
+
       fContinent_ = 0;
       onChanged();
       return this;
@@ -1294,7 +1288,7 @@ public Builder clearFContinent() {
      * @return Whether the fChild field is set.
      */
     public boolean hasFChild() {
-      return ((bitField0_ & 0x00000020) != 0);
+      return fChildBuilder_ != null || fChild_ != null;
     }
 
     /**
@@ -1319,11 +1313,11 @@ public Builder setFChild(com.google.showcase.v1beta1.ComplianceDataGrandchild va
           throw new NullPointerException();
         }
         fChild_ = value;
+        onChanged();
       } else {
         fChildBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000020;
-      onChanged();
+
       return this;
     }
 
@@ -1332,50 +1326,49 @@ public Builder setFChild(
         com.google.showcase.v1beta1.ComplianceDataGrandchild.Builder builderForValue) {
       if (fChildBuilder_ == null) {
         fChild_ = builderForValue.build();
+        onChanged();
       } else {
         fChildBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000020;
-      onChanged();
+
       return this;
     }
 
     /** .google.showcase.v1beta1.ComplianceDataGrandchild f_child = 5; */
     public Builder mergeFChild(com.google.showcase.v1beta1.ComplianceDataGrandchild value) {
       if (fChildBuilder_ == null) {
-        if (((bitField0_ & 0x00000020) != 0)
-            && fChild_ != null
-            && fChild_
-                != com.google.showcase.v1beta1.ComplianceDataGrandchild.getDefaultInstance()) {
-          getFChildBuilder().mergeFrom(value);
+        if (fChild_ != null) {
+          fChild_ =
+              com.google.showcase.v1beta1.ComplianceDataGrandchild.newBuilder(fChild_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           fChild_ = value;
         }
+        onChanged();
       } else {
         fChildBuilder_.mergeFrom(value);
       }
-      if (fChild_ != null) {
-        bitField0_ |= 0x00000020;
-        onChanged();
-      }
+
       return this;
     }
 
     /** .google.showcase.v1beta1.ComplianceDataGrandchild f_child = 5; */
     public Builder clearFChild() {
-      bitField0_ = (bitField0_ & ~0x00000020);
-      fChild_ = null;
-      if (fChildBuilder_ != null) {
-        fChildBuilder_.dispose();
+      if (fChildBuilder_ == null) {
+        fChild_ = null;
+        onChanged();
+      } else {
+        fChild_ = null;
         fChildBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
     /** .google.showcase.v1beta1.ComplianceDataGrandchild f_child = 5; */
     public com.google.showcase.v1beta1.ComplianceDataGrandchild.Builder getFChildBuilder() {
-      bitField0_ |= 0x00000020;
+
       onChanged();
       return getFChildFieldBuilder().getBuilder();
     }
@@ -1417,7 +1410,7 @@ public com.google.showcase.v1beta1.ComplianceDataGrandchildOrBuilder getFChildOr
      * @return Whether the pString field is set.
      */
     public boolean hasPString() {
-      return ((bitField0_ & 0x00000040) != 0);
+      return ((bitField0_ & 0x00000001) != 0);
     }
 
     /**
@@ -1464,8 +1457,8 @@ public Builder setPString(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+      bitField0_ |= 0x00000001;
       pString_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1476,8 +1469,8 @@ public Builder setPString(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPString() {
+      bitField0_ = (bitField0_ & ~0x00000001);
       pString_ = getDefaultInstance().getPString();
-      bitField0_ = (bitField0_ & ~0x00000040);
       onChanged();
       return this;
     }
@@ -1493,8 +1486,8 @@ public Builder setPStringBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+      bitField0_ |= 0x00000001;
       pString_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1508,7 +1501,7 @@ public Builder setPStringBytes(com.google.protobuf.ByteString value) {
      */
     @java.lang.Override
     public boolean hasPFloat() {
-      return ((bitField0_ & 0x00000080) != 0);
+      return ((bitField0_ & 0x00000002) != 0);
     }
 
     /**
@@ -1528,9 +1521,8 @@ public float getPFloat() {
      * @return This builder for chaining.
      */
     public Builder setPFloat(float value) {
-
+      bitField0_ |= 0x00000002;
       pFloat_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -1541,7 +1533,7 @@ public Builder setPFloat(float value) {
      * @return This builder for chaining.
      */
     public Builder clearPFloat() {
-      bitField0_ = (bitField0_ & ~0x00000080);
+      bitField0_ = (bitField0_ & ~0x00000002);
       pFloat_ = 0F;
       onChanged();
       return this;
@@ -1556,7 +1548,7 @@ public Builder clearPFloat() {
      */
     @java.lang.Override
     public boolean hasPDouble() {
-      return ((bitField0_ & 0x00000100) != 0);
+      return ((bitField0_ & 0x00000004) != 0);
     }
 
     /**
@@ -1576,9 +1568,8 @@ public double getPDouble() {
      * @return This builder for chaining.
      */
     public Builder setPDouble(double value) {
-
+      bitField0_ |= 0x00000004;
       pDouble_ = value;
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -1589,7 +1580,7 @@ public Builder setPDouble(double value) {
      * @return This builder for chaining.
      */
     public Builder clearPDouble() {
-      bitField0_ = (bitField0_ & ~0x00000100);
+      bitField0_ = (bitField0_ & ~0x00000004);
       pDouble_ = 0D;
       onChanged();
       return this;
@@ -1604,7 +1595,7 @@ public Builder clearPDouble() {
      */
     @java.lang.Override
     public boolean hasPBool() {
-      return ((bitField0_ & 0x00000200) != 0);
+      return ((bitField0_ & 0x00000008) != 0);
     }
 
     /**
@@ -1624,9 +1615,8 @@ public boolean getPBool() {
      * @return This builder for chaining.
      */
     public Builder setPBool(boolean value) {
-
+      bitField0_ |= 0x00000008;
       pBool_ = value;
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -1637,7 +1627,7 @@ public Builder setPBool(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearPBool() {
-      bitField0_ = (bitField0_ & ~0x00000200);
+      bitField0_ = (bitField0_ & ~0x00000008);
       pBool_ = false;
       onChanged();
       return this;
@@ -1662,8 +1652,8 @@ public int getPContinentValue() {
      * @return This builder for chaining.
      */
     public Builder setPContinentValue(int value) {
+
       pContinent_ = value;
-      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -1675,8 +1665,9 @@ public Builder setPContinentValue(int value) {
      */
     @java.lang.Override
     public com.google.showcase.v1beta1.Continent getPContinent() {
+      @SuppressWarnings("deprecation")
       com.google.showcase.v1beta1.Continent result =
-          com.google.showcase.v1beta1.Continent.forNumber(pContinent_);
+          com.google.showcase.v1beta1.Continent.valueOf(pContinent_);
       return result == null ? com.google.showcase.v1beta1.Continent.UNRECOGNIZED : result;
     }
 
@@ -1690,7 +1681,7 @@ public Builder setPContinent(com.google.showcase.v1beta1.Continent value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000400;
+
       pContinent_ = value.getNumber();
       onChanged();
       return this;
@@ -1702,7 +1693,7 @@ public Builder setPContinent(com.google.showcase.v1beta1.Continent value) {
      * @return This builder for chaining.
      */
     public Builder clearPContinent() {
-      bitField0_ = (bitField0_ & ~0x00000400);
+
       pContinent_ = 0;
       onChanged();
       return this;
@@ -1721,7 +1712,7 @@ public Builder clearPContinent() {
      * @return Whether the pChild field is set.
      */
     public boolean hasPChild() {
-      return ((bitField0_ & 0x00000800) != 0);
+      return ((bitField0_ & 0x00000010) != 0);
     }
 
     /**
@@ -1746,11 +1737,11 @@ public Builder setPChild(com.google.showcase.v1beta1.ComplianceDataGrandchild va
           throw new NullPointerException();
         }
         pChild_ = value;
+        onChanged();
       } else {
         pChildBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000800;
-      onChanged();
+      bitField0_ |= 0x00000010;
       return this;
     }
 
@@ -1759,50 +1750,51 @@ public Builder setPChild(
         com.google.showcase.v1beta1.ComplianceDataGrandchild.Builder builderForValue) {
       if (pChildBuilder_ == null) {
         pChild_ = builderForValue.build();
+        onChanged();
       } else {
         pChildBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000800;
-      onChanged();
+      bitField0_ |= 0x00000010;
       return this;
     }
 
     /** optional .google.showcase.v1beta1.ComplianceDataGrandchild p_child = 10; */
     public Builder mergePChild(com.google.showcase.v1beta1.ComplianceDataGrandchild value) {
       if (pChildBuilder_ == null) {
-        if (((bitField0_ & 0x00000800) != 0)
+        if (((bitField0_ & 0x00000010) != 0)
             && pChild_ != null
             && pChild_
                 != com.google.showcase.v1beta1.ComplianceDataGrandchild.getDefaultInstance()) {
-          getPChildBuilder().mergeFrom(value);
+          pChild_ =
+              com.google.showcase.v1beta1.ComplianceDataGrandchild.newBuilder(pChild_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           pChild_ = value;
         }
+        onChanged();
       } else {
         pChildBuilder_.mergeFrom(value);
       }
-      if (pChild_ != null) {
-        bitField0_ |= 0x00000800;
-        onChanged();
-      }
+      bitField0_ |= 0x00000010;
       return this;
     }
 
     /** optional .google.showcase.v1beta1.ComplianceDataGrandchild p_child = 10; */
     public Builder clearPChild() {
-      bitField0_ = (bitField0_ & ~0x00000800);
-      pChild_ = null;
-      if (pChildBuilder_ != null) {
-        pChildBuilder_.dispose();
-        pChildBuilder_ = null;
+      if (pChildBuilder_ == null) {
+        pChild_ = null;
+        onChanged();
+      } else {
+        pChildBuilder_.clear();
       }
-      onChanged();
+      bitField0_ = (bitField0_ & ~0x00000010);
       return this;
     }
 
     /** optional .google.showcase.v1beta1.ComplianceDataGrandchild p_child = 10; */
     public com.google.showcase.v1beta1.ComplianceDataGrandchild.Builder getPChildBuilder() {
-      bitField0_ |= 0x00000800;
+      bitField0_ |= 0x00000010;
       onChanged();
       return getPChildFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChildOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChildOrBuilder.java
index c895edd6d2..d388a3776e 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChildOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChildOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ComplianceDataChildOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataGrandchild.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataGrandchild.java
index 8f55edf836..24aa964928 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataGrandchild.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataGrandchild.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.ComplianceDataGrandchild} */
@@ -41,6 +40,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ComplianceDataGrandchild();
   }
 
+  @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.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_ComplianceDataGrandchild_descriptor;
@@ -57,9 +61,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int F_STRING_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object fString_ = "";
+  private volatile java.lang.Object fString_;
 
   /**
    * string f_string = 1;
@@ -98,7 +100,7 @@ public com.google.protobuf.ByteString getFStringBytes() {
   }
 
   public static final int F_DOUBLE_FIELD_NUMBER = 2;
-  private double fDouble_ = 0D;
+  private double fDouble_;
 
   /**
    * double f_double = 2;
@@ -111,7 +113,7 @@ public double getFDouble() {
   }
 
   public static final int F_BOOL_FIELD_NUMBER = 3;
-  private boolean fBool_ = false;
+  private boolean fBool_;
 
   /**
    * bool f_bool = 3;
@@ -335,10 +337,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       fString_ = "";
+
       fDouble_ = 0D;
+
       fBool_ = false;
+
       return this;
     }
 
@@ -366,26 +370,13 @@ public com.google.showcase.v1beta1.ComplianceDataGrandchild build() {
     public com.google.showcase.v1beta1.ComplianceDataGrandchild buildPartial() {
       com.google.showcase.v1beta1.ComplianceDataGrandchild result =
           new com.google.showcase.v1beta1.ComplianceDataGrandchild(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.fString_ = fString_;
+      result.fDouble_ = fDouble_;
+      result.fBool_ = fBool_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.ComplianceDataGrandchild result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.fString_ = fString_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.fDouble_ = fDouble_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.fBool_ = fBool_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -434,7 +425,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ComplianceDataGrandchild ot
         return this;
       if (!other.getFString().isEmpty()) {
         fString_ = other.fString_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getFDouble() != 0D) {
@@ -472,19 +462,19 @@ public Builder mergeFrom(
             case 10:
               {
                 fString_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 17:
               {
                 fDouble_ = input.readDouble();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 17
             case 24:
               {
                 fBool_ = input.readBool();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             default:
@@ -504,8 +494,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object fString_ = "";
 
     /**
@@ -552,8 +540,8 @@ public Builder setFString(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       fString_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -564,8 +552,8 @@ public Builder setFString(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearFString() {
+
       fString_ = getDefaultInstance().getFString();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -581,8 +569,8 @@ public Builder setFStringBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       fString_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -608,7 +596,6 @@ public double getFDouble() {
     public Builder setFDouble(double value) {
 
       fDouble_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -619,7 +606,7 @@ public Builder setFDouble(double value) {
      * @return This builder for chaining.
      */
     public Builder clearFDouble() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       fDouble_ = 0D;
       onChanged();
       return this;
@@ -646,7 +633,6 @@ public boolean getFBool() {
     public Builder setFBool(boolean value) {
 
       fBool_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -657,7 +643,7 @@ public Builder setFBool(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearFBool() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       fBool_ = false;
       onChanged();
       return this;
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataGrandchildOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataGrandchildOrBuilder.java
index 724101ad4a..e37e4e9f13 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataGrandchildOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataGrandchildOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ComplianceDataGrandchildOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataOrBuilder.java
index 9836733ed5..4b0b34b205 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ComplianceDataOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGroup.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGroup.java
index 80acba6175..44722994fb 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGroup.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGroup.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -43,7 +42,7 @@ private ComplianceGroup(com.google.protobuf.GeneratedMessageV3.Builder builde
 
   private ComplianceGroup() {
     name_ = "";
-    rpcs_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    rpcs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     requests_ = java.util.Collections.emptyList();
   }
 
@@ -53,6 +52,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ComplianceGroup();
   }
 
+  @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.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_ComplianceGroup_descriptor;
@@ -69,9 +73,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    * string name = 1;
@@ -110,10 +112,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int RPCS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList rpcs_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList rpcs_;
 
   /**
    * repeated string rpcs = 2;
@@ -154,8 +153,6 @@ public com.google.protobuf.ByteString getRpcsBytes(int index) {
   }
 
   public static final int REQUESTS_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
   private java.util.List requests_;
 
   /** repeated .google.showcase.v1beta1.RepeatRequest requests = 3; */
@@ -416,16 +413,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
-      rpcs_ = com.google.protobuf.LazyStringArrayList.emptyList();
+
+      rpcs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       if (requestsBuilder_ == null) {
         requests_ = java.util.Collections.emptyList();
       } else {
         requests_ = null;
         requestsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -453,35 +451,24 @@ public com.google.showcase.v1beta1.ComplianceGroup build() {
     public com.google.showcase.v1beta1.ComplianceGroup buildPartial() {
       com.google.showcase.v1beta1.ComplianceGroup result =
           new com.google.showcase.v1beta1.ComplianceGroup(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      result.name_ = name_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        rpcs_ = rpcs_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.showcase.v1beta1.ComplianceGroup result) {
+      result.rpcs_ = rpcs_;
       if (requestsBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           requests_ = java.util.Collections.unmodifiableList(requests_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.requests_ = requests_;
       } else {
         result.requests_ = requestsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.ComplianceGroup result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        rpcs_.makeImmutable();
-        result.rpcs_ = rpcs_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -531,13 +518,12 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ComplianceGroup other) {
       if (other == com.google.showcase.v1beta1.ComplianceGroup.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.rpcs_.isEmpty()) {
         if (rpcs_.isEmpty()) {
           rpcs_ = other.rpcs_;
-          bitField0_ |= 0x00000002;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureRpcsIsMutable();
           rpcs_.addAll(other.rpcs_);
@@ -548,7 +534,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ComplianceGroup other) {
         if (!other.requests_.isEmpty()) {
           if (requests_.isEmpty()) {
             requests_ = other.requests_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureRequestsIsMutable();
             requests_.addAll(other.requests_);
@@ -561,7 +547,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ComplianceGroup other) {
             requestsBuilder_.dispose();
             requestsBuilder_ = null;
             requests_ = other.requests_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000002);
             requestsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getRequestsFieldBuilder()
@@ -600,7 +586,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -688,8 +674,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -700,8 +686,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -717,20 +703,20 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.LazyStringArrayList rpcs_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList rpcs_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureRpcsIsMutable() {
-      if (!rpcs_.isModifiable()) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         rpcs_ = new com.google.protobuf.LazyStringArrayList(rpcs_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000002;
     }
 
     /**
@@ -739,8 +725,7 @@ private void ensureRpcsIsMutable() {
      * @return A list containing the rpcs.
      */
     public com.google.protobuf.ProtocolStringList getRpcsList() {
-      rpcs_.makeImmutable();
-      return rpcs_;
+      return rpcs_.getUnmodifiableView();
     }
 
     /**
@@ -785,7 +770,6 @@ public Builder setRpcs(int index, java.lang.String value) {
       }
       ensureRpcsIsMutable();
       rpcs_.set(index, value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -802,7 +786,6 @@ public Builder addRpcs(java.lang.String value) {
       }
       ensureRpcsIsMutable();
       rpcs_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -816,7 +799,6 @@ public Builder addRpcs(java.lang.String value) {
     public Builder addAllRpcs(java.lang.Iterable values) {
       ensureRpcsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, rpcs_);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -827,9 +809,8 @@ public Builder addAllRpcs(java.lang.Iterable values) {
      * @return This builder for chaining.
      */
     public Builder clearRpcs() {
-      rpcs_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000002);
-      ;
+      rpcs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -847,7 +828,6 @@ public Builder addRpcsBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureRpcsIsMutable();
       rpcs_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -856,9 +836,9 @@ public Builder addRpcsBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureRequestsIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000002) != 0)) {
         requests_ = new java.util.ArrayList(requests_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000002;
       }
     }
 
@@ -995,7 +975,7 @@ public Builder addAllRequests(
     public Builder clearRequests() {
       if (requestsBuilder_ == null) {
         requests_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
       } else {
         requestsBuilder_.clear();
@@ -1068,7 +1048,7 @@ public com.google.showcase.v1beta1.RepeatRequest.Builder addRequestsBuilder(int
                 com.google.showcase.v1beta1.RepeatRequest,
                 com.google.showcase.v1beta1.RepeatRequest.Builder,
                 com.google.showcase.v1beta1.RepeatRequestOrBuilder>(
-                requests_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
+                requests_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
         requests_ = null;
       }
       return requestsBuilder_;
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGroupOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGroupOrBuilder.java
index 87f6eb29ee..0053920088 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGroupOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGroupOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ComplianceGroupOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceOuterClass.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceOuterClass.java
index 78e6a3d834..2dd24e23f7 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceOuterClass.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceOuterClass.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public final class ComplianceOuterClass {
@@ -244,6 +243,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "PInt32",
               "PInt64",
               "PDouble",
+              "IntendedBindingUri",
+              "PInt32",
+              "PInt64",
+              "PDouble",
             });
     internal_static_google_showcase_v1beta1_RepeatResponse_descriptor =
         getDescriptor().getMessageTypes().get(1);
@@ -298,6 +301,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "PBool",
               "PKingdom",
               "PChild",
+              "PString",
+              "PInt32",
+              "PDouble",
+              "PBool",
+              "PKingdom",
+              "PChild",
             });
     internal_static_google_showcase_v1beta1_ComplianceDataChild_descriptor =
         getDescriptor().getMessageTypes().get(5);
@@ -317,6 +326,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "PBool",
               "PContinent",
               "PChild",
+              "PString",
+              "PFloat",
+              "PDouble",
+              "PBool",
+              "PChild",
             });
     internal_static_google_showcase_v1beta1_ComplianceDataGrandchild_descriptor =
         getDescriptor().getMessageTypes().get(6);
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceSuite.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceSuite.java
index f0298221ae..ba0dc88319 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceSuite.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceSuite.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ComplianceSuite();
   }
 
+  @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.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_ComplianceSuite_descriptor;
@@ -67,8 +71,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int GROUP_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List group_;
 
   /** repeated .google.showcase.v1beta1.ComplianceGroup group = 1; */
@@ -304,7 +306,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (groupBuilder_ == null) {
         group_ = java.util.Collections.emptyList();
       } else {
@@ -339,15 +340,7 @@ public com.google.showcase.v1beta1.ComplianceSuite build() {
     public com.google.showcase.v1beta1.ComplianceSuite buildPartial() {
       com.google.showcase.v1beta1.ComplianceSuite result =
           new com.google.showcase.v1beta1.ComplianceSuite(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.showcase.v1beta1.ComplianceSuite result) {
+      int from_bitField0_ = bitField0_;
       if (groupBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           group_ = java.util.Collections.unmodifiableList(group_);
@@ -357,10 +350,8 @@ private void buildPartialRepeatedFields(com.google.showcase.v1beta1.ComplianceSu
       } else {
         result.group_ = groupBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.ComplianceSuite result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceSuiteOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceSuiteOrBuilder.java
index 6c6dfdaf30..0d0ead0677 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceSuiteOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceSuiteOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ComplianceSuiteOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ConnectRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ConnectRequest.java
index 171579a2db..81e5129cb8 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ConnectRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ConnectRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -48,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ConnectRequest();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_ConnectRequest_descriptor;
@@ -117,6 +121,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new ConnectConfig();
     }
 
+    @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.showcase.v1beta1.MessagingOuterClass
           .internal_static_google_showcase_v1beta1_ConnectRequest_ConnectConfig_descriptor;
@@ -133,9 +142,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int PARENT_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object parent_ = "";
+    private volatile java.lang.Object parent_;
 
     /**
      *
@@ -378,8 +385,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         parent_ = "";
+
         return this;
       }
 
@@ -407,20 +414,11 @@ public com.google.showcase.v1beta1.ConnectRequest.ConnectConfig build() {
       public com.google.showcase.v1beta1.ConnectRequest.ConnectConfig buildPartial() {
         com.google.showcase.v1beta1.ConnectRequest.ConnectConfig result =
             new com.google.showcase.v1beta1.ConnectRequest.ConnectConfig(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
+        result.parent_ = parent_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.showcase.v1beta1.ConnectRequest.ConnectConfig result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.parent_ = parent_;
-        }
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -471,7 +469,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ConnectRequest.ConnectConfi
           return this;
         if (!other.getParent().isEmpty()) {
           parent_ = other.parent_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         this.mergeUnknownFields(other.getUnknownFields());
@@ -503,7 +500,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   parent_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               default:
@@ -523,8 +520,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private java.lang.Object parent_ = "";
 
       /**
@@ -589,8 +584,8 @@ public Builder setParent(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         parent_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -607,8 +602,8 @@ public Builder setParent(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearParent() {
+
         parent_ = getDefaultInstance().getParent();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -630,8 +625,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         parent_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -701,8 +696,6 @@ public com.google.showcase.v1beta1.ConnectRequest.ConnectConfig getDefaultInstan
   }
 
   private int requestCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object request_;
 
   public enum RequestCase
@@ -1090,7 +1083,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (configBuilder_ != null) {
         configBuilder_.clear();
       }
@@ -1126,29 +1118,25 @@ public com.google.showcase.v1beta1.ConnectRequest build() {
     public com.google.showcase.v1beta1.ConnectRequest buildPartial() {
       com.google.showcase.v1beta1.ConnectRequest result =
           new com.google.showcase.v1beta1.ConnectRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (requestCase_ == 1) {
+        if (configBuilder_ == null) {
+          result.request_ = request_;
+        } else {
+          result.request_ = configBuilder_.build();
+        }
       }
-      buildPartialOneofs(result);
+      if (requestCase_ == 2) {
+        if (blurbBuilder_ == null) {
+          result.request_ = request_;
+        } else {
+          result.request_ = blurbBuilder_.build();
+        }
+      }
+      result.requestCase_ = requestCase_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.ConnectRequest result) {
-      int from_bitField0_ = bitField0_;
-    }
-
-    private void buildPartialOneofs(com.google.showcase.v1beta1.ConnectRequest result) {
-      result.requestCase_ = requestCase_;
-      result.request_ = this.request_;
-      if (requestCase_ == 1 && configBuilder_ != null) {
-        result.request_ = configBuilder_.build();
-      }
-      if (requestCase_ == 2 && blurbBuilder_ != null) {
-        result.request_ = blurbBuilder_.build();
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1279,8 +1267,6 @@ public Builder clearRequest() {
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.showcase.v1beta1.ConnectRequest.ConnectConfig,
             com.google.showcase.v1beta1.ConnectRequest.ConnectConfig.Builder,
@@ -1506,6 +1492,7 @@ public com.google.showcase.v1beta1.ConnectRequest.ConnectConfigOrBuilder getConf
       }
       requestCase_ = 1;
       onChanged();
+      ;
       return configBuilder_;
     }
 
@@ -1721,6 +1708,7 @@ public com.google.showcase.v1beta1.BlurbOrBuilder getBlurbOrBuilder() {
       }
       requestCase_ = 2;
       onChanged();
+      ;
       return blurbBuilder_;
     }
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ConnectRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ConnectRequestOrBuilder.java
index 1ae50be2b6..62f0110274 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ConnectRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ConnectRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ConnectRequestOrBuilder
@@ -101,5 +100,5 @@ public interface ConnectRequestOrBuilder
    */
   com.google.showcase.v1beta1.BlurbOrBuilder getBlurbOrBuilder();
 
-  com.google.showcase.v1beta1.ConnectRequest.RequestCase getRequestCase();
+  public com.google.showcase.v1beta1.ConnectRequest.RequestCase getRequestCase();
 }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Continent.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Continent.java
index 9482df1340..3e3b35a327 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Continent.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Continent.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf enum {@code google.showcase.v1beta1.Continent} */
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequest.java
index 5fd72c1dbd..159b9735bf 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CreateBlurbRequest();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_CreateBlurbRequest_descriptor;
@@ -65,11 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.CreateBlurbRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int PARENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -141,7 +142,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    */
   @java.lang.Override
   public boolean hasBlurb() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return blurb_ != null;
   }
 
   /**
@@ -171,7 +172,7 @@ public com.google.showcase.v1beta1.Blurb getBlurb() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.BlurbOrBuilder getBlurbOrBuilder() {
-    return blurb_ == null ? com.google.showcase.v1beta1.Blurb.getDefaultInstance() : blurb_;
+    return getBlurb();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -191,7 +192,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (blurb_ != null) {
       output.writeMessage(2, getBlurb());
     }
     getUnknownFields().writeTo(output);
@@ -206,7 +207,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (blurb_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getBlurb());
     }
     size += getUnknownFields().getSerializedSize();
@@ -378,29 +379,21 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.CreateBlurbRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getBlurbFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       parent_ = "";
-      blurb_ = null;
-      if (blurbBuilder_ != null) {
-        blurbBuilder_.dispose();
+
+      if (blurbBuilder_ == null) {
+        blurb_ = null;
+      } else {
+        blurb_ = null;
         blurbBuilder_ = null;
       }
       return this;
@@ -430,26 +423,16 @@ public com.google.showcase.v1beta1.CreateBlurbRequest build() {
     public com.google.showcase.v1beta1.CreateBlurbRequest buildPartial() {
       com.google.showcase.v1beta1.CreateBlurbRequest result =
           new com.google.showcase.v1beta1.CreateBlurbRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.parent_ = parent_;
+      if (blurbBuilder_ == null) {
+        result.blurb_ = blurb_;
+      } else {
+        result.blurb_ = blurbBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.CreateBlurbRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.parent_ = parent_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.blurb_ = blurbBuilder_ == null ? blurb_ : blurbBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -497,7 +480,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.CreateBlurbRequest other) {
       if (other == com.google.showcase.v1beta1.CreateBlurbRequest.getDefaultInstance()) return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasBlurb()) {
@@ -532,13 +514,13 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getBlurbFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -558,8 +540,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object parent_ = "";
 
     /**
@@ -633,8 +613,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -654,8 +634,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -680,8 +660,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -705,7 +685,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the blurb field is set.
      */
     public boolean hasBlurb() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return blurbBuilder_ != null || blurb_ != null;
     }
 
     /**
@@ -742,11 +722,11 @@ public Builder setBlurb(com.google.showcase.v1beta1.Blurb value) {
           throw new NullPointerException();
         }
         blurb_ = value;
+        onChanged();
       } else {
         blurbBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -762,11 +742,11 @@ public Builder setBlurb(com.google.showcase.v1beta1.Blurb value) {
     public Builder setBlurb(com.google.showcase.v1beta1.Blurb.Builder builderForValue) {
       if (blurbBuilder_ == null) {
         blurb_ = builderForValue.build();
+        onChanged();
       } else {
         blurbBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -781,20 +761,17 @@ public Builder setBlurb(com.google.showcase.v1beta1.Blurb.Builder builderForValu
      */
     public Builder mergeBlurb(com.google.showcase.v1beta1.Blurb value) {
       if (blurbBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && blurb_ != null
-            && blurb_ != com.google.showcase.v1beta1.Blurb.getDefaultInstance()) {
-          getBlurbBuilder().mergeFrom(value);
+        if (blurb_ != null) {
+          blurb_ =
+              com.google.showcase.v1beta1.Blurb.newBuilder(blurb_).mergeFrom(value).buildPartial();
         } else {
           blurb_ = value;
         }
+        onChanged();
       } else {
         blurbBuilder_.mergeFrom(value);
       }
-      if (blurb_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -808,13 +785,14 @@ public Builder mergeBlurb(com.google.showcase.v1beta1.Blurb value) {
      * .google.showcase.v1beta1.Blurb blurb = 2;
      */
     public Builder clearBlurb() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      blurb_ = null;
-      if (blurbBuilder_ != null) {
-        blurbBuilder_.dispose();
+      if (blurbBuilder_ == null) {
+        blurb_ = null;
+        onChanged();
+      } else {
+        blurb_ = null;
         blurbBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -828,7 +806,7 @@ public Builder clearBlurb() {
      * .google.showcase.v1beta1.Blurb blurb = 2;
      */
     public com.google.showcase.v1beta1.Blurb.Builder getBlurbBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getBlurbFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequestOrBuilder.java
index e93bc3d7a6..10a4eb4e42 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface CreateBlurbRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequest.java
index 4ca4189680..a1c5a9a899 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -48,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CreateRoomRequest();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_CreateRoomRequest_descriptor;
@@ -63,7 +67,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.CreateRoomRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int ROOM_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.Room room_;
 
@@ -80,7 +83,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasRoom() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return room_ != null;
   }
 
   /**
@@ -110,7 +113,7 @@ public com.google.showcase.v1beta1.Room getRoom() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.RoomOrBuilder getRoomOrBuilder() {
-    return room_ == null ? com.google.showcase.v1beta1.Room.getDefaultInstance() : room_;
+    return getRoom();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -127,7 +130,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (room_ != null) {
       output.writeMessage(1, getRoom());
     }
     getUnknownFields().writeTo(output);
@@ -139,7 +142,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (room_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getRoom());
     }
     size += getUnknownFields().getSerializedSize();
@@ -308,28 +311,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.CreateRoomRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getRoomFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      room_ = null;
-      if (roomBuilder_ != null) {
-        roomBuilder_.dispose();
+      if (roomBuilder_ == null) {
+        room_ = null;
+      } else {
+        room_ = null;
         roomBuilder_ = null;
       }
       return this;
@@ -359,23 +353,15 @@ public com.google.showcase.v1beta1.CreateRoomRequest build() {
     public com.google.showcase.v1beta1.CreateRoomRequest buildPartial() {
       com.google.showcase.v1beta1.CreateRoomRequest result =
           new com.google.showcase.v1beta1.CreateRoomRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (roomBuilder_ == null) {
+        result.room_ = room_;
+      } else {
+        result.room_ = roomBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.CreateRoomRequest result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.room_ = roomBuilder_ == null ? room_ : roomBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -453,7 +439,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getRoomFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -473,8 +459,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.showcase.v1beta1.Room room_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.showcase.v1beta1.Room,
@@ -494,7 +478,7 @@ public Builder mergeFrom(
      * @return Whether the room field is set.
      */
     public boolean hasRoom() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return roomBuilder_ != null || room_ != null;
     }
 
     /**
@@ -531,11 +515,11 @@ public Builder setRoom(com.google.showcase.v1beta1.Room value) {
           throw new NullPointerException();
         }
         room_ = value;
+        onChanged();
       } else {
         roomBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -551,11 +535,11 @@ public Builder setRoom(com.google.showcase.v1beta1.Room value) {
     public Builder setRoom(com.google.showcase.v1beta1.Room.Builder builderForValue) {
       if (roomBuilder_ == null) {
         room_ = builderForValue.build();
+        onChanged();
       } else {
         roomBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -570,20 +554,17 @@ public Builder setRoom(com.google.showcase.v1beta1.Room.Builder builderForValue)
      */
     public Builder mergeRoom(com.google.showcase.v1beta1.Room value) {
       if (roomBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && room_ != null
-            && room_ != com.google.showcase.v1beta1.Room.getDefaultInstance()) {
-          getRoomBuilder().mergeFrom(value);
+        if (room_ != null) {
+          room_ =
+              com.google.showcase.v1beta1.Room.newBuilder(room_).mergeFrom(value).buildPartial();
         } else {
           room_ = value;
         }
+        onChanged();
       } else {
         roomBuilder_.mergeFrom(value);
       }
-      if (room_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -597,13 +578,14 @@ public Builder mergeRoom(com.google.showcase.v1beta1.Room value) {
      * .google.showcase.v1beta1.Room room = 1;
      */
     public Builder clearRoom() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      room_ = null;
-      if (roomBuilder_ != null) {
-        roomBuilder_.dispose();
+      if (roomBuilder_ == null) {
+        room_ = null;
+        onChanged();
+      } else {
+        room_ = null;
         roomBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -617,7 +599,7 @@ public Builder clearRoom() {
      * .google.showcase.v1beta1.Room room = 1;
      */
     public com.google.showcase.v1beta1.Room.Builder getRoomBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getRoomFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequestOrBuilder.java
index 7558fee0e1..70ac5ce00f 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface CreateRoomRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequest.java
index fd1fccbc11..907e2af55c 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.CreateSequenceRequest} */
@@ -39,6 +38,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CreateSequenceRequest();
   }
 
+  @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.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_CreateSequenceRequest_descriptor;
@@ -54,7 +58,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.CreateSequenceRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int SEQUENCE_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.Sequence sequence_;
 
@@ -65,7 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasSequence() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return sequence_ != null;
   }
 
   /**
@@ -83,9 +86,7 @@ public com.google.showcase.v1beta1.Sequence getSequence() {
   /** .google.showcase.v1beta1.Sequence sequence = 1; */
   @java.lang.Override
   public com.google.showcase.v1beta1.SequenceOrBuilder getSequenceOrBuilder() {
-    return sequence_ == null
-        ? com.google.showcase.v1beta1.Sequence.getDefaultInstance()
-        : sequence_;
+    return getSequence();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -102,7 +103,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (sequence_ != null) {
       output.writeMessage(1, getSequence());
     }
     getUnknownFields().writeTo(output);
@@ -114,7 +115,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (sequence_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getSequence());
     }
     size += getUnknownFields().getSerializedSize();
@@ -274,28 +275,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.CreateSequenceRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getSequenceFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      sequence_ = null;
-      if (sequenceBuilder_ != null) {
-        sequenceBuilder_.dispose();
+      if (sequenceBuilder_ == null) {
+        sequence_ = null;
+      } else {
+        sequence_ = null;
         sequenceBuilder_ = null;
       }
       return this;
@@ -325,23 +317,15 @@ public com.google.showcase.v1beta1.CreateSequenceRequest build() {
     public com.google.showcase.v1beta1.CreateSequenceRequest buildPartial() {
       com.google.showcase.v1beta1.CreateSequenceRequest result =
           new com.google.showcase.v1beta1.CreateSequenceRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (sequenceBuilder_ == null) {
+        result.sequence_ = sequence_;
+      } else {
+        result.sequence_ = sequenceBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.CreateSequenceRequest result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.sequence_ = sequenceBuilder_ == null ? sequence_ : sequenceBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -420,7 +404,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getSequenceFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -440,8 +424,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.showcase.v1beta1.Sequence sequence_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.showcase.v1beta1.Sequence,
@@ -455,7 +437,7 @@ public Builder mergeFrom(
      * @return Whether the sequence field is set.
      */
     public boolean hasSequence() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return sequenceBuilder_ != null || sequence_ != null;
     }
 
     /**
@@ -480,11 +462,11 @@ public Builder setSequence(com.google.showcase.v1beta1.Sequence value) {
           throw new NullPointerException();
         }
         sequence_ = value;
+        onChanged();
       } else {
         sequenceBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -492,49 +474,49 @@ public Builder setSequence(com.google.showcase.v1beta1.Sequence value) {
     public Builder setSequence(com.google.showcase.v1beta1.Sequence.Builder builderForValue) {
       if (sequenceBuilder_ == null) {
         sequence_ = builderForValue.build();
+        onChanged();
       } else {
         sequenceBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
     /** .google.showcase.v1beta1.Sequence sequence = 1; */
     public Builder mergeSequence(com.google.showcase.v1beta1.Sequence value) {
       if (sequenceBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && sequence_ != null
-            && sequence_ != com.google.showcase.v1beta1.Sequence.getDefaultInstance()) {
-          getSequenceBuilder().mergeFrom(value);
+        if (sequence_ != null) {
+          sequence_ =
+              com.google.showcase.v1beta1.Sequence.newBuilder(sequence_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           sequence_ = value;
         }
+        onChanged();
       } else {
         sequenceBuilder_.mergeFrom(value);
       }
-      if (sequence_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
     /** .google.showcase.v1beta1.Sequence sequence = 1; */
     public Builder clearSequence() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      sequence_ = null;
-      if (sequenceBuilder_ != null) {
-        sequenceBuilder_.dispose();
+      if (sequenceBuilder_ == null) {
+        sequence_ = null;
+        onChanged();
+      } else {
+        sequence_ = null;
         sequenceBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
     /** .google.showcase.v1beta1.Sequence sequence = 1; */
     public com.google.showcase.v1beta1.Sequence.Builder getSequenceBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getSequenceFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequestOrBuilder.java
index 5882aee416..93b0341821 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface CreateSequenceRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequest.java
index 1b7b0e7706..9e26608d91 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -47,6 +46,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CreateSessionRequest();
   }
 
+  @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.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_CreateSessionRequest_descriptor;
@@ -62,7 +66,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.CreateSessionRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int SESSION_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.Session session_;
 
@@ -81,7 +84,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasSession() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return session_ != null;
   }
 
   /**
@@ -115,7 +118,7 @@ public com.google.showcase.v1beta1.Session getSession() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.SessionOrBuilder getSessionOrBuilder() {
-    return session_ == null ? com.google.showcase.v1beta1.Session.getDefaultInstance() : session_;
+    return getSession();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -132,7 +135,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (session_ != null) {
       output.writeMessage(1, getSession());
     }
     getUnknownFields().writeTo(output);
@@ -144,7 +147,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (session_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getSession());
     }
     size += getUnknownFields().getSerializedSize();
@@ -312,28 +315,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.CreateSessionRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getSessionFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      session_ = null;
-      if (sessionBuilder_ != null) {
-        sessionBuilder_.dispose();
+      if (sessionBuilder_ == null) {
+        session_ = null;
+      } else {
+        session_ = null;
         sessionBuilder_ = null;
       }
       return this;
@@ -363,23 +357,15 @@ public com.google.showcase.v1beta1.CreateSessionRequest build() {
     public com.google.showcase.v1beta1.CreateSessionRequest buildPartial() {
       com.google.showcase.v1beta1.CreateSessionRequest result =
           new com.google.showcase.v1beta1.CreateSessionRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (sessionBuilder_ == null) {
+        result.session_ = session_;
+      } else {
+        result.session_ = sessionBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.CreateSessionRequest result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.session_ = sessionBuilder_ == null ? session_ : sessionBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -458,7 +444,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getSessionFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -478,8 +464,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.showcase.v1beta1.Session session_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.showcase.v1beta1.Session,
@@ -501,7 +485,7 @@ public Builder mergeFrom(
      * @return Whether the session field is set.
      */
     public boolean hasSession() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return sessionBuilder_ != null || session_ != null;
     }
 
     /**
@@ -544,11 +528,11 @@ public Builder setSession(com.google.showcase.v1beta1.Session value) {
           throw new NullPointerException();
         }
         session_ = value;
+        onChanged();
       } else {
         sessionBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -566,11 +550,11 @@ public Builder setSession(com.google.showcase.v1beta1.Session value) {
     public Builder setSession(com.google.showcase.v1beta1.Session.Builder builderForValue) {
       if (sessionBuilder_ == null) {
         session_ = builderForValue.build();
+        onChanged();
       } else {
         sessionBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -587,20 +571,19 @@ public Builder setSession(com.google.showcase.v1beta1.Session.Builder builderFor
      */
     public Builder mergeSession(com.google.showcase.v1beta1.Session value) {
       if (sessionBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && session_ != null
-            && session_ != com.google.showcase.v1beta1.Session.getDefaultInstance()) {
-          getSessionBuilder().mergeFrom(value);
+        if (session_ != null) {
+          session_ =
+              com.google.showcase.v1beta1.Session.newBuilder(session_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           session_ = value;
         }
+        onChanged();
       } else {
         sessionBuilder_.mergeFrom(value);
       }
-      if (session_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -616,13 +599,14 @@ public Builder mergeSession(com.google.showcase.v1beta1.Session value) {
      * .google.showcase.v1beta1.Session session = 1;
      */
     public Builder clearSession() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      session_ = null;
-      if (sessionBuilder_ != null) {
-        sessionBuilder_.dispose();
+      if (sessionBuilder_ == null) {
+        session_ = null;
+        onChanged();
+      } else {
+        session_ = null;
         sessionBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -638,7 +622,7 @@ public Builder clearSession() {
      * .google.showcase.v1beta1.Session session = 1;
      */
     public com.google.showcase.v1beta1.Session.Builder getSessionBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getSessionFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequestOrBuilder.java
index 355167d8d4..e1b21c09f4 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface CreateSessionRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequest.java
index 2b0b57efea..53f06d87dd 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.CreateStreamingSequenceRequest} */
@@ -40,6 +39,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CreateStreamingSequenceRequest();
   }
 
+  @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.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_CreateStreamingSequenceRequest_descriptor;
@@ -55,7 +59,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.CreateStreamingSequenceRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int STREAMING_SEQUENCE_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.StreamingSequence streamingSequence_;
 
@@ -66,7 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasStreamingSequence() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return streamingSequence_ != null;
   }
 
   /**
@@ -84,9 +87,7 @@ public com.google.showcase.v1beta1.StreamingSequence getStreamingSequence() {
   /** .google.showcase.v1beta1.StreamingSequence streaming_sequence = 1; */
   @java.lang.Override
   public com.google.showcase.v1beta1.StreamingSequenceOrBuilder getStreamingSequenceOrBuilder() {
-    return streamingSequence_ == null
-        ? com.google.showcase.v1beta1.StreamingSequence.getDefaultInstance()
-        : streamingSequence_;
+    return getStreamingSequence();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -103,7 +104,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (streamingSequence_ != null) {
       output.writeMessage(1, getStreamingSequence());
     }
     getUnknownFields().writeTo(output);
@@ -115,7 +116,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (streamingSequence_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getStreamingSequence());
     }
     size += getUnknownFields().getSerializedSize();
@@ -276,28 +277,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.CreateStreamingSequenceRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getStreamingSequenceFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      streamingSequence_ = null;
-      if (streamingSequenceBuilder_ != null) {
-        streamingSequenceBuilder_.dispose();
+      if (streamingSequenceBuilder_ == null) {
+        streamingSequence_ = null;
+      } else {
+        streamingSequence_ = null;
         streamingSequenceBuilder_ = null;
       }
       return this;
@@ -327,26 +319,15 @@ public com.google.showcase.v1beta1.CreateStreamingSequenceRequest build() {
     public com.google.showcase.v1beta1.CreateStreamingSequenceRequest buildPartial() {
       com.google.showcase.v1beta1.CreateStreamingSequenceRequest result =
           new com.google.showcase.v1beta1.CreateStreamingSequenceRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (streamingSequenceBuilder_ == null) {
+        result.streamingSequence_ = streamingSequence_;
+      } else {
+        result.streamingSequence_ = streamingSequenceBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.CreateStreamingSequenceRequest result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.streamingSequence_ =
-            streamingSequenceBuilder_ == null
-                ? streamingSequence_
-                : streamingSequenceBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -426,7 +407,7 @@ public Builder mergeFrom(
               {
                 input.readMessage(
                     getStreamingSequenceFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -446,8 +427,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.showcase.v1beta1.StreamingSequence streamingSequence_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.showcase.v1beta1.StreamingSequence,
@@ -461,7 +440,7 @@ public Builder mergeFrom(
      * @return Whether the streamingSequence field is set.
      */
     public boolean hasStreamingSequence() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return streamingSequenceBuilder_ != null || streamingSequence_ != null;
     }
 
     /**
@@ -486,11 +465,11 @@ public Builder setStreamingSequence(com.google.showcase.v1beta1.StreamingSequenc
           throw new NullPointerException();
         }
         streamingSequence_ = value;
+        onChanged();
       } else {
         streamingSequenceBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -499,50 +478,49 @@ public Builder setStreamingSequence(
         com.google.showcase.v1beta1.StreamingSequence.Builder builderForValue) {
       if (streamingSequenceBuilder_ == null) {
         streamingSequence_ = builderForValue.build();
+        onChanged();
       } else {
         streamingSequenceBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
     /** .google.showcase.v1beta1.StreamingSequence streaming_sequence = 1; */
     public Builder mergeStreamingSequence(com.google.showcase.v1beta1.StreamingSequence value) {
       if (streamingSequenceBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && streamingSequence_ != null
-            && streamingSequence_
-                != com.google.showcase.v1beta1.StreamingSequence.getDefaultInstance()) {
-          getStreamingSequenceBuilder().mergeFrom(value);
+        if (streamingSequence_ != null) {
+          streamingSequence_ =
+              com.google.showcase.v1beta1.StreamingSequence.newBuilder(streamingSequence_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           streamingSequence_ = value;
         }
+        onChanged();
       } else {
         streamingSequenceBuilder_.mergeFrom(value);
       }
-      if (streamingSequence_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
     /** .google.showcase.v1beta1.StreamingSequence streaming_sequence = 1; */
     public Builder clearStreamingSequence() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      streamingSequence_ = null;
-      if (streamingSequenceBuilder_ != null) {
-        streamingSequenceBuilder_.dispose();
+      if (streamingSequenceBuilder_ == null) {
+        streamingSequence_ = null;
+        onChanged();
+      } else {
+        streamingSequence_ = null;
         streamingSequenceBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
     /** .google.showcase.v1beta1.StreamingSequence streaming_sequence = 1; */
     public com.google.showcase.v1beta1.StreamingSequence.Builder getStreamingSequenceBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getStreamingSequenceFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequestOrBuilder.java
index d14de74f4b..6540c0105f 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface CreateStreamingSequenceRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequest.java
index 34477e14d0..698b432527 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/identity.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -48,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new CreateUserRequest();
   }
 
+  @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.showcase.v1beta1.IdentityOuterClass
         .internal_static_google_showcase_v1beta1_CreateUserRequest_descriptor;
@@ -63,7 +67,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.CreateUserRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int USER_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.User user_;
 
@@ -80,7 +83,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasUser() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return user_ != null;
   }
 
   /**
@@ -110,7 +113,7 @@ public com.google.showcase.v1beta1.User getUser() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.UserOrBuilder getUserOrBuilder() {
-    return user_ == null ? com.google.showcase.v1beta1.User.getDefaultInstance() : user_;
+    return getUser();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -127,7 +130,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (user_ != null) {
       output.writeMessage(1, getUser());
     }
     getUnknownFields().writeTo(output);
@@ -139,7 +142,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (user_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getUser());
     }
     size += getUnknownFields().getSerializedSize();
@@ -308,28 +311,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.CreateUserRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getUserFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      user_ = null;
-      if (userBuilder_ != null) {
-        userBuilder_.dispose();
+      if (userBuilder_ == null) {
+        user_ = null;
+      } else {
+        user_ = null;
         userBuilder_ = null;
       }
       return this;
@@ -359,23 +353,15 @@ public com.google.showcase.v1beta1.CreateUserRequest build() {
     public com.google.showcase.v1beta1.CreateUserRequest buildPartial() {
       com.google.showcase.v1beta1.CreateUserRequest result =
           new com.google.showcase.v1beta1.CreateUserRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (userBuilder_ == null) {
+        result.user_ = user_;
+      } else {
+        result.user_ = userBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.CreateUserRequest result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.user_ = userBuilder_ == null ? user_ : userBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -453,7 +439,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getUserFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -473,8 +459,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.showcase.v1beta1.User user_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.showcase.v1beta1.User,
@@ -494,7 +478,7 @@ public Builder mergeFrom(
      * @return Whether the user field is set.
      */
     public boolean hasUser() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return userBuilder_ != null || user_ != null;
     }
 
     /**
@@ -531,11 +515,11 @@ public Builder setUser(com.google.showcase.v1beta1.User value) {
           throw new NullPointerException();
         }
         user_ = value;
+        onChanged();
       } else {
         userBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -551,11 +535,11 @@ public Builder setUser(com.google.showcase.v1beta1.User value) {
     public Builder setUser(com.google.showcase.v1beta1.User.Builder builderForValue) {
       if (userBuilder_ == null) {
         user_ = builderForValue.build();
+        onChanged();
       } else {
         userBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -570,20 +554,17 @@ public Builder setUser(com.google.showcase.v1beta1.User.Builder builderForValue)
      */
     public Builder mergeUser(com.google.showcase.v1beta1.User value) {
       if (userBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && user_ != null
-            && user_ != com.google.showcase.v1beta1.User.getDefaultInstance()) {
-          getUserBuilder().mergeFrom(value);
+        if (user_ != null) {
+          user_ =
+              com.google.showcase.v1beta1.User.newBuilder(user_).mergeFrom(value).buildPartial();
         } else {
           user_ = value;
         }
+        onChanged();
       } else {
         userBuilder_.mergeFrom(value);
       }
-      if (user_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -597,13 +578,14 @@ public Builder mergeUser(com.google.showcase.v1beta1.User value) {
      * .google.showcase.v1beta1.User user = 1;
      */
     public Builder clearUser() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      user_ = null;
-      if (userBuilder_ != null) {
-        userBuilder_.dispose();
+      if (userBuilder_ == null) {
+        user_ = null;
+        onChanged();
+      } else {
+        user_ = null;
         userBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -617,7 +599,7 @@ public Builder clearUser() {
      * .google.showcase.v1beta1.User user = 1;
      */
     public com.google.showcase.v1beta1.User.Builder getUserBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getUserFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequestOrBuilder.java
index 25204de6d6..d33fee565d 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/identity.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface CreateUserRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteBlurbRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteBlurbRequest.java
index ac57bd215d..75405bfa45 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteBlurbRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteBlurbRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DeleteBlurbRequest();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_DeleteBlurbRequest_descriptor;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -321,8 +323,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -350,20 +352,11 @@ public com.google.showcase.v1beta1.DeleteBlurbRequest build() {
     public com.google.showcase.v1beta1.DeleteBlurbRequest buildPartial() {
       com.google.showcase.v1beta1.DeleteBlurbRequest result =
           new com.google.showcase.v1beta1.DeleteBlurbRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.DeleteBlurbRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -411,7 +404,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.DeleteBlurbRequest other) {
       if (other == com.google.showcase.v1beta1.DeleteBlurbRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -443,7 +435,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -463,8 +455,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -535,8 +525,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -555,8 +545,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -580,8 +570,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteBlurbRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteBlurbRequestOrBuilder.java
index 0bb6f36f11..6a512694ee 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteBlurbRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteBlurbRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface DeleteBlurbRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteRoomRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteRoomRequest.java
index dfb51e4823..05d2750b23 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteRoomRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteRoomRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DeleteRoomRequest();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_DeleteRoomRequest_descriptor;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -321,8 +323,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -350,20 +352,11 @@ public com.google.showcase.v1beta1.DeleteRoomRequest build() {
     public com.google.showcase.v1beta1.DeleteRoomRequest buildPartial() {
       com.google.showcase.v1beta1.DeleteRoomRequest result =
           new com.google.showcase.v1beta1.DeleteRoomRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.DeleteRoomRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -411,7 +404,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.DeleteRoomRequest other) {
       if (other == com.google.showcase.v1beta1.DeleteRoomRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -443,7 +435,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -463,8 +455,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -535,8 +525,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -555,8 +545,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -580,8 +570,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteRoomRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteRoomRequestOrBuilder.java
index 5d7141aee6..28767d0d0b 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteRoomRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteRoomRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface DeleteRoomRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteSessionRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteSessionRequest.java
index 1055ae788c..5dd1524c3e 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteSessionRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteSessionRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DeleteSessionRequest();
   }
 
+  @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.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_DeleteSessionRequest_descriptor;
@@ -65,9 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -315,8 +317,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -344,20 +346,11 @@ public com.google.showcase.v1beta1.DeleteSessionRequest build() {
     public com.google.showcase.v1beta1.DeleteSessionRequest buildPartial() {
       com.google.showcase.v1beta1.DeleteSessionRequest result =
           new com.google.showcase.v1beta1.DeleteSessionRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.DeleteSessionRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -406,7 +399,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.DeleteSessionRequest other)
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -438,7 +430,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -458,8 +450,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -524,8 +514,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -542,8 +532,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -565,8 +555,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteSessionRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteSessionRequestOrBuilder.java
index a23deec0dc..c64c0e3f26 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteSessionRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteSessionRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface DeleteSessionRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteTestRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteTestRequest.java
index e392430a8d..cac340606f 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteTestRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteTestRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DeleteTestRequest();
   }
 
+  @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.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_DeleteTestRequest_descriptor;
@@ -65,9 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -315,8 +317,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -344,20 +346,11 @@ public com.google.showcase.v1beta1.DeleteTestRequest build() {
     public com.google.showcase.v1beta1.DeleteTestRequest buildPartial() {
       com.google.showcase.v1beta1.DeleteTestRequest result =
           new com.google.showcase.v1beta1.DeleteTestRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.DeleteTestRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -405,7 +398,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.DeleteTestRequest other) {
       if (other == com.google.showcase.v1beta1.DeleteTestRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -437,7 +429,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -457,8 +449,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -523,8 +513,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -541,8 +531,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -564,8 +554,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteTestRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteTestRequestOrBuilder.java
index bf453814de..f40d9e8ae2 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteTestRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteTestRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface DeleteTestRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteUserRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteUserRequest.java
index d5b54ee8bb..2f0c963e83 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteUserRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteUserRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/identity.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new DeleteUserRequest();
   }
 
+  @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.showcase.v1beta1.IdentityOuterClass
         .internal_static_google_showcase_v1beta1_DeleteUserRequest_descriptor;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -321,8 +323,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -350,20 +352,11 @@ public com.google.showcase.v1beta1.DeleteUserRequest build() {
     public com.google.showcase.v1beta1.DeleteUserRequest buildPartial() {
       com.google.showcase.v1beta1.DeleteUserRequest result =
           new com.google.showcase.v1beta1.DeleteUserRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.DeleteUserRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -411,7 +404,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.DeleteUserRequest other) {
       if (other == com.google.showcase.v1beta1.DeleteUserRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -443,7 +435,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -463,8 +455,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -535,8 +525,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -555,8 +545,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -580,8 +570,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteUserRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteUserRequestOrBuilder.java
index eac216503e..ec8973af2f 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteUserRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteUserRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/identity.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface DeleteUserRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsRequest.java
index fde232b556..9dec907e1e 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -41,7 +40,7 @@ private EchoErrorDetailsRequest(com.google.protobuf.GeneratedMessageV3.Builder values) {
       ensureMultiDetailTextIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, multiDetailText_);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -849,9 +837,8 @@ public Builder addAllMultiDetailText(java.lang.Iterable values
      * @return This builder for chaining.
      */
     public Builder clearMultiDetailText() {
-      multiDetailText_ = com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField0_ = (bitField0_ & ~0x00000002);
-      ;
+      multiDetailText_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -876,7 +863,6 @@ public Builder addMultiDetailTextBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureMultiDetailTextIsMutable();
       multiDetailText_.add(value);
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsRequestOrBuilder.java
index c5c374ea56..b104dfa891 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface EchoErrorDetailsRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsResponse.java
index 40561fcb60..157ff3f564 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -47,6 +46,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new EchoErrorDetailsResponse();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_EchoErrorDetailsResponse_descriptor;
@@ -105,6 +109,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new SingleDetail();
     }
 
+    @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.showcase.v1beta1.EchoOuterClass
           .internal_static_google_showcase_v1beta1_EchoErrorDetailsResponse_SingleDetail_descriptor;
@@ -120,7 +129,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
               com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail.Builder.class);
     }
 
-    private int bitField0_;
     public static final int ERROR_FIELD_NUMBER = 1;
     private com.google.showcase.v1beta1.ErrorWithSingleDetail error_;
 
@@ -131,7 +139,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      */
     @java.lang.Override
     public boolean hasError() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return error_ != null;
     }
 
     /**
@@ -149,9 +157,7 @@ public com.google.showcase.v1beta1.ErrorWithSingleDetail getError() {
     /** .google.showcase.v1beta1.ErrorWithSingleDetail error = 1; */
     @java.lang.Override
     public com.google.showcase.v1beta1.ErrorWithSingleDetailOrBuilder getErrorOrBuilder() {
-      return error_ == null
-          ? com.google.showcase.v1beta1.ErrorWithSingleDetail.getDefaultInstance()
-          : error_;
+      return getError();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -168,7 +174,7 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (error_ != null) {
         output.writeMessage(1, getError());
       }
       getUnknownFields().writeTo(output);
@@ -180,7 +186,7 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (error_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getError());
       }
       size += getUnknownFields().getSerializedSize();
@@ -345,28 +351,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
       // Construct using
       // com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getErrorFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
-        error_ = null;
-        if (errorBuilder_ != null) {
-          errorBuilder_.dispose();
+        if (errorBuilder_ == null) {
+          error_ = null;
+        } else {
+          error_ = null;
           errorBuilder_ = null;
         }
         return this;
@@ -398,24 +395,15 @@ public com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail build()
       public com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail buildPartial() {
         com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail result =
             new com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        if (errorBuilder_ == null) {
+          result.error_ = error_;
+        } else {
+          result.error_ = errorBuilder_.build();
         }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(
-          com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail result) {
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.error_ = errorBuilder_ == null ? error_ : errorBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        result.bitField0_ |= to_bitField0_;
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -499,7 +487,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   input.readMessage(getErrorFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               default:
@@ -519,8 +507,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private com.google.showcase.v1beta1.ErrorWithSingleDetail error_;
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.showcase.v1beta1.ErrorWithSingleDetail,
@@ -534,7 +520,7 @@ public Builder mergeFrom(
        * @return Whether the error field is set.
        */
       public boolean hasError() {
-        return ((bitField0_ & 0x00000001) != 0);
+        return errorBuilder_ != null || error_ != null;
       }
 
       /**
@@ -559,11 +545,11 @@ public Builder setError(com.google.showcase.v1beta1.ErrorWithSingleDetail value)
             throw new NullPointerException();
           }
           error_ = value;
+          onChanged();
         } else {
           errorBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+
         return this;
       }
 
@@ -572,49 +558,49 @@ public Builder setError(
           com.google.showcase.v1beta1.ErrorWithSingleDetail.Builder builderForValue) {
         if (errorBuilder_ == null) {
           error_ = builderForValue.build();
+          onChanged();
         } else {
           errorBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+
         return this;
       }
 
       /** .google.showcase.v1beta1.ErrorWithSingleDetail error = 1; */
       public Builder mergeError(com.google.showcase.v1beta1.ErrorWithSingleDetail value) {
         if (errorBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)
-              && error_ != null
-              && error_ != com.google.showcase.v1beta1.ErrorWithSingleDetail.getDefaultInstance()) {
-            getErrorBuilder().mergeFrom(value);
+          if (error_ != null) {
+            error_ =
+                com.google.showcase.v1beta1.ErrorWithSingleDetail.newBuilder(error_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             error_ = value;
           }
+          onChanged();
         } else {
           errorBuilder_.mergeFrom(value);
         }
-        if (error_ != null) {
-          bitField0_ |= 0x00000001;
-          onChanged();
-        }
+
         return this;
       }
 
       /** .google.showcase.v1beta1.ErrorWithSingleDetail error = 1; */
       public Builder clearError() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        error_ = null;
-        if (errorBuilder_ != null) {
-          errorBuilder_.dispose();
+        if (errorBuilder_ == null) {
+          error_ = null;
+          onChanged();
+        } else {
+          error_ = null;
           errorBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
       /** .google.showcase.v1beta1.ErrorWithSingleDetail error = 1; */
       public com.google.showcase.v1beta1.ErrorWithSingleDetail.Builder getErrorBuilder() {
-        bitField0_ |= 0x00000001;
+
         onChanged();
         return getErrorFieldBuilder().getBuilder();
       }
@@ -758,6 +744,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new MultipleDetails();
     }
 
+    @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.showcase.v1beta1.EchoOuterClass
           .internal_static_google_showcase_v1beta1_EchoErrorDetailsResponse_MultipleDetails_descriptor;
@@ -773,7 +764,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
               com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails.Builder.class);
     }
 
-    private int bitField0_;
     public static final int ERROR_FIELD_NUMBER = 1;
     private com.google.showcase.v1beta1.ErrorWithMultipleDetails error_;
 
@@ -784,7 +774,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      */
     @java.lang.Override
     public boolean hasError() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return error_ != null;
     }
 
     /**
@@ -802,9 +792,7 @@ public com.google.showcase.v1beta1.ErrorWithMultipleDetails getError() {
     /** .google.showcase.v1beta1.ErrorWithMultipleDetails error = 1; */
     @java.lang.Override
     public com.google.showcase.v1beta1.ErrorWithMultipleDetailsOrBuilder getErrorOrBuilder() {
-      return error_ == null
-          ? com.google.showcase.v1beta1.ErrorWithMultipleDetails.getDefaultInstance()
-          : error_;
+      return getError();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -821,7 +809,7 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (error_ != null) {
         output.writeMessage(1, getError());
       }
       getUnknownFields().writeTo(output);
@@ -833,7 +821,7 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (error_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getError());
       }
       size += getUnknownFields().getSerializedSize();
@@ -998,28 +986,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
       // Construct using
       // com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getErrorFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
-        error_ = null;
-        if (errorBuilder_ != null) {
-          errorBuilder_.dispose();
+        if (errorBuilder_ == null) {
+          error_ = null;
+        } else {
+          error_ = null;
           errorBuilder_ = null;
         }
         return this;
@@ -1052,24 +1031,15 @@ public com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails buil
       public com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails buildPartial() {
         com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails result =
             new com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        if (errorBuilder_ == null) {
+          result.error_ = error_;
+        } else {
+          result.error_ = errorBuilder_.build();
         }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(
-          com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails result) {
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.error_ = errorBuilder_ == null ? error_ : errorBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        result.bitField0_ |= to_bitField0_;
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -1153,7 +1123,7 @@ public Builder mergeFrom(
               case 10:
                 {
                   input.readMessage(getErrorFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               default:
@@ -1173,8 +1143,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private com.google.showcase.v1beta1.ErrorWithMultipleDetails error_;
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.showcase.v1beta1.ErrorWithMultipleDetails,
@@ -1188,7 +1156,7 @@ public Builder mergeFrom(
        * @return Whether the error field is set.
        */
       public boolean hasError() {
-        return ((bitField0_ & 0x00000001) != 0);
+        return errorBuilder_ != null || error_ != null;
       }
 
       /**
@@ -1213,11 +1181,11 @@ public Builder setError(com.google.showcase.v1beta1.ErrorWithMultipleDetails val
             throw new NullPointerException();
           }
           error_ = value;
+          onChanged();
         } else {
           errorBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+
         return this;
       }
 
@@ -1226,50 +1194,49 @@ public Builder setError(
           com.google.showcase.v1beta1.ErrorWithMultipleDetails.Builder builderForValue) {
         if (errorBuilder_ == null) {
           error_ = builderForValue.build();
+          onChanged();
         } else {
           errorBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+
         return this;
       }
 
       /** .google.showcase.v1beta1.ErrorWithMultipleDetails error = 1; */
       public Builder mergeError(com.google.showcase.v1beta1.ErrorWithMultipleDetails value) {
         if (errorBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)
-              && error_ != null
-              && error_
-                  != com.google.showcase.v1beta1.ErrorWithMultipleDetails.getDefaultInstance()) {
-            getErrorBuilder().mergeFrom(value);
+          if (error_ != null) {
+            error_ =
+                com.google.showcase.v1beta1.ErrorWithMultipleDetails.newBuilder(error_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             error_ = value;
           }
+          onChanged();
         } else {
           errorBuilder_.mergeFrom(value);
         }
-        if (error_ != null) {
-          bitField0_ |= 0x00000001;
-          onChanged();
-        }
+
         return this;
       }
 
       /** .google.showcase.v1beta1.ErrorWithMultipleDetails error = 1; */
       public Builder clearError() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        error_ = null;
-        if (errorBuilder_ != null) {
-          errorBuilder_.dispose();
+        if (errorBuilder_ == null) {
+          error_ = null;
+          onChanged();
+        } else {
+          error_ = null;
           errorBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
       /** .google.showcase.v1beta1.ErrorWithMultipleDetails error = 1; */
       public com.google.showcase.v1beta1.ErrorWithMultipleDetails.Builder getErrorBuilder() {
-        bitField0_ |= 0x00000001;
+
         onChanged();
         return getErrorFieldBuilder().getBuilder();
       }
@@ -1370,7 +1337,6 @@ public com.google.protobuf.Parser getParserForType() {
     }
   }
 
-  private int bitField0_;
   public static final int SINGLE_DETAIL_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail singleDetail_;
 
@@ -1381,7 +1347,7 @@ public com.google.protobuf.Parser getParserForType() {
    */
   @java.lang.Override
   public boolean hasSingleDetail() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return singleDetail_ != null;
   }
 
   /**
@@ -1402,9 +1368,7 @@ public com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail getSing
   @java.lang.Override
   public com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetailOrBuilder
       getSingleDetailOrBuilder() {
-    return singleDetail_ == null
-        ? com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail.getDefaultInstance()
-        : singleDetail_;
+    return getSingleDetail();
   }
 
   public static final int MULTIPLE_DETAILS_FIELD_NUMBER = 2;
@@ -1418,7 +1382,7 @@ public com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail getSing
    */
   @java.lang.Override
   public boolean hasMultipleDetails() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return multipleDetails_ != null;
   }
 
   /**
@@ -1441,9 +1405,7 @@ public com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails getM
   @java.lang.Override
   public com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetailsOrBuilder
       getMultipleDetailsOrBuilder() {
-    return multipleDetails_ == null
-        ? com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails.getDefaultInstance()
-        : multipleDetails_;
+    return getMultipleDetails();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -1460,10 +1422,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (singleDetail_ != null) {
       output.writeMessage(1, getSingleDetail());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (multipleDetails_ != null) {
       output.writeMessage(2, getMultipleDetails());
     }
     getUnknownFields().writeTo(output);
@@ -1475,10 +1437,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (singleDetail_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getSingleDetail());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (multipleDetails_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getMultipleDetails());
     }
     size += getUnknownFields().getSerializedSize();
@@ -1654,34 +1616,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.EchoErrorDetailsResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getSingleDetailFieldBuilder();
-        getMultipleDetailsFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      singleDetail_ = null;
-      if (singleDetailBuilder_ != null) {
-        singleDetailBuilder_.dispose();
+      if (singleDetailBuilder_ == null) {
+        singleDetail_ = null;
+      } else {
+        singleDetail_ = null;
         singleDetailBuilder_ = null;
       }
-      multipleDetails_ = null;
-      if (multipleDetailsBuilder_ != null) {
-        multipleDetailsBuilder_.dispose();
+      if (multipleDetailsBuilder_ == null) {
+        multipleDetails_ = null;
+      } else {
+        multipleDetails_ = null;
         multipleDetailsBuilder_ = null;
       }
       return this;
@@ -1711,29 +1664,20 @@ public com.google.showcase.v1beta1.EchoErrorDetailsResponse build() {
     public com.google.showcase.v1beta1.EchoErrorDetailsResponse buildPartial() {
       com.google.showcase.v1beta1.EchoErrorDetailsResponse result =
           new com.google.showcase.v1beta1.EchoErrorDetailsResponse(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (singleDetailBuilder_ == null) {
+        result.singleDetail_ = singleDetail_;
+      } else {
+        result.singleDetail_ = singleDetailBuilder_.build();
+      }
+      if (multipleDetailsBuilder_ == null) {
+        result.multipleDetails_ = multipleDetails_;
+      } else {
+        result.multipleDetails_ = multipleDetailsBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.EchoErrorDetailsResponse result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.singleDetail_ =
-            singleDetailBuilder_ == null ? singleDetail_ : singleDetailBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.multipleDetails_ =
-            multipleDetailsBuilder_ == null ? multipleDetails_ : multipleDetailsBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1815,13 +1759,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getSingleDetailFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getMultipleDetailsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1841,8 +1785,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail singleDetail_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail,
@@ -1857,7 +1799,7 @@ public Builder mergeFrom(
      * @return Whether the singleDetail field is set.
      */
     public boolean hasSingleDetail() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return singleDetailBuilder_ != null || singleDetail_ != null;
     }
 
     /**
@@ -1887,11 +1829,11 @@ public Builder setSingleDetail(
           throw new NullPointerException();
         }
         singleDetail_ = value;
+        onChanged();
       } else {
         singleDetailBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -1903,11 +1845,11 @@ public Builder setSingleDetail(
         com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail.Builder builderForValue) {
       if (singleDetailBuilder_ == null) {
         singleDetail_ = builderForValue.build();
+        onChanged();
       } else {
         singleDetailBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -1918,22 +1860,20 @@ public Builder setSingleDetail(
     public Builder mergeSingleDetail(
         com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail value) {
       if (singleDetailBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && singleDetail_ != null
-            && singleDetail_
-                != com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail
-                    .getDefaultInstance()) {
-          getSingleDetailBuilder().mergeFrom(value);
+        if (singleDetail_ != null) {
+          singleDetail_ =
+              com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail.newBuilder(
+                      singleDetail_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           singleDetail_ = value;
         }
+        onChanged();
       } else {
         singleDetailBuilder_.mergeFrom(value);
       }
-      if (singleDetail_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1942,13 +1882,14 @@ public Builder mergeSingleDetail(
      * 
      */
     public Builder clearSingleDetail() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      singleDetail_ = null;
-      if (singleDetailBuilder_ != null) {
-        singleDetailBuilder_.dispose();
+      if (singleDetailBuilder_ == null) {
+        singleDetail_ = null;
+        onChanged();
+      } else {
+        singleDetail_ = null;
         singleDetailBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1958,7 +1899,7 @@ public Builder clearSingleDetail() {
      */
     public com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail.Builder
         getSingleDetailBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getSingleDetailFieldBuilder().getBuilder();
     }
@@ -2013,7 +1954,7 @@ public Builder clearSingleDetail() {
      * @return Whether the multipleDetails field is set.
      */
     public boolean hasMultipleDetails() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return multipleDetailsBuilder_ != null || multipleDetails_ != null;
     }
 
     /**
@@ -2045,11 +1986,11 @@ public Builder setMultipleDetails(
           throw new NullPointerException();
         }
         multipleDetails_ = value;
+        onChanged();
       } else {
         multipleDetailsBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -2062,11 +2003,11 @@ public Builder setMultipleDetails(
             builderForValue) {
       if (multipleDetailsBuilder_ == null) {
         multipleDetails_ = builderForValue.build();
+        onChanged();
       } else {
         multipleDetailsBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -2077,22 +2018,20 @@ public Builder setMultipleDetails(
     public Builder mergeMultipleDetails(
         com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails value) {
       if (multipleDetailsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && multipleDetails_ != null
-            && multipleDetails_
-                != com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails
-                    .getDefaultInstance()) {
-          getMultipleDetailsBuilder().mergeFrom(value);
+        if (multipleDetails_ != null) {
+          multipleDetails_ =
+              com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails.newBuilder(
+                      multipleDetails_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           multipleDetails_ = value;
         }
+        onChanged();
       } else {
         multipleDetailsBuilder_.mergeFrom(value);
       }
-      if (multipleDetails_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -2101,13 +2040,14 @@ public Builder mergeMultipleDetails(
      * 
      */
     public Builder clearMultipleDetails() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      multipleDetails_ = null;
-      if (multipleDetailsBuilder_ != null) {
-        multipleDetailsBuilder_.dispose();
+      if (multipleDetailsBuilder_ == null) {
+        multipleDetails_ = null;
+        onChanged();
+      } else {
+        multipleDetails_ = null;
         multipleDetailsBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -2117,7 +2057,7 @@ public Builder clearMultipleDetails() {
      */
     public com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails.Builder
         getMultipleDetailsBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getMultipleDetailsFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsResponseOrBuilder.java
index f7d1dc0eef..bb1f10f76c 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface EchoErrorDetailsResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoOuterClass.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoOuterClass.java
index 82e0ab50fc..5c73f5d3e1 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoOuterClass.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoOuterClass.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public final class EchoOuterClass {
@@ -243,8 +242,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "DetailsRequest\0324.google.showcase.v1beta1"
           + ".FailEchoWithDetailsResponse\"(\202\323\344\223\002\"\"\035/v1beta1/echo:failWithDetails:\001*\022\212\001\n"
           + "\006Expand\022&.google.showcase.v1beta1.ExpandReques"
-          + "t\032%.google.showcase.v1beta1.EchoResponse\"/\332A\r"
-          + "content,error\202\323\344\223\002\031\"\024/v1beta1/echo:expand:\001*0\001\022z\n"
+          + "t\032%.google.showcase.v1beta1.EchoResponse\"/\202\323\344\223\002\031\"\024/v1beta1/echo:expand:\001*\332A\r"
+          + "content,error0\001\022z\n"
           + "\007Collect\022$.google.showcase"
           + ".v1beta1.EchoRequest\032%.google.showcase.v1beta1.EchoResponse\""
           + " \202\323\344\223\002\032\"\025/v1beta1/echo:collect:\001*(\001\022W\n"
@@ -259,10 +258,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\027PagedExpandLegacyMapped\022+.google.showcase.v1beta1.PagedExpandRe"
           + "quest\0328.google.showcase.v1beta1.PagedExp"
           + "andLegacyMappedResponse\"0\202\323\344\223\002*\"%/v1beta1/echo:pagedExpandLegacyMapped:\001*\022\211\001\n"
-          + "\004Wa"
-          + "it\022$.google.showcase.v1beta1.WaitRequest\032\035.google.longrunning.Operation\"<\312A\034\n"
-          + "\014Wa"
-          + "itResponse\022\014WaitMetadata\202\323\344\223\002\027\"\022/v1beta1/echo:wait:\001*\022v\n"
+          + "\004Wait\022$.google.showcase.v1beta1.WaitRequest"
+          + "\032\035.google.longrunning.Operation\"<\202\323\344\223\002\027\"\022/v1beta1/echo:wait:\001*\312A\034\n"
+          + "\014WaitResponse\022\014WaitMetadata\022v\n"
           + "\005Block\022%.google.showcase.v1beta1.BlockRequest\032&.google.showcase."
           + "v1beta1.BlockResponse\"\036\202\323\344\223\002\030\"\023/v1beta1/"
           + "echo:block:\001*\032\"\312A\016localhost:7469\212\324\333\322\017\013v1_20240408Bq\n"
@@ -298,6 +296,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "RequestId",
               "OtherRequestId",
               "Response",
+              "OtherRequestId",
             });
     internal_static_google_showcase_v1beta1_EchoResponse_descriptor =
         getDescriptor().getMessageTypes().get(1);
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequest.java
index 48854d9a4e..42f04d5088 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -56,6 +55,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new EchoRequest();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_EchoRequest_descriptor;
@@ -73,8 +77,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   private int bitField0_;
   private int responseCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object response_;
 
   public enum ResponseCase
@@ -250,7 +252,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
   }
 
   public static final int SEVERITY_FIELD_NUMBER = 3;
-  private int severity_ = 0;
+  private int severity_;
 
   /**
    *
@@ -281,15 +283,14 @@ public int getSeverityValue() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.Severity getSeverity() {
+    @SuppressWarnings("deprecation")
     com.google.showcase.v1beta1.Severity result =
-        com.google.showcase.v1beta1.Severity.forNumber(severity_);
+        com.google.showcase.v1beta1.Severity.valueOf(severity_);
     return result == null ? com.google.showcase.v1beta1.Severity.UNRECOGNIZED : result;
   }
 
   public static final int HEADER_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object header_ = "";
+  private volatile java.lang.Object header_;
 
   /**
    *
@@ -340,9 +341,7 @@ public com.google.protobuf.ByteString getHeaderBytes() {
   }
 
   public static final int OTHER_HEADER_FIELD_NUMBER = 5;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object otherHeader_ = "";
+  private volatile java.lang.Object otherHeader_;
 
   /**
    *
@@ -393,9 +392,7 @@ public com.google.protobuf.ByteString getOtherHeaderBytes() {
   }
 
   public static final int REQUEST_ID_FIELD_NUMBER = 7;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object requestId_ = "";
+  private volatile java.lang.Object requestId_;
 
   /**
    *
@@ -446,9 +443,7 @@ public com.google.protobuf.ByteString getRequestIdBytes() {
   }
 
   public static final int OTHER_REQUEST_ID_FIELD_NUMBER = 8;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object otherRequestId_ = "";
+  private volatile java.lang.Object otherRequestId_;
 
   /**
    *
@@ -792,15 +787,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (errorBuilder_ != null) {
         errorBuilder_.clear();
       }
       severity_ = 0;
+
       header_ = "";
+
       otherHeader_ = "";
+
       requestId_ = "";
+
       otherRequestId_ = "";
+      bitField0_ = (bitField0_ & ~0x00000001);
       responseCase_ = 0;
       response_ = null;
       return this;
@@ -830,42 +829,30 @@ public com.google.showcase.v1beta1.EchoRequest build() {
     public com.google.showcase.v1beta1.EchoRequest buildPartial() {
       com.google.showcase.v1beta1.EchoRequest result =
           new com.google.showcase.v1beta1.EchoRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      buildPartialOneofs(result);
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.EchoRequest result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.severity_ = severity_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.header_ = header_;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.otherHeader_ = otherHeader_;
+      int to_bitField0_ = 0;
+      if (responseCase_ == 1) {
+        result.response_ = response_;
       }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.requestId_ = requestId_;
+      if (responseCase_ == 2) {
+        if (errorBuilder_ == null) {
+          result.response_ = response_;
+        } else {
+          result.response_ = errorBuilder_.build();
+        }
       }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.otherRequestId_ = otherRequestId_;
+      result.severity_ = severity_;
+      result.header_ = header_;
+      result.otherHeader_ = otherHeader_;
+      result.requestId_ = requestId_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
         to_bitField0_ |= 0x00000001;
       }
-      result.bitField0_ |= to_bitField0_;
-    }
-
-    private void buildPartialOneofs(com.google.showcase.v1beta1.EchoRequest result) {
+      result.otherRequestId_ = otherRequestId_;
+      result.bitField0_ = to_bitField0_;
       result.responseCase_ = responseCase_;
-      result.response_ = this.response_;
-      if (responseCase_ == 2 && errorBuilder_ != null) {
-        result.response_ = errorBuilder_.build();
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -918,22 +905,19 @@ public Builder mergeFrom(com.google.showcase.v1beta1.EchoRequest other) {
       }
       if (!other.getHeader().isEmpty()) {
         header_ = other.header_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (!other.getOtherHeader().isEmpty()) {
         otherHeader_ = other.otherHeader_;
-        bitField0_ |= 0x00000010;
         onChanged();
       }
       if (!other.getRequestId().isEmpty()) {
         requestId_ = other.requestId_;
-        bitField0_ |= 0x00000020;
         onChanged();
       }
       if (other.hasOtherRequestId()) {
+        bitField0_ |= 0x00000001;
         otherRequestId_ = other.otherRequestId_;
-        bitField0_ |= 0x00000040;
         onChanged();
       }
       switch (other.getResponseCase()) {
@@ -996,31 +980,31 @@ public Builder mergeFrom(
             case 24:
               {
                 severity_ = input.readEnum();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 34:
               {
                 header_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             case 42:
               {
                 otherHeader_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 42
             case 58:
               {
                 requestId_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 58
             case 66:
               {
                 otherRequestId_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000040;
+                bitField0_ |= 0x00000001;
                 break;
               } // case 66
             default:
@@ -1401,6 +1385,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
       }
       responseCase_ = 2;
       onChanged();
+      ;
       return errorBuilder_;
     }
 
@@ -1435,8 +1420,8 @@ public int getSeverityValue() {
      * @return This builder for chaining.
      */
     public Builder setSeverityValue(int value) {
+
       severity_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1454,8 +1439,9 @@ public Builder setSeverityValue(int value) {
      */
     @java.lang.Override
     public com.google.showcase.v1beta1.Severity getSeverity() {
+      @SuppressWarnings("deprecation")
       com.google.showcase.v1beta1.Severity result =
-          com.google.showcase.v1beta1.Severity.forNumber(severity_);
+          com.google.showcase.v1beta1.Severity.valueOf(severity_);
       return result == null ? com.google.showcase.v1beta1.Severity.UNRECOGNIZED : result;
     }
 
@@ -1475,7 +1461,7 @@ public Builder setSeverity(com.google.showcase.v1beta1.Severity value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000004;
+
       severity_ = value.getNumber();
       onChanged();
       return this;
@@ -1493,7 +1479,7 @@ public Builder setSeverity(com.google.showcase.v1beta1.Severity value) {
      * @return This builder for chaining.
      */
     public Builder clearSeverity() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       severity_ = 0;
       onChanged();
       return this;
@@ -1563,8 +1549,8 @@ public Builder setHeader(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       header_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1581,8 +1567,8 @@ public Builder setHeader(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearHeader() {
+
       header_ = getDefaultInstance().getHeader();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1604,8 +1590,8 @@ public Builder setHeaderBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       header_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1674,8 +1660,8 @@ public Builder setOtherHeader(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       otherHeader_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1692,8 +1678,8 @@ public Builder setOtherHeader(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearOtherHeader() {
+
       otherHeader_ = getDefaultInstance().getOtherHeader();
-      bitField0_ = (bitField0_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -1715,8 +1701,8 @@ public Builder setOtherHeaderBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       otherHeader_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1785,8 +1771,8 @@ public Builder setRequestId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       requestId_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1803,8 +1789,8 @@ public Builder setRequestId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearRequestId() {
+
       requestId_ = getDefaultInstance().getRequestId();
-      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -1826,8 +1812,8 @@ public Builder setRequestIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       requestId_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1846,7 +1832,7 @@ public Builder setRequestIdBytes(com.google.protobuf.ByteString value) {
      * @return Whether the otherRequestId field is set.
      */
     public boolean hasOtherRequestId() {
-      return ((bitField0_ & 0x00000040) != 0);
+      return ((bitField0_ & 0x00000001) != 0);
     }
 
     /**
@@ -1911,8 +1897,8 @@ public Builder setOtherRequestId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+      bitField0_ |= 0x00000001;
       otherRequestId_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1929,8 +1915,8 @@ public Builder setOtherRequestId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearOtherRequestId() {
+      bitField0_ = (bitField0_ & ~0x00000001);
       otherRequestId_ = getDefaultInstance().getOtherRequestId();
-      bitField0_ = (bitField0_ & ~0x00000040);
       onChanged();
       return this;
     }
@@ -1952,8 +1938,8 @@ public Builder setOtherRequestIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+      bitField0_ |= 0x00000001;
       otherRequestId_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequestOrBuilder.java
index 798280c899..6abd7f146d 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface EchoRequestOrBuilder
@@ -243,5 +242,5 @@ public interface EchoRequestOrBuilder
    */
   com.google.protobuf.ByteString getOtherRequestIdBytes();
 
-  com.google.showcase.v1beta1.EchoRequest.ResponseCase getResponseCase();
+  public com.google.showcase.v1beta1.EchoRequest.ResponseCase getResponseCase();
 }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoResponse.java
index a9567a558d..324171da9c 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new EchoResponse();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_EchoResponse_descriptor;
@@ -68,9 +72,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONTENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object content_ = "";
+  private volatile java.lang.Object content_;
 
   /**
    *
@@ -121,7 +123,7 @@ public com.google.protobuf.ByteString getContentBytes() {
   }
 
   public static final int SEVERITY_FIELD_NUMBER = 2;
-  private int severity_ = 0;
+  private int severity_;
 
   /**
    *
@@ -152,15 +154,14 @@ public int getSeverityValue() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.Severity getSeverity() {
+    @SuppressWarnings("deprecation")
     com.google.showcase.v1beta1.Severity result =
-        com.google.showcase.v1beta1.Severity.forNumber(severity_);
+        com.google.showcase.v1beta1.Severity.valueOf(severity_);
     return result == null ? com.google.showcase.v1beta1.Severity.UNRECOGNIZED : result;
   }
 
   public static final int REQUEST_ID_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object requestId_ = "";
+  private volatile java.lang.Object requestId_;
 
   /**
    *
@@ -211,9 +212,7 @@ public com.google.protobuf.ByteString getRequestIdBytes() {
   }
 
   public static final int OTHER_REQUEST_ID_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object otherRequestId_ = "";
+  private volatile java.lang.Object otherRequestId_;
 
   /**
    *
@@ -487,11 +486,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       content_ = "";
+
       severity_ = 0;
+
       requestId_ = "";
+
       otherRequestId_ = "";
+
       return this;
     }
 
@@ -519,29 +521,14 @@ public com.google.showcase.v1beta1.EchoResponse build() {
     public com.google.showcase.v1beta1.EchoResponse buildPartial() {
       com.google.showcase.v1beta1.EchoResponse result =
           new com.google.showcase.v1beta1.EchoResponse(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.content_ = content_;
+      result.severity_ = severity_;
+      result.requestId_ = requestId_;
+      result.otherRequestId_ = otherRequestId_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.EchoResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.content_ = content_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.severity_ = severity_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.requestId_ = requestId_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.otherRequestId_ = otherRequestId_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -589,7 +576,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.EchoResponse other) {
       if (other == com.google.showcase.v1beta1.EchoResponse.getDefaultInstance()) return this;
       if (!other.getContent().isEmpty()) {
         content_ = other.content_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.severity_ != 0) {
@@ -597,12 +583,10 @@ public Builder mergeFrom(com.google.showcase.v1beta1.EchoResponse other) {
       }
       if (!other.getRequestId().isEmpty()) {
         requestId_ = other.requestId_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (!other.getOtherRequestId().isEmpty()) {
         otherRequestId_ = other.otherRequestId_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -634,25 +618,25 @@ public Builder mergeFrom(
             case 10:
               {
                 content_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 severity_ = input.readEnum();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 requestId_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 otherRequestId_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             default:
@@ -672,8 +656,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object content_ = "";
 
     /**
@@ -738,8 +720,8 @@ public Builder setContent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       content_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -756,8 +738,8 @@ public Builder setContent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearContent() {
+
       content_ = getDefaultInstance().getContent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -779,8 +761,8 @@ public Builder setContentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       content_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -816,8 +798,8 @@ public int getSeverityValue() {
      * @return This builder for chaining.
      */
     public Builder setSeverityValue(int value) {
+
       severity_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -835,8 +817,9 @@ public Builder setSeverityValue(int value) {
      */
     @java.lang.Override
     public com.google.showcase.v1beta1.Severity getSeverity() {
+      @SuppressWarnings("deprecation")
       com.google.showcase.v1beta1.Severity result =
-          com.google.showcase.v1beta1.Severity.forNumber(severity_);
+          com.google.showcase.v1beta1.Severity.valueOf(severity_);
       return result == null ? com.google.showcase.v1beta1.Severity.UNRECOGNIZED : result;
     }
 
@@ -856,7 +839,7 @@ public Builder setSeverity(com.google.showcase.v1beta1.Severity value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000002;
+
       severity_ = value.getNumber();
       onChanged();
       return this;
@@ -874,7 +857,7 @@ public Builder setSeverity(com.google.showcase.v1beta1.Severity value) {
      * @return This builder for chaining.
      */
     public Builder clearSeverity() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       severity_ = 0;
       onChanged();
       return this;
@@ -944,8 +927,8 @@ public Builder setRequestId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       requestId_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -962,8 +945,8 @@ public Builder setRequestId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearRequestId() {
+
       requestId_ = getDefaultInstance().getRequestId();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -985,8 +968,8 @@ public Builder setRequestIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       requestId_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1055,8 +1038,8 @@ public Builder setOtherRequestId(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       otherRequestId_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1073,8 +1056,8 @@ public Builder setOtherRequestId(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearOtherRequestId() {
+
       otherRequestId_ = getDefaultInstance().getOtherRequestId();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1096,8 +1079,8 @@ public Builder setOtherRequestIdBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       otherRequestId_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoResponseOrBuilder.java
index 74bddf13ca..06a060f86b 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface EchoResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumRequest.java
index 97837ea842..0e23b997c5 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.EnumRequest} */
@@ -39,6 +38,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new EnumRequest();
   }
 
+  @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.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_EnumRequest_descriptor;
@@ -55,7 +59,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int UNKNOWN_ENUM_FIELD_NUMBER = 1;
-  private boolean unknownEnum_ = false;
+  private boolean unknownEnum_;
 
   /**
    *
@@ -262,8 +266,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       unknownEnum_ = false;
+
       return this;
     }
 
@@ -291,20 +295,11 @@ public com.google.showcase.v1beta1.EnumRequest build() {
     public com.google.showcase.v1beta1.EnumRequest buildPartial() {
       com.google.showcase.v1beta1.EnumRequest result =
           new com.google.showcase.v1beta1.EnumRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.unknownEnum_ = unknownEnum_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.EnumRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.unknownEnum_ = unknownEnum_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -382,7 +377,7 @@ public Builder mergeFrom(
             case 8:
               {
                 unknownEnum_ = input.readBool();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             default:
@@ -402,8 +397,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private boolean unknownEnum_;
 
     /**
@@ -437,7 +430,6 @@ public boolean getUnknownEnum() {
     public Builder setUnknownEnum(boolean value) {
 
       unknownEnum_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -454,7 +446,7 @@ public Builder setUnknownEnum(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearUnknownEnum() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       unknownEnum_ = false;
       onChanged();
       return this;
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumRequestOrBuilder.java
index 6d39e99175..69854016d5 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface EnumRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumResponse.java
index 7c9ac5901d..9d91956c93 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.EnumResponse} */
@@ -41,6 +40,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new EnumResponse();
   }
 
+  @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.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_EnumResponse_descriptor;
@@ -56,7 +60,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.EnumResponse.Builder.class);
   }
 
-  private int bitField0_;
   public static final int REQUEST_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.EnumRequest request_;
 
@@ -73,7 +76,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasRequest() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return request_ != null;
   }
 
   /**
@@ -105,13 +108,11 @@ public com.google.showcase.v1beta1.EnumRequest getRequest() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.EnumRequestOrBuilder getRequestOrBuilder() {
-    return request_ == null
-        ? com.google.showcase.v1beta1.EnumRequest.getDefaultInstance()
-        : request_;
+    return getRequest();
   }
 
   public static final int CONTINENT_FIELD_NUMBER = 2;
-  private int continent_ = 0;
+  private int continent_;
 
   /**
    *
@@ -142,8 +143,9 @@ public int getContinentValue() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.Continent getContinent() {
+    @SuppressWarnings("deprecation")
     com.google.showcase.v1beta1.Continent result =
-        com.google.showcase.v1beta1.Continent.forNumber(continent_);
+        com.google.showcase.v1beta1.Continent.valueOf(continent_);
     return result == null ? com.google.showcase.v1beta1.Continent.UNRECOGNIZED : result;
   }
 
@@ -161,7 +163,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (request_ != null) {
       output.writeMessage(1, getRequest());
     }
     if (continent_ != com.google.showcase.v1beta1.Continent.CONTINENT_UNSPECIFIED.getNumber()) {
@@ -176,7 +178,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (request_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getRequest());
     }
     if (continent_ != com.google.showcase.v1beta1.Continent.CONTINENT_UNSPECIFIED.getNumber()) {
@@ -341,31 +343,23 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.EnumResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getRequestFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      request_ = null;
-      if (requestBuilder_ != null) {
-        requestBuilder_.dispose();
+      if (requestBuilder_ == null) {
+        request_ = null;
+      } else {
+        request_ = null;
         requestBuilder_ = null;
       }
       continent_ = 0;
+
       return this;
     }
 
@@ -393,26 +387,16 @@ public com.google.showcase.v1beta1.EnumResponse build() {
     public com.google.showcase.v1beta1.EnumResponse buildPartial() {
       com.google.showcase.v1beta1.EnumResponse result =
           new com.google.showcase.v1beta1.EnumResponse(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (requestBuilder_ == null) {
+        result.request_ = request_;
+      } else {
+        result.request_ = requestBuilder_.build();
       }
+      result.continent_ = continent_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.EnumResponse result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.request_ = requestBuilder_ == null ? request_ : requestBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.continent_ = continent_;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -493,13 +477,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getRequestFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 continent_ = input.readEnum();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             default:
@@ -519,8 +503,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.showcase.v1beta1.EnumRequest request_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.showcase.v1beta1.EnumRequest,
@@ -540,7 +522,7 @@ public Builder mergeFrom(
      * @return Whether the request field is set.
      */
     public boolean hasRequest() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return requestBuilder_ != null || request_ != null;
     }
 
     /**
@@ -579,11 +561,11 @@ public Builder setRequest(com.google.showcase.v1beta1.EnumRequest value) {
           throw new NullPointerException();
         }
         request_ = value;
+        onChanged();
       } else {
         requestBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -599,11 +581,11 @@ public Builder setRequest(com.google.showcase.v1beta1.EnumRequest value) {
     public Builder setRequest(com.google.showcase.v1beta1.EnumRequest.Builder builderForValue) {
       if (requestBuilder_ == null) {
         request_ = builderForValue.build();
+        onChanged();
       } else {
         requestBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -618,20 +600,19 @@ public Builder setRequest(com.google.showcase.v1beta1.EnumRequest.Builder builde
      */
     public Builder mergeRequest(com.google.showcase.v1beta1.EnumRequest value) {
       if (requestBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && request_ != null
-            && request_ != com.google.showcase.v1beta1.EnumRequest.getDefaultInstance()) {
-          getRequestBuilder().mergeFrom(value);
+        if (request_ != null) {
+          request_ =
+              com.google.showcase.v1beta1.EnumRequest.newBuilder(request_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           request_ = value;
         }
+        onChanged();
       } else {
         requestBuilder_.mergeFrom(value);
       }
-      if (request_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -645,13 +626,14 @@ public Builder mergeRequest(com.google.showcase.v1beta1.EnumRequest value) {
      * .google.showcase.v1beta1.EnumRequest request = 1;
      */
     public Builder clearRequest() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      request_ = null;
-      if (requestBuilder_ != null) {
-        requestBuilder_.dispose();
+      if (requestBuilder_ == null) {
+        request_ = null;
+        onChanged();
+      } else {
+        request_ = null;
         requestBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -665,7 +647,7 @@ public Builder clearRequest() {
      * .google.showcase.v1beta1.EnumRequest request = 1;
      */
     public com.google.showcase.v1beta1.EnumRequest.Builder getRequestBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getRequestFieldBuilder().getBuilder();
     }
@@ -746,8 +728,8 @@ public int getContinentValue() {
      * @return This builder for chaining.
      */
     public Builder setContinentValue(int value) {
+
       continent_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -765,8 +747,9 @@ public Builder setContinentValue(int value) {
      */
     @java.lang.Override
     public com.google.showcase.v1beta1.Continent getContinent() {
+      @SuppressWarnings("deprecation")
       com.google.showcase.v1beta1.Continent result =
-          com.google.showcase.v1beta1.Continent.forNumber(continent_);
+          com.google.showcase.v1beta1.Continent.valueOf(continent_);
       return result == null ? com.google.showcase.v1beta1.Continent.UNRECOGNIZED : result;
     }
 
@@ -786,7 +769,7 @@ public Builder setContinent(com.google.showcase.v1beta1.Continent value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000002;
+
       continent_ = value.getNumber();
       onChanged();
       return this;
@@ -804,7 +787,7 @@ public Builder setContinent(com.google.showcase.v1beta1.Continent value) {
      * @return This builder for chaining.
      */
     public Builder clearContinent() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       continent_ = 0;
       onChanged();
       return this;
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumResponseOrBuilder.java
index 613ac68126..24aa273d73 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface EnumResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithMultipleDetails.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithMultipleDetails.java
index aafc4cec91..1014957620 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithMultipleDetails.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithMultipleDetails.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.ErrorWithMultipleDetails} */
@@ -41,6 +40,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ErrorWithMultipleDetails();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_ErrorWithMultipleDetails_descriptor;
@@ -57,8 +61,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int DETAILS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List details_;
 
   /** repeated .google.protobuf.Any details = 1; */
@@ -283,7 +285,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (detailsBuilder_ == null) {
         details_ = java.util.Collections.emptyList();
       } else {
@@ -318,16 +319,7 @@ public com.google.showcase.v1beta1.ErrorWithMultipleDetails build() {
     public com.google.showcase.v1beta1.ErrorWithMultipleDetails buildPartial() {
       com.google.showcase.v1beta1.ErrorWithMultipleDetails result =
           new com.google.showcase.v1beta1.ErrorWithMultipleDetails(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(
-        com.google.showcase.v1beta1.ErrorWithMultipleDetails result) {
+      int from_bitField0_ = bitField0_;
       if (detailsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           details_ = java.util.Collections.unmodifiableList(details_);
@@ -337,10 +329,8 @@ private void buildPartialRepeatedFields(
       } else {
         result.details_ = detailsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.ErrorWithMultipleDetails result) {
-      int from_bitField0_ = bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithMultipleDetailsOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithMultipleDetailsOrBuilder.java
index e10993a139..2192bf7742 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithMultipleDetailsOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithMultipleDetailsOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ErrorWithMultipleDetailsOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithSingleDetail.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithSingleDetail.java
index 74fca10806..54cef8c537 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithSingleDetail.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithSingleDetail.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.ErrorWithSingleDetail} */
@@ -39,6 +38,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ErrorWithSingleDetail();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_ErrorWithSingleDetail_descriptor;
@@ -54,7 +58,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.ErrorWithSingleDetail.Builder.class);
   }
 
-  private int bitField0_;
   public static final int DETAILS_FIELD_NUMBER = 1;
   private com.google.protobuf.Any details_;
 
@@ -65,7 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasDetails() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return details_ != null;
   }
 
   /**
@@ -81,7 +84,7 @@ public com.google.protobuf.Any getDetails() {
   /** .google.protobuf.Any details = 1; */
   @java.lang.Override
   public com.google.protobuf.AnyOrBuilder getDetailsOrBuilder() {
-    return details_ == null ? com.google.protobuf.Any.getDefaultInstance() : details_;
+    return getDetails();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -98,7 +101,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (details_ != null) {
       output.writeMessage(1, getDetails());
     }
     getUnknownFields().writeTo(output);
@@ -110,7 +113,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (details_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getDetails());
     }
     size += getUnknownFields().getSerializedSize();
@@ -270,28 +273,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ErrorWithSingleDetail.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getDetailsFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      details_ = null;
-      if (detailsBuilder_ != null) {
-        detailsBuilder_.dispose();
+      if (detailsBuilder_ == null) {
+        details_ = null;
+      } else {
+        details_ = null;
         detailsBuilder_ = null;
       }
       return this;
@@ -321,23 +315,15 @@ public com.google.showcase.v1beta1.ErrorWithSingleDetail build() {
     public com.google.showcase.v1beta1.ErrorWithSingleDetail buildPartial() {
       com.google.showcase.v1beta1.ErrorWithSingleDetail result =
           new com.google.showcase.v1beta1.ErrorWithSingleDetail(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (detailsBuilder_ == null) {
+        result.details_ = details_;
+      } else {
+        result.details_ = detailsBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.ErrorWithSingleDetail result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.details_ = detailsBuilder_ == null ? details_ : detailsBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -416,7 +402,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getDetailsFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -436,8 +422,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.protobuf.Any details_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.protobuf.Any,
@@ -451,7 +435,7 @@ public Builder mergeFrom(
      * @return Whether the details field is set.
      */
     public boolean hasDetails() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return detailsBuilder_ != null || details_ != null;
     }
 
     /**
@@ -474,11 +458,11 @@ public Builder setDetails(com.google.protobuf.Any value) {
           throw new NullPointerException();
         }
         details_ = value;
+        onChanged();
       } else {
         detailsBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -486,49 +470,46 @@ public Builder setDetails(com.google.protobuf.Any value) {
     public Builder setDetails(com.google.protobuf.Any.Builder builderForValue) {
       if (detailsBuilder_ == null) {
         details_ = builderForValue.build();
+        onChanged();
       } else {
         detailsBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
     /** .google.protobuf.Any details = 1; */
     public Builder mergeDetails(com.google.protobuf.Any value) {
       if (detailsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && details_ != null
-            && details_ != com.google.protobuf.Any.getDefaultInstance()) {
-          getDetailsBuilder().mergeFrom(value);
+        if (details_ != null) {
+          details_ = com.google.protobuf.Any.newBuilder(details_).mergeFrom(value).buildPartial();
         } else {
           details_ = value;
         }
+        onChanged();
       } else {
         detailsBuilder_.mergeFrom(value);
       }
-      if (details_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
     /** .google.protobuf.Any details = 1; */
     public Builder clearDetails() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      details_ = null;
-      if (detailsBuilder_ != null) {
-        detailsBuilder_.dispose();
+      if (detailsBuilder_ == null) {
+        details_ = null;
+        onChanged();
+      } else {
+        details_ = null;
         detailsBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
     /** .google.protobuf.Any details = 1; */
     public com.google.protobuf.Any.Builder getDetailsBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getDetailsFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithSingleDetailOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithSingleDetailOrBuilder.java
index 2a5a74d974..adbe5e8f8b 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithSingleDetailOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithSingleDetailOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ErrorWithSingleDetailOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ExpandRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ExpandRequest.java
index a839f866f6..ee2f5406d2 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ExpandRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ExpandRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ExpandRequest();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_ExpandRequest_descriptor;
@@ -64,11 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.ExpandRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int CONTENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object content_ = "";
+  private volatile java.lang.Object content_;
 
   /**
    *
@@ -134,7 +135,7 @@ public com.google.protobuf.ByteString getContentBytes() {
    */
   @java.lang.Override
   public boolean hasError() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return error_ != null;
   }
 
   /**
@@ -164,7 +165,7 @@ public com.google.rpc.Status getError() {
    */
   @java.lang.Override
   public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
-    return error_ == null ? com.google.rpc.Status.getDefaultInstance() : error_;
+    return getError();
   }
 
   public static final int STREAM_WAIT_TIME_FIELD_NUMBER = 3;
@@ -183,7 +184,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
    */
   @java.lang.Override
   public boolean hasStreamWaitTime() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return streamWaitTime_ != null;
   }
 
   /**
@@ -215,9 +216,7 @@ public com.google.protobuf.Duration getStreamWaitTime() {
    */
   @java.lang.Override
   public com.google.protobuf.DurationOrBuilder getStreamWaitTimeOrBuilder() {
-    return streamWaitTime_ == null
-        ? com.google.protobuf.Duration.getDefaultInstance()
-        : streamWaitTime_;
+    return getStreamWaitTime();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -237,10 +236,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(content_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, content_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (error_ != null) {
       output.writeMessage(2, getError());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (streamWaitTime_ != null) {
       output.writeMessage(3, getStreamWaitTime());
     }
     getUnknownFields().writeTo(output);
@@ -255,10 +254,10 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(content_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, content_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (error_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getError());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (streamWaitTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getStreamWaitTime());
     }
     size += getUnknownFields().getSerializedSize();
@@ -437,35 +436,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ExpandRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getErrorFieldBuilder();
-        getStreamWaitTimeFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       content_ = "";
-      error_ = null;
-      if (errorBuilder_ != null) {
-        errorBuilder_.dispose();
+
+      if (errorBuilder_ == null) {
+        error_ = null;
+      } else {
+        error_ = null;
         errorBuilder_ = null;
       }
-      streamWaitTime_ = null;
-      if (streamWaitTimeBuilder_ != null) {
-        streamWaitTimeBuilder_.dispose();
+      if (streamWaitTimeBuilder_ == null) {
+        streamWaitTime_ = null;
+      } else {
+        streamWaitTime_ = null;
         streamWaitTimeBuilder_ = null;
       }
       return this;
@@ -495,31 +486,21 @@ public com.google.showcase.v1beta1.ExpandRequest build() {
     public com.google.showcase.v1beta1.ExpandRequest buildPartial() {
       com.google.showcase.v1beta1.ExpandRequest result =
           new com.google.showcase.v1beta1.ExpandRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.content_ = content_;
+      if (errorBuilder_ == null) {
+        result.error_ = error_;
+      } else {
+        result.error_ = errorBuilder_.build();
+      }
+      if (streamWaitTimeBuilder_ == null) {
+        result.streamWaitTime_ = streamWaitTime_;
+      } else {
+        result.streamWaitTime_ = streamWaitTimeBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.ExpandRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.content_ = content_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.error_ = errorBuilder_ == null ? error_ : errorBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.streamWaitTime_ =
-            streamWaitTimeBuilder_ == null ? streamWaitTime_ : streamWaitTimeBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -567,7 +548,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ExpandRequest other) {
       if (other == com.google.showcase.v1beta1.ExpandRequest.getDefaultInstance()) return this;
       if (!other.getContent().isEmpty()) {
         content_ = other.content_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasError()) {
@@ -605,19 +585,19 @@ public Builder mergeFrom(
             case 10:
               {
                 content_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getErrorFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 input.readMessage(getStreamWaitTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -637,8 +617,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object content_ = "";
 
     /**
@@ -703,8 +681,8 @@ public Builder setContent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       content_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -721,8 +699,8 @@ public Builder setContent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearContent() {
+
       content_ = getDefaultInstance().getContent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -744,8 +722,8 @@ public Builder setContentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       content_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -767,7 +745,7 @@ public Builder setContentBytes(com.google.protobuf.ByteString value) {
      * @return Whether the error field is set.
      */
     public boolean hasError() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return errorBuilder_ != null || error_ != null;
     }
 
     /**
@@ -804,11 +782,11 @@ public Builder setError(com.google.rpc.Status value) {
           throw new NullPointerException();
         }
         error_ = value;
+        onChanged();
       } else {
         errorBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -824,11 +802,11 @@ public Builder setError(com.google.rpc.Status value) {
     public Builder setError(com.google.rpc.Status.Builder builderForValue) {
       if (errorBuilder_ == null) {
         error_ = builderForValue.build();
+        onChanged();
       } else {
         errorBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -843,20 +821,16 @@ public Builder setError(com.google.rpc.Status.Builder builderForValue) {
      */
     public Builder mergeError(com.google.rpc.Status value) {
       if (errorBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && error_ != null
-            && error_ != com.google.rpc.Status.getDefaultInstance()) {
-          getErrorBuilder().mergeFrom(value);
+        if (error_ != null) {
+          error_ = com.google.rpc.Status.newBuilder(error_).mergeFrom(value).buildPartial();
         } else {
           error_ = value;
         }
+        onChanged();
       } else {
         errorBuilder_.mergeFrom(value);
       }
-      if (error_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -870,13 +844,14 @@ public Builder mergeError(com.google.rpc.Status value) {
      * .google.rpc.Status error = 2;
      */
     public Builder clearError() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      error_ = null;
-      if (errorBuilder_ != null) {
-        errorBuilder_.dispose();
+      if (errorBuilder_ == null) {
+        error_ = null;
+        onChanged();
+      } else {
+        error_ = null;
         errorBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -890,7 +865,7 @@ public Builder clearError() {
      * .google.rpc.Status error = 2;
      */
     public com.google.rpc.Status.Builder getErrorBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getErrorFieldBuilder().getBuilder();
     }
@@ -954,7 +929,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
      * @return Whether the streamWaitTime field is set.
      */
     public boolean hasStreamWaitTime() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return streamWaitTimeBuilder_ != null || streamWaitTime_ != null;
     }
 
     /**
@@ -993,11 +968,11 @@ public Builder setStreamWaitTime(com.google.protobuf.Duration value) {
           throw new NullPointerException();
         }
         streamWaitTime_ = value;
+        onChanged();
       } else {
         streamWaitTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1013,11 +988,11 @@ public Builder setStreamWaitTime(com.google.protobuf.Duration value) {
     public Builder setStreamWaitTime(com.google.protobuf.Duration.Builder builderForValue) {
       if (streamWaitTimeBuilder_ == null) {
         streamWaitTime_ = builderForValue.build();
+        onChanged();
       } else {
         streamWaitTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000004;
-      onChanged();
+
       return this;
     }
 
@@ -1032,20 +1007,19 @@ public Builder setStreamWaitTime(com.google.protobuf.Duration.Builder builderFor
      */
     public Builder mergeStreamWaitTime(com.google.protobuf.Duration value) {
       if (streamWaitTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)
-            && streamWaitTime_ != null
-            && streamWaitTime_ != com.google.protobuf.Duration.getDefaultInstance()) {
-          getStreamWaitTimeBuilder().mergeFrom(value);
+        if (streamWaitTime_ != null) {
+          streamWaitTime_ =
+              com.google.protobuf.Duration.newBuilder(streamWaitTime_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           streamWaitTime_ = value;
         }
+        onChanged();
       } else {
         streamWaitTimeBuilder_.mergeFrom(value);
       }
-      if (streamWaitTime_ != null) {
-        bitField0_ |= 0x00000004;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1059,13 +1033,14 @@ public Builder mergeStreamWaitTime(com.google.protobuf.Duration value) {
      * .google.protobuf.Duration stream_wait_time = 3;
      */
     public Builder clearStreamWaitTime() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      streamWaitTime_ = null;
-      if (streamWaitTimeBuilder_ != null) {
-        streamWaitTimeBuilder_.dispose();
+      if (streamWaitTimeBuilder_ == null) {
+        streamWaitTime_ = null;
+        onChanged();
+      } else {
+        streamWaitTime_ = null;
         streamWaitTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1079,7 +1054,7 @@ public Builder clearStreamWaitTime() {
      * .google.protobuf.Duration stream_wait_time = 3;
      */
     public com.google.protobuf.Duration.Builder getStreamWaitTimeBuilder() {
-      bitField0_ |= 0x00000004;
+
       onChanged();
       return getStreamWaitTimeFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ExpandRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ExpandRequestOrBuilder.java
index d10d9fe568..ae2335873e 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ExpandRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ExpandRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ExpandRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsRequest.java
index d38eeda56a..ae977ada41 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new FailEchoWithDetailsRequest();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_FailEchoWithDetailsRequest_descriptor;
@@ -65,9 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int MESSAGE_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object message_ = "";
+  private volatile java.lang.Object message_;
 
   /**
    *
@@ -318,8 +320,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       message_ = "";
+
       return this;
     }
 
@@ -347,20 +349,11 @@ public com.google.showcase.v1beta1.FailEchoWithDetailsRequest build() {
     public com.google.showcase.v1beta1.FailEchoWithDetailsRequest buildPartial() {
       com.google.showcase.v1beta1.FailEchoWithDetailsRequest result =
           new com.google.showcase.v1beta1.FailEchoWithDetailsRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.message_ = message_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.FailEchoWithDetailsRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.message_ = message_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -409,7 +402,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.FailEchoWithDetailsRequest
         return this;
       if (!other.getMessage().isEmpty()) {
         message_ = other.message_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -441,7 +433,7 @@ public Builder mergeFrom(
             case 10:
               {
                 message_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -461,8 +453,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object message_ = "";
 
     /**
@@ -530,8 +520,8 @@ public Builder setMessage(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       message_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -549,8 +539,8 @@ public Builder setMessage(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearMessage() {
+
       message_ = getDefaultInstance().getMessage();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -573,8 +563,8 @@ public Builder setMessageBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       message_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsRequestOrBuilder.java
index e54336c404..ce0fea97b9 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface FailEchoWithDetailsRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsResponse.java
index 3f89f9ae61..8441e6e946 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -48,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new FailEchoWithDetailsResponse();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_FailEchoWithDetailsResponse_descriptor;
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsResponseOrBuilder.java
index ed0ede7c1b..55af89e422 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface FailEchoWithDetailsResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetBlurbRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetBlurbRequest.java
index c15dece9ee..3d56738fe7 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetBlurbRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetBlurbRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GetBlurbRequest();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_GetBlurbRequest_descriptor;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -321,8 +323,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -350,20 +352,11 @@ public com.google.showcase.v1beta1.GetBlurbRequest build() {
     public com.google.showcase.v1beta1.GetBlurbRequest buildPartial() {
       com.google.showcase.v1beta1.GetBlurbRequest result =
           new com.google.showcase.v1beta1.GetBlurbRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.GetBlurbRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -411,7 +404,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.GetBlurbRequest other) {
       if (other == com.google.showcase.v1beta1.GetBlurbRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -443,7 +435,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -463,8 +455,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -535,8 +525,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -555,8 +545,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -580,8 +570,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetBlurbRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetBlurbRequestOrBuilder.java
index 32ab48f1fa..8cf0368c63 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetBlurbRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetBlurbRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface GetBlurbRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetRoomRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetRoomRequest.java
index 256d8c2fc4..2d308af15a 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetRoomRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetRoomRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GetRoomRequest();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_GetRoomRequest_descriptor;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -321,8 +323,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -350,20 +352,11 @@ public com.google.showcase.v1beta1.GetRoomRequest build() {
     public com.google.showcase.v1beta1.GetRoomRequest buildPartial() {
       com.google.showcase.v1beta1.GetRoomRequest result =
           new com.google.showcase.v1beta1.GetRoomRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.GetRoomRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -411,7 +404,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.GetRoomRequest other) {
       if (other == com.google.showcase.v1beta1.GetRoomRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -443,7 +435,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -463,8 +455,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -535,8 +525,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -555,8 +545,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -580,8 +570,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetRoomRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetRoomRequestOrBuilder.java
index 0ad069cfcd..8529a6b78d 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetRoomRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetRoomRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface GetRoomRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSequenceReportRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSequenceReportRequest.java
index 1d3e341ce9..f0d68e011f 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSequenceReportRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSequenceReportRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.GetSequenceReportRequest} */
@@ -41,6 +40,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GetSequenceReportRequest();
   }
 
+  @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.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_GetSequenceReportRequest_descriptor;
@@ -57,9 +61,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    * 
@@ -291,8 +293,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -320,20 +322,11 @@ public com.google.showcase.v1beta1.GetSequenceReportRequest build() {
     public com.google.showcase.v1beta1.GetSequenceReportRequest buildPartial() {
       com.google.showcase.v1beta1.GetSequenceReportRequest result =
           new com.google.showcase.v1beta1.GetSequenceReportRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.GetSequenceReportRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -382,7 +375,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.GetSequenceReportRequest ot
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -414,7 +406,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -434,8 +426,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -488,8 +478,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -502,8 +492,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -521,8 +511,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSequenceReportRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSequenceReportRequestOrBuilder.java
index 57fb66085b..3444856fc6 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSequenceReportRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSequenceReportRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface GetSequenceReportRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSessionRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSessionRequest.java
index e9b129957f..faa10b4174 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSessionRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSessionRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GetSessionRequest();
   }
 
+  @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.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_GetSessionRequest_descriptor;
@@ -65,9 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -315,8 +317,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -344,20 +346,11 @@ public com.google.showcase.v1beta1.GetSessionRequest build() {
     public com.google.showcase.v1beta1.GetSessionRequest buildPartial() {
       com.google.showcase.v1beta1.GetSessionRequest result =
           new com.google.showcase.v1beta1.GetSessionRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.GetSessionRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -405,7 +398,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.GetSessionRequest other) {
       if (other == com.google.showcase.v1beta1.GetSessionRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -437,7 +429,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -457,8 +449,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -523,8 +513,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -541,8 +531,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -564,8 +554,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSessionRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSessionRequestOrBuilder.java
index ea181b79f4..631848993d 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSessionRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSessionRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface GetSessionRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetStreamingSequenceReportRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetStreamingSequenceReportRequest.java
index 186fa175e5..ec275946ae 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetStreamingSequenceReportRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetStreamingSequenceReportRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.GetStreamingSequenceReportRequest} */
@@ -42,6 +41,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GetStreamingSequenceReportRequest();
   }
 
+  @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.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_GetStreamingSequenceReportRequest_descriptor;
@@ -58,9 +62,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    * 
@@ -293,8 +295,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -323,21 +325,11 @@ public com.google.showcase.v1beta1.GetStreamingSequenceReportRequest build() {
     public com.google.showcase.v1beta1.GetStreamingSequenceReportRequest buildPartial() {
       com.google.showcase.v1beta1.GetStreamingSequenceReportRequest result =
           new com.google.showcase.v1beta1.GetStreamingSequenceReportRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(
-        com.google.showcase.v1beta1.GetStreamingSequenceReportRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -387,7 +379,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.GetStreamingSequenceReportR
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -419,7 +410,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -439,8 +430,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -493,8 +482,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -507,8 +496,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -526,8 +515,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetStreamingSequenceReportRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetStreamingSequenceReportRequestOrBuilder.java
index 5085814753..2f436b93a7 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetStreamingSequenceReportRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetStreamingSequenceReportRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface GetStreamingSequenceReportRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetUserRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetUserRequest.java
index 6bb4597385..6a1246e434 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetUserRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetUserRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/identity.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new GetUserRequest();
   }
 
+  @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.showcase.v1beta1.IdentityOuterClass
         .internal_static_google_showcase_v1beta1_GetUserRequest_descriptor;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -321,8 +323,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -350,20 +352,11 @@ public com.google.showcase.v1beta1.GetUserRequest build() {
     public com.google.showcase.v1beta1.GetUserRequest buildPartial() {
       com.google.showcase.v1beta1.GetUserRequest result =
           new com.google.showcase.v1beta1.GetUserRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.GetUserRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -411,7 +404,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.GetUserRequest other) {
       if (other == com.google.showcase.v1beta1.GetUserRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -443,7 +435,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -463,8 +455,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -535,8 +525,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -555,8 +545,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -580,8 +570,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetUserRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetUserRequestOrBuilder.java
index 110fe7d134..7555bcc95e 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetUserRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetUserRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/identity.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface GetUserRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/IdentityOuterClass.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/IdentityOuterClass.java
index 6fa69e2fb2..77da312fd8 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/IdentityOuterClass.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/IdentityOuterClass.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/identity.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public final class IdentityOuterClass {
@@ -91,14 +90,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\021CreateUserRequest\022+\n"
           + "\004user\030\001 \001(\0132\035.google.showcase.v1beta1.User\"D\n"
           + "\016GetUserRequest\0222\n"
-          + "\004name\030\001 \001(\tB$\340A\002\372A\036\n"
-          + "\034showcase.googleapis.com/User\"q\n"
+          + "\004name\030\001 \001(\tB$\372A\036\n"
+          + "\034showcase.googleapis.com/User\340A\002\"q\n"
           + "\021UpdateUserRequest\022+\n"
           + "\004user\030\001 \001(\0132\035.google.showcase.v1beta1.User\022/\n"
           + "\013update_mask\030\002 \001(\0132\032.google.protobuf.FieldMask\"G\n"
           + "\021DeleteUserRequest\0222\n"
-          + "\004name\030\001 \001(\tB$\340A\002\372A\036\n"
-          + "\034showcase.googleapis.com/User\"9\n"
+          + "\004name\030\001 \001(\tB$\372A\036\n"
+          + "\034showcase.googleapis.com/User\340A\002\"9\n"
           + "\020ListUsersRequest\022\021\n"
           + "\tpage_size\030\001 \001(\005\022\022\n"
           + "\n"
@@ -108,15 +107,16 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\017next_page_token\030\002 \001(\t2\212\006\n"
           + "\010Identity\022\363\001\n\n"
           + "CreateUser\022*.google.showcase.v1beta1.CreateUserRequest\032\035.google.showcase."
-          + "v1beta1.User\"\231\001\332A\034user.display_name,user"
-          + ".email\332A^user.display_name,user.email,user.age,user.nickname,user.enable_notific"
-          + "ations,user.height_feet\202\323\344\223\002\023\"\016/v1beta1/users:\001*\022y\n"
+          + "v1beta1.User\"\231\001\202\323\344\223\002\023\"\016/v1beta1/users:\001*"
+          + "\332A\034user.display_name,user.email\332A^user.d"
+          + "isplay_name,user.email,user.age,user.nic"
+          + "kname,user.enable_notifications,user.height_feet\022y\n"
           + "\007GetUser\022\'.google.showcase.v1beta1.GetUserRequest\032\035.google.showcase.v"
-          + "1beta1.User\"&\332A\004name\202\323\344\223\002\031\022\027/v1beta1/{name=users/*}\022\203\001\n\n"
+          + "1beta1.User\"&\202\323\344\223\002\031\022\027/v1beta1/{name=users/*}\332A\004name\022\203\001\n\n"
           + "UpdateUser\022*.google.showcase.v1beta1.UpdateUserRequest\032\035.google."
           + "showcase.v1beta1.User\"*\202\323\344\223\002$2\034/v1beta1/{user.name=users/*}:\004user\022x\n\n"
           + "DeleteUser\022*.google.showcase.v1beta1.DeleteUserRequ"
-          + "est\032\026.google.protobuf.Empty\"&\332A\004name\202\323\344\223\002\031*\027/v1beta1/{name=users/*}\022z\n"
+          + "est\032\026.google.protobuf.Empty\"&\202\323\344\223\002\031*\027/v1beta1/{name=users/*}\332A\004name\022z\n"
           + "\tListUsers\022).google.showcase.v1beta1.ListUsersRequ"
           + "est\032*.google.showcase.v1beta1.ListUsersR"
           + "esponse\"\026\202\323\344\223\002\020\022\016/v1beta1/users\032\021\312A\016localhost:7469Bq\n"
@@ -150,6 +150,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "HeightFeet",
               "Nickname",
               "EnableNotifications",
+              "Age",
+              "HeightFeet",
+              "Nickname",
+              "EnableNotifications",
             });
     internal_static_google_showcase_v1beta1_CreateUserRequest_descriptor =
         getDescriptor().getMessageTypes().get(1);
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Issue.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Issue.java
index 3c74da2a82..53bad27e82 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Issue.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Issue.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Issue();
   }
 
+  @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.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_Issue_descriptor;
@@ -378,7 +382,7 @@ private Severity(int value) {
   }
 
   public static final int TYPE_FIELD_NUMBER = 1;
-  private int type_ = 0;
+  private int type_;
 
   /**
    *
@@ -409,13 +413,14 @@ public int getTypeValue() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.Issue.Type getType() {
+    @SuppressWarnings("deprecation")
     com.google.showcase.v1beta1.Issue.Type result =
-        com.google.showcase.v1beta1.Issue.Type.forNumber(type_);
+        com.google.showcase.v1beta1.Issue.Type.valueOf(type_);
     return result == null ? com.google.showcase.v1beta1.Issue.Type.UNRECOGNIZED : result;
   }
 
   public static final int SEVERITY_FIELD_NUMBER = 2;
-  private int severity_ = 0;
+  private int severity_;
 
   /**
    *
@@ -446,15 +451,14 @@ public int getSeverityValue() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.Issue.Severity getSeverity() {
+    @SuppressWarnings("deprecation")
     com.google.showcase.v1beta1.Issue.Severity result =
-        com.google.showcase.v1beta1.Issue.Severity.forNumber(severity_);
+        com.google.showcase.v1beta1.Issue.Severity.valueOf(severity_);
     return result == null ? com.google.showcase.v1beta1.Issue.Severity.UNRECOGNIZED : result;
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object description_ = "";
+  private volatile java.lang.Object description_;
 
   /**
    *
@@ -718,10 +722,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       type_ = 0;
+
       severity_ = 0;
+
       description_ = "";
+
       return this;
     }
 
@@ -748,26 +754,13 @@ public com.google.showcase.v1beta1.Issue build() {
     @java.lang.Override
     public com.google.showcase.v1beta1.Issue buildPartial() {
       com.google.showcase.v1beta1.Issue result = new com.google.showcase.v1beta1.Issue(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.type_ = type_;
+      result.severity_ = severity_;
+      result.description_ = description_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.Issue result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.type_ = type_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.severity_ = severity_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.description_ = description_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -821,7 +814,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Issue other) {
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -853,19 +845,19 @@ public Builder mergeFrom(
             case 8:
               {
                 type_ = input.readEnum();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 16:
               {
                 severity_ = input.readEnum();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 description_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -885,8 +877,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private int type_ = 0;
 
     /**
@@ -918,8 +908,8 @@ public int getTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setTypeValue(int value) {
+
       type_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -937,8 +927,9 @@ public Builder setTypeValue(int value) {
      */
     @java.lang.Override
     public com.google.showcase.v1beta1.Issue.Type getType() {
+      @SuppressWarnings("deprecation")
       com.google.showcase.v1beta1.Issue.Type result =
-          com.google.showcase.v1beta1.Issue.Type.forNumber(type_);
+          com.google.showcase.v1beta1.Issue.Type.valueOf(type_);
       return result == null ? com.google.showcase.v1beta1.Issue.Type.UNRECOGNIZED : result;
     }
 
@@ -958,7 +949,7 @@ public Builder setType(com.google.showcase.v1beta1.Issue.Type value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000001;
+
       type_ = value.getNumber();
       onChanged();
       return this;
@@ -976,7 +967,7 @@ public Builder setType(com.google.showcase.v1beta1.Issue.Type value) {
      * @return This builder for chaining.
      */
     public Builder clearType() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       type_ = 0;
       onChanged();
       return this;
@@ -1013,8 +1004,8 @@ public int getSeverityValue() {
      * @return This builder for chaining.
      */
     public Builder setSeverityValue(int value) {
+
       severity_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1032,8 +1023,9 @@ public Builder setSeverityValue(int value) {
      */
     @java.lang.Override
     public com.google.showcase.v1beta1.Issue.Severity getSeverity() {
+      @SuppressWarnings("deprecation")
       com.google.showcase.v1beta1.Issue.Severity result =
-          com.google.showcase.v1beta1.Issue.Severity.forNumber(severity_);
+          com.google.showcase.v1beta1.Issue.Severity.valueOf(severity_);
       return result == null ? com.google.showcase.v1beta1.Issue.Severity.UNRECOGNIZED : result;
     }
 
@@ -1053,7 +1045,7 @@ public Builder setSeverity(com.google.showcase.v1beta1.Issue.Severity value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000002;
+
       severity_ = value.getNumber();
       onChanged();
       return this;
@@ -1071,7 +1063,7 @@ public Builder setSeverity(com.google.showcase.v1beta1.Issue.Severity value) {
      * @return This builder for chaining.
      */
     public Builder clearSeverity() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       severity_ = 0;
       onChanged();
       return this;
@@ -1141,8 +1133,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       description_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1159,8 +1151,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
+
       description_ = getDefaultInstance().getDescription();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1182,8 +1174,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       description_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/IssueOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/IssueOrBuilder.java
index a99fa83994..ca34257b92 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/IssueOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/IssueOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface IssueOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsRequest.java
index 893ae6442e..813d4600e6 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListBlurbsRequest();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_ListBlurbsRequest_descriptor;
@@ -67,9 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -124,7 +126,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -145,9 +147,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -418,10 +418,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       parent_ = "";
+
       pageSize_ = 0;
+
       pageToken_ = "";
+
       return this;
     }
 
@@ -449,26 +451,13 @@ public com.google.showcase.v1beta1.ListBlurbsRequest build() {
     public com.google.showcase.v1beta1.ListBlurbsRequest buildPartial() {
       com.google.showcase.v1beta1.ListBlurbsRequest result =
           new com.google.showcase.v1beta1.ListBlurbsRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.parent_ = parent_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.ListBlurbsRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.parent_ = parent_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -516,7 +505,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListBlurbsRequest other) {
       if (other == com.google.showcase.v1beta1.ListBlurbsRequest.getDefaultInstance()) return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -524,7 +512,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListBlurbsRequest other) {
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -556,19 +543,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -588,8 +575,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object parent_ = "";
 
     /**
@@ -660,8 +645,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -680,8 +665,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -705,8 +690,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -748,7 +733,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -767,7 +751,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -843,8 +827,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -863,8 +847,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -888,8 +872,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsRequestOrBuilder.java
index d251a72871..609bdee635 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ListBlurbsRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsResponse.java
index 5e4ffa969b..513ecba347 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListBlurbsResponse();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_ListBlurbsResponse_descriptor;
@@ -67,8 +71,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int BLURBS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List blurbs_;
 
   /**
@@ -143,9 +145,7 @@ public com.google.showcase.v1beta1.BlurbOrBuilder getBlurbsOrBuilder(int index)
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -411,7 +411,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (blurbsBuilder_ == null) {
         blurbs_ = java.util.Collections.emptyList();
       } else {
@@ -420,6 +419,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -447,15 +447,7 @@ public com.google.showcase.v1beta1.ListBlurbsResponse build() {
     public com.google.showcase.v1beta1.ListBlurbsResponse buildPartial() {
       com.google.showcase.v1beta1.ListBlurbsResponse result =
           new com.google.showcase.v1beta1.ListBlurbsResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.showcase.v1beta1.ListBlurbsResponse result) {
+      int from_bitField0_ = bitField0_;
       if (blurbsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           blurbs_ = java.util.Collections.unmodifiableList(blurbs_);
@@ -465,13 +457,9 @@ private void buildPartialRepeatedFields(com.google.showcase.v1beta1.ListBlurbsRe
       } else {
         result.blurbs_ = blurbsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.ListBlurbsResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -548,7 +536,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListBlurbsResponse other) {
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -593,7 +580,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1051,8 +1038,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1072,8 +1059,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1098,8 +1085,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsResponseOrBuilder.java
index 62d3fa9263..48fb48aa4d 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ListBlurbsResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsRequest.java
index d0aa8ba945..affe6581ce 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListRoomsRequest();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_ListRoomsRequest_descriptor;
@@ -66,7 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 1;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -86,9 +90,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -350,9 +352,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       pageSize_ = 0;
+
       pageToken_ = "";
+
       return this;
     }
 
@@ -380,23 +383,12 @@ public com.google.showcase.v1beta1.ListRoomsRequest build() {
     public com.google.showcase.v1beta1.ListRoomsRequest buildPartial() {
       com.google.showcase.v1beta1.ListRoomsRequest result =
           new com.google.showcase.v1beta1.ListRoomsRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.ListRoomsRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -447,7 +439,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListRoomsRequest other) {
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -479,13 +470,13 @@ public Builder mergeFrom(
             case 8:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 18:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -505,8 +496,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private int pageSize_;
 
     /**
@@ -542,7 +531,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -560,7 +548,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -636,8 +624,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -656,8 +644,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -681,8 +669,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsRequestOrBuilder.java
index 9ef021df4e..36d0587032 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ListRoomsRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsResponse.java
index 106fda7881..2045b234eb 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListRoomsResponse();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_ListRoomsResponse_descriptor;
@@ -67,8 +71,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int ROOMS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List rooms_;
 
   /**
@@ -143,9 +145,7 @@ public com.google.showcase.v1beta1.RoomOrBuilder getRoomsOrBuilder(int index) {
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -411,7 +411,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (roomsBuilder_ == null) {
         rooms_ = java.util.Collections.emptyList();
       } else {
@@ -420,6 +419,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -447,15 +447,7 @@ public com.google.showcase.v1beta1.ListRoomsResponse build() {
     public com.google.showcase.v1beta1.ListRoomsResponse buildPartial() {
       com.google.showcase.v1beta1.ListRoomsResponse result =
           new com.google.showcase.v1beta1.ListRoomsResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.showcase.v1beta1.ListRoomsResponse result) {
+      int from_bitField0_ = bitField0_;
       if (roomsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           rooms_ = java.util.Collections.unmodifiableList(rooms_);
@@ -465,13 +457,9 @@ private void buildPartialRepeatedFields(com.google.showcase.v1beta1.ListRoomsRes
       } else {
         result.rooms_ = roomsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.ListRoomsResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -548,7 +536,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListRoomsResponse other) {
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -592,7 +579,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1050,8 +1037,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1071,8 +1058,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1097,8 +1084,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsResponseOrBuilder.java
index 867cb0e8c7..f14ac868aa 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ListRoomsResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsRequest.java
index 098eb7bdfa..1c4ba80011 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListSessionsRequest();
   }
 
+  @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.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_ListSessionsRequest_descriptor;
@@ -65,7 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 1;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -84,9 +88,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -343,9 +345,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       pageSize_ = 0;
+
       pageToken_ = "";
+
       return this;
     }
 
@@ -373,23 +376,12 @@ public com.google.showcase.v1beta1.ListSessionsRequest build() {
     public com.google.showcase.v1beta1.ListSessionsRequest buildPartial() {
       com.google.showcase.v1beta1.ListSessionsRequest result =
           new com.google.showcase.v1beta1.ListSessionsRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.ListSessionsRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -441,7 +433,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListSessionsRequest other)
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -473,13 +464,13 @@ public Builder mergeFrom(
             case 8:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 18:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -499,8 +490,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private int pageSize_;
 
     /**
@@ -534,7 +523,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -551,7 +539,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -621,8 +609,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -639,8 +627,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -662,8 +650,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsRequestOrBuilder.java
index d114ead66a..ef4c9b52b0 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ListSessionsRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsResponse.java
index e946bee02b..4064678752 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListSessionsResponse();
   }
 
+  @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.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_ListSessionsResponse_descriptor;
@@ -66,8 +70,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int SESSIONS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List sessions_;
 
   /**
@@ -142,9 +144,7 @@ public com.google.showcase.v1beta1.SessionOrBuilder getSessionsOrBuilder(int ind
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -405,7 +405,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (sessionsBuilder_ == null) {
         sessions_ = java.util.Collections.emptyList();
       } else {
@@ -414,6 +413,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -441,16 +441,7 @@ public com.google.showcase.v1beta1.ListSessionsResponse build() {
     public com.google.showcase.v1beta1.ListSessionsResponse buildPartial() {
       com.google.showcase.v1beta1.ListSessionsResponse result =
           new com.google.showcase.v1beta1.ListSessionsResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(
-        com.google.showcase.v1beta1.ListSessionsResponse result) {
+      int from_bitField0_ = bitField0_;
       if (sessionsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           sessions_ = java.util.Collections.unmodifiableList(sessions_);
@@ -460,13 +451,9 @@ private void buildPartialRepeatedFields(
       } else {
         result.sessions_ = sessionsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.ListSessionsResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -544,7 +531,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListSessionsResponse other)
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -589,7 +575,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1043,8 +1029,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1062,8 +1048,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1086,8 +1072,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsResponseOrBuilder.java
index ade0075795..d8475fb2cb 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ListSessionsResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsRequest.java
index 172ae39f15..3ab48d394a 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListTestsRequest();
   }
 
+  @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.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_ListTestsRequest_descriptor;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -119,7 +121,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -138,9 +140,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -406,10 +406,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       parent_ = "";
+
       pageSize_ = 0;
+
       pageToken_ = "";
+
       return this;
     }
 
@@ -437,26 +439,13 @@ public com.google.showcase.v1beta1.ListTestsRequest build() {
     public com.google.showcase.v1beta1.ListTestsRequest buildPartial() {
       com.google.showcase.v1beta1.ListTestsRequest result =
           new com.google.showcase.v1beta1.ListTestsRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.parent_ = parent_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.ListTestsRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.parent_ = parent_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -504,7 +493,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListTestsRequest other) {
       if (other == com.google.showcase.v1beta1.ListTestsRequest.getDefaultInstance()) return this;
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -512,7 +500,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListTestsRequest other) {
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -544,19 +531,19 @@ public Builder mergeFrom(
             case 10:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -576,8 +563,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object parent_ = "";
 
     /**
@@ -642,8 +627,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -660,8 +645,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -683,8 +668,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -722,7 +707,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -739,7 +723,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -809,8 +793,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -827,8 +811,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -850,8 +834,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsRequestOrBuilder.java
index aa2b97a854..451ba9e531 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ListTestsRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsResponse.java
index 93807bd61b..7b374009c0 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListTestsResponse();
   }
 
+  @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.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_ListTestsResponse_descriptor;
@@ -66,8 +70,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int TESTS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List tests_;
 
   /**
@@ -142,9 +144,7 @@ public com.google.showcase.v1beta1.TestOrBuilder getTestsOrBuilder(int index) {
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -405,7 +405,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (testsBuilder_ == null) {
         tests_ = java.util.Collections.emptyList();
       } else {
@@ -414,6 +413,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -441,15 +441,7 @@ public com.google.showcase.v1beta1.ListTestsResponse build() {
     public com.google.showcase.v1beta1.ListTestsResponse buildPartial() {
       com.google.showcase.v1beta1.ListTestsResponse result =
           new com.google.showcase.v1beta1.ListTestsResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.showcase.v1beta1.ListTestsResponse result) {
+      int from_bitField0_ = bitField0_;
       if (testsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           tests_ = java.util.Collections.unmodifiableList(tests_);
@@ -459,13 +451,9 @@ private void buildPartialRepeatedFields(com.google.showcase.v1beta1.ListTestsRes
       } else {
         result.tests_ = testsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.ListTestsResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -542,7 +530,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListTestsResponse other) {
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -586,7 +573,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1038,8 +1025,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1057,8 +1044,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1081,8 +1068,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsResponseOrBuilder.java
index e9154035ac..981c759a8c 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ListTestsResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersRequest.java
index fac31b4e41..bec71e4ef0 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/identity.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListUsersRequest();
   }
 
+  @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.showcase.v1beta1.IdentityOuterClass
         .internal_static_google_showcase_v1beta1_ListUsersRequest_descriptor;
@@ -66,7 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 1;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -86,9 +90,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -350,9 +352,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       pageSize_ = 0;
+
       pageToken_ = "";
+
       return this;
     }
 
@@ -380,23 +383,12 @@ public com.google.showcase.v1beta1.ListUsersRequest build() {
     public com.google.showcase.v1beta1.ListUsersRequest buildPartial() {
       com.google.showcase.v1beta1.ListUsersRequest result =
           new com.google.showcase.v1beta1.ListUsersRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.ListUsersRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -447,7 +439,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListUsersRequest other) {
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -479,13 +470,13 @@ public Builder mergeFrom(
             case 8:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 18:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -505,8 +496,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private int pageSize_;
 
     /**
@@ -542,7 +531,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -560,7 +548,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -636,8 +624,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -656,8 +644,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -681,8 +669,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersRequestOrBuilder.java
index fe02965f96..bebb9a3b7b 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/identity.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ListUsersRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersResponse.java
index 9301a6b454..bc02f8fe46 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/identity.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ListUsersResponse();
   }
 
+  @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.showcase.v1beta1.IdentityOuterClass
         .internal_static_google_showcase_v1beta1_ListUsersResponse_descriptor;
@@ -67,8 +71,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int USERS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List users_;
 
   /**
@@ -143,9 +145,7 @@ public com.google.showcase.v1beta1.UserOrBuilder getUsersOrBuilder(int index) {
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -411,7 +411,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (usersBuilder_ == null) {
         users_ = java.util.Collections.emptyList();
       } else {
@@ -420,6 +419,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -447,15 +447,7 @@ public com.google.showcase.v1beta1.ListUsersResponse build() {
     public com.google.showcase.v1beta1.ListUsersResponse buildPartial() {
       com.google.showcase.v1beta1.ListUsersResponse result =
           new com.google.showcase.v1beta1.ListUsersResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.showcase.v1beta1.ListUsersResponse result) {
+      int from_bitField0_ = bitField0_;
       if (usersBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           users_ = java.util.Collections.unmodifiableList(users_);
@@ -465,13 +457,9 @@ private void buildPartialRepeatedFields(com.google.showcase.v1beta1.ListUsersRes
       } else {
         result.users_ = usersBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.ListUsersResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -548,7 +536,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListUsersResponse other) {
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -592,7 +579,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1050,8 +1037,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1071,8 +1058,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1097,8 +1084,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersResponseOrBuilder.java
index fc6f4a98bb..ddcf85b023 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/identity.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ListUsersResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/MessagingOuterClass.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/MessagingOuterClass.java
index f35843ca3f..5f48a7ca5a 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/MessagingOuterClass.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/MessagingOuterClass.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public final class MessagingOuterClass {
@@ -142,18 +141,18 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "om/Room\022\014rooms/{room}\"@\n\021CreateRoomReque"
           + "st\022+\n\004room\030\001 \001(\0132\035.google.showcase.v1bet"
           + "a1.Room\"D\n\016GetRoomRequest\0222\n\004name\030\001 \001(\tB"
-          + "$\340A\002\372A\036\n\034showcase.googleapis.com/Room\"q\n"
+          + "$\372A\036\n\034showcase.googleapis.com/Room\340A\002\"q\n"
           + "\021UpdateRoomRequest\022+\n\004room\030\001 \001(\0132\035.googl"
           + "e.showcase.v1beta1.Room\022/\n\013update_mask\030\002"
           + " \001(\0132\032.google.protobuf.FieldMask\"G\n\021Dele"
-          + "teRoomRequest\0222\n\004name\030\001 \001(\tB$\340A\002\372A\036\n\034sho"
-          + "wcase.googleapis.com/Room\"9\n\020ListRoomsRe"
+          + "teRoomRequest\0222\n\004name\030\001 \001(\tB$\372A\036\n\034showca"
+          + "se.googleapis.com/Room\340A\002\"9\n\020ListRoomsRe"
           + "quest\022\021\n\tpage_size\030\001 \001(\005\022\022\n\npage_token\030\002"
           + " \001(\t\"Z\n\021ListRoomsResponse\022,\n\005rooms\030\001 \003(\013"
           + "2\035.google.showcase.v1beta1.Room\022\027\n\017next_"
           + "page_token\030\002 \001(\t\"\366\003\n\005Blurb\022\014\n\004name\030\001 \001(\t"
-          + "\0222\n\004user\030\002 \001(\tB$\340A\002\372A\036\n\034showcase.googlea"
-          + "pis.com/User\022\016\n\004text\030\003 \001(\tH\000\022\017\n\005image\030\004 "
+          + "\0222\n\004user\030\002 \001(\tB$\372A\036\n\034showcase.googleapis"
+          + ".com/User\340A\002\022\016\n\004text\030\003 \001(\tH\000\022\017\n\005image\030\004 "
           + "\001(\014H\000\0224\n\013create_time\030\005 \001(\0132\032.google.prot"
           + "obuf.TimestampB\003\340A\003\0224\n\013update_time\030\006 \001(\013"
           + "2\032.google.protobuf.TimestampB\003\340A\003\022\030\n\016leg"
@@ -165,17 +164,17 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "{blurb}\0220rooms/{room}/blurbs/legacy/{leg"
           + "acy_room}.{blurb}B\t\n\007contentB\013\n\tlegacy_i"
           + "d\"z\n\022CreateBlurbRequest\0225\n\006parent\030\001 \001(\tB"
-          + "%\340A\002\372A\037\022\035showcase.googleapis.com/Blurb\022-"
+          + "%\372A\037\022\035showcase.googleapis.com/Blurb\340A\002\022-"
           + "\n\005blurb\030\002 \001(\0132\036.google.showcase.v1beta1."
           + "Blurb\"F\n\017GetBlurbRequest\0223\n\004name\030\001 \001(\tB%"
-          + "\340A\002\372A\037\n\035showcase.googleapis.com/Blurb\"t\n"
+          + "\372A\037\n\035showcase.googleapis.com/Blurb\340A\002\"t\n"
           + "\022UpdateBlurbRequest\022-\n\005blurb\030\001 \001(\0132\036.goo"
           + "gle.showcase.v1beta1.Blurb\022/\n\013update_mas"
           + "k\030\002 \001(\0132\032.google.protobuf.FieldMask\"I\n\022D"
-          + "eleteBlurbRequest\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037\n"
-          + "\035showcase.googleapis.com/Blurb\"q\n\021ListBl"
-          + "urbsRequest\0225\n\006parent\030\001 \001(\tB%\340A\002\372A\037\022\035sho"
-          + "wcase.googleapis.com/Blurb\022\021\n\tpage_size\030"
+          + "eleteBlurbRequest\0223\n\004name\030\001 \001(\tB%\372A\037\n\035sh"
+          + "owcase.googleapis.com/Blurb\340A\002\"q\n\021ListBl"
+          + "urbsRequest\0225\n\006parent\030\001 \001(\tB%\372A\037\022\035showca"
+          + "se.googleapis.com/Blurb\340A\002\022\021\n\tpage_size\030"
           + "\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"]\n\022ListBlurbsR"
           + "esponse\022.\n\006blurbs\030\001 \003(\0132\036.google.showcas"
           + "e.v1beta1.Blurb\022\027\n\017next_page_token\030\002 \001(\t"
@@ -187,8 +186,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "fo\"_\n\024SearchBlurbsResponse\022.\n\006blurbs\030\001 \003"
           + "(\0132\036.google.showcase.v1beta1.Blurb\022\027\n\017ne"
           + "xt_page_token\030\002 \001(\t\"\200\001\n\023StreamBlurbsRequ"
-          + "est\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037\022\035showcase.goog"
-          + "leapis.com/Blurb\0224\n\013expire_time\030\002 \001(\0132\032."
+          + "est\0223\n\004name\030\001 \001(\tB%\372A\037\022\035showcase.googlea"
+          + "pis.com/Blurb\340A\002\0224\n\013expire_time\030\002 \001(\0132\032."
           + "google.protobuf.TimestampB\003\340A\002\"\321\001\n\024Strea"
           + "mBlurbsResponse\022-\n\005blurb\030\001 \001(\0132\036.google."
           + "showcase.v1beta1.Blurb\022D\n\006action\030\002 \001(\01624"
@@ -204,31 +203,31 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "com/BlurbB\t\n\007request2\264\023\n\tMessaging\022\227\001\n\nC"
           + "reateRoom\022*.google.showcase.v1beta1.Crea"
           + "teRoomRequest\032\035.google.showcase.v1beta1."
-          + "Room\">\332A\"room.display_name,room.descript"
-          + "ion\202\323\344\223\002\023\"\016/v1beta1/rooms:\001*\022y\n\007GetRoom\022"
+          + "Room\">\202\323\344\223\002\023\"\016/v1beta1/rooms:\001*\332A\"room.d"
+          + "isplay_name,room.description\022y\n\007GetRoom\022"
           + "\'.google.showcase.v1beta1.GetRoomRequest"
-          + "\032\035.google.showcase.v1beta1.Room\"&\332A\004name"
-          + "\202\323\344\223\002\031\022\027/v1beta1/{name=rooms/*}\022\203\001\n\nUpda"
+          + "\032\035.google.showcase.v1beta1.Room\"&\202\323\344\223\002\031\022"
+          + "\027/v1beta1/{name=rooms/*}\332A\004name\022\203\001\n\nUpda"
           + "teRoom\022*.google.showcase.v1beta1.UpdateR"
           + "oomRequest\032\035.google.showcase.v1beta1.Roo"
           + "m\"*\202\323\344\223\002$2\034/v1beta1/{room.name=rooms/*}:"
           + "\004room\022x\n\nDeleteRoom\022*.google.showcase.v1"
           + "beta1.DeleteRoomRequest\032\026.google.protobu"
-          + "f.Empty\"&\332A\004name\202\323\344\223\002\031*\027/v1beta1/{name=r"
-          + "ooms/*}\022z\n\tListRooms\022).google.showcase.v"
+          + "f.Empty\"&\202\323\344\223\002\031*\027/v1beta1/{name=rooms/*}"
+          + "\332A\004name\022z\n\tListRooms\022).google.showcase.v"
           + "1beta1.ListRoomsRequest\032*.google.showcas"
           + "e.v1beta1.ListRoomsResponse\"\026\202\323\344\223\002\020\022\016/v1"
           + "beta1/rooms\022\366\001\n\013CreateBlurb\022+.google.sho"
           + "wcase.v1beta1.CreateBlurbRequest\032\036.googl"
-          + "e.showcase.v1beta1.Blurb\"\231\001\332A\034parent,blu"
-          + "rb.user,blurb.text\332A\035parent,blurb.user,b"
-          + "lurb.image\202\323\344\223\002T\" /v1beta1/{parent=rooms"
-          + "/*}/blurbs:\001*Z-\"(/v1beta1/{parent=users/"
-          + "*/profile}/blurbs:\001*\022\261\001\n\010GetBlurb\022(.goog"
+          + "e.showcase.v1beta1.Blurb\"\231\001\202\323\344\223\002T\" /v1be"
+          + "ta1/{parent=rooms/*}/blurbs:\001*Z-\"(/v1bet"
+          + "a1/{parent=users/*/profile}/blurbs:\001*\332A\034"
+          + "parent,blurb.user,blurb.text\332A\035parent,bl"
+          + "urb.user,blurb.image\022\261\001\n\010GetBlurb\022(.goog"
           + "le.showcase.v1beta1.GetBlurbRequest\032\036.go"
-          + "ogle.showcase.v1beta1.Blurb\"[\332A\004name\202\323\344\223"
-          + "\002N\022 /v1beta1/{name=rooms/*/blurbs/*}Z*\022("
-          + "/v1beta1/{name=users/*/profile/blurbs/*}"
+          + "ogle.showcase.v1beta1.Blurb\"[\202\323\344\223\002N\022 /v1"
+          + "beta1/{name=rooms/*/blurbs/*}Z*\022(/v1beta"
+          + "1/{name=users/*/profile/blurbs/*}\332A\004name"
           + "\022\312\001\n\013UpdateBlurb\022+.google.showcase.v1bet"
           + "a1.UpdateBlurbRequest\032\036.google.showcase."
           + "v1beta1.Blurb\"n\202\323\344\223\002h2&/v1beta1/{blurb.n"
@@ -236,21 +235,21 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "/{blurb.name=users/*/profile/blurbs/*}:\005"
           + "blurb\022\257\001\n\013DeleteBlurb\022+.google.showcase."
           + "v1beta1.DeleteBlurbRequest\032\026.google.prot"
-          + "obuf.Empty\"[\332A\004name\202\323\344\223\002N* /v1beta1/{nam"
-          + "e=rooms/*/blurbs/*}Z**(/v1beta1/{name=us"
-          + "ers/*/profile/blurbs/*}\022\304\001\n\nListBlurbs\022*"
+          + "obuf.Empty\"[\202\323\344\223\002N* /v1beta1/{name=rooms"
+          + "/*/blurbs/*}Z**(/v1beta1/{name=users/*/p"
+          + "rofile/blurbs/*}\332A\004name\022\304\001\n\nListBlurbs\022*"
           + ".google.showcase.v1beta1.ListBlurbsReque"
           + "st\032+.google.showcase.v1beta1.ListBlurbsR"
-          + "esponse\"]\332A\006parent\202\323\344\223\002N\022 /v1beta1/{pare"
-          + "nt=rooms/*}/blurbsZ*\022(/v1beta1/{parent=u"
-          + "sers/*/profile}/blurbs\022\201\002\n\014SearchBlurbs\022"
+          + "esponse\"]\202\323\344\223\002N\022 /v1beta1/{parent=rooms/"
+          + "*}/blurbsZ*\022(/v1beta1/{parent=users/*/pr"
+          + "ofile}/blurbs\332A\006parent\022\201\002\n\014SearchBlurbs\022"
           + ",.google.showcase.v1beta1.SearchBlurbsRe"
-          + "quest\032\035.google.longrunning.Operation\"\243\001\312"
-          + "A,\n\024SearchBlurbsResponse\022\024SearchBlurbsMe"
-          + "tadata\332A\014parent,query\202\323\344\223\002_\"\'/v1beta1/{p"
-          + "arent=rooms/*}/blurbs:search:\001*Z1\"//v1be"
-          + "ta1/{parent=users/*/profile}/blurbs:sear"
-          + "ch\022\323\001\n\014StreamBlurbs\022,.google.showcase.v1"
+          + "quest\032\035.google.longrunning.Operation\"\243\001\202"
+          + "\323\344\223\002_\"\'/v1beta1/{parent=rooms/*}/blurbs:"
+          + "search:\001*Z1\"//v1beta1/{parent=users/*/pr"
+          + "ofile}/blurbs:search\312A,\n\024SearchBlurbsRes"
+          + "ponse\022\024SearchBlurbsMetadata\332A\014parent,que"
+          + "ry\022\323\001\n\014StreamBlurbs\022,.google.showcase.v1"
           + "beta1.StreamBlurbsRequest\032-.google.showc"
           + "ase.v1beta1.StreamBlurbsResponse\"d\202\323\344\223\002^"
           + "\"%/v1beta1/{name=rooms/*}/blurbs:stream:"
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyMappedResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyMappedResponse.java
index 23872056c1..a6461fa4b9 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyMappedResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyMappedResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.PagedExpandLegacyMappedResponse} */
@@ -42,6 +41,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PagedExpandLegacyMappedResponse();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_PagedExpandLegacyMappedResponse_descriptor;
@@ -49,8 +53,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-      int number) {
+  protected com.google.protobuf.MapField internalGetMapField(int number) {
     switch (number) {
       case 1:
         return internalGetAlphabetized();
@@ -86,7 +89,6 @@ private static final class AlphabetizedDefaultEntryHolder {
                         com.google.showcase.v1beta1.PagedExpandResponseList.getDefaultInstance());
   }
 
-  @SuppressWarnings("serial")
   private com.google.protobuf.MapField<
           java.lang.String, com.google.showcase.v1beta1.PagedExpandResponseList>
       alphabetized_;
@@ -164,11 +166,8 @@ public boolean containsAlphabetized(java.lang.String key) {
    * 
    */
   @java.lang.Override
-  public /* nullable */ com.google.showcase.v1beta1.PagedExpandResponseList
-      getAlphabetizedOrDefault(
-          java.lang.String key,
-          /* nullable */
-          com.google.showcase.v1beta1.PagedExpandResponseList defaultValue) {
+  public com.google.showcase.v1beta1.PagedExpandResponseList getAlphabetizedOrDefault(
+      java.lang.String key, com.google.showcase.v1beta1.PagedExpandResponseList defaultValue) {
     if (key == null) {
       throw new NullPointerException("map key");
     }
@@ -204,9 +203,7 @@ public com.google.showcase.v1beta1.PagedExpandResponseList getAlphabetizedOrThro
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -447,8 +444,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMapField(int number) {
       switch (number) {
         case 1:
           return internalGetAlphabetized();
@@ -458,8 +454,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
-        int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       switch (number) {
         case 1:
           return internalGetMutableAlphabetized();
@@ -488,9 +483,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       internalGetMutableAlphabetized().clear();
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -518,24 +513,14 @@ public com.google.showcase.v1beta1.PagedExpandLegacyMappedResponse build() {
     public com.google.showcase.v1beta1.PagedExpandLegacyMappedResponse buildPartial() {
       com.google.showcase.v1beta1.PagedExpandLegacyMappedResponse result =
           new com.google.showcase.v1beta1.PagedExpandLegacyMappedResponse(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      int from_bitField0_ = bitField0_;
+      result.alphabetized_ = internalGetAlphabetized();
+      result.alphabetized_.makeImmutable();
+      result.nextPageToken_ = nextPageToken_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.PagedExpandLegacyMappedResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.alphabetized_ =
-            internalGetAlphabetized().build(AlphabetizedDefaultEntryHolder.defaultEntry);
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -583,10 +568,8 @@ public Builder mergeFrom(com.google.showcase.v1beta1.PagedExpandLegacyMappedResp
       if (other == com.google.showcase.v1beta1.PagedExpandLegacyMappedResponse.getDefaultInstance())
         return this;
       internalGetMutableAlphabetized().mergeFrom(other.internalGetAlphabetized());
-      bitField0_ |= 0x00000001;
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -624,15 +607,14 @@ public Builder mergeFrom(
                             AlphabetizedDefaultEntryHolder.defaultEntry.getParserForType(),
                             extensionRegistry);
                 internalGetMutableAlphabetized()
-                    .ensureBuilderMap()
+                    .getMutableMap()
                     .put(alphabetized__.getKey(), alphabetized__.getValue());
-                bitField0_ |= 0x00000001;
                 break;
               } // case 10
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -654,66 +636,37 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private static final class AlphabetizedConverter
-        implements com.google.protobuf.MapFieldBuilder.Converter<
-            java.lang.String,
-            com.google.showcase.v1beta1.PagedExpandResponseListOrBuilder,
-            com.google.showcase.v1beta1.PagedExpandResponseList> {
-      @java.lang.Override
-      public com.google.showcase.v1beta1.PagedExpandResponseList build(
-          com.google.showcase.v1beta1.PagedExpandResponseListOrBuilder val) {
-        if (val instanceof com.google.showcase.v1beta1.PagedExpandResponseList) {
-          return (com.google.showcase.v1beta1.PagedExpandResponseList) val;
-        }
-        return ((com.google.showcase.v1beta1.PagedExpandResponseList.Builder) val).build();
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.MapEntry<
-              java.lang.String, com.google.showcase.v1beta1.PagedExpandResponseList>
-          defaultEntry() {
-        return AlphabetizedDefaultEntryHolder.defaultEntry;
-      }
-    }
-    ;
-
-    private static final AlphabetizedConverter alphabetizedConverter = new AlphabetizedConverter();
-
-    private com.google.protobuf.MapFieldBuilder<
-            java.lang.String,
-            com.google.showcase.v1beta1.PagedExpandResponseListOrBuilder,
-            com.google.showcase.v1beta1.PagedExpandResponseList,
-            com.google.showcase.v1beta1.PagedExpandResponseList.Builder>
+    private com.google.protobuf.MapField<
+            java.lang.String, com.google.showcase.v1beta1.PagedExpandResponseList>
         alphabetized_;
 
-    private com.google.protobuf.MapFieldBuilder<
-            java.lang.String,
-            com.google.showcase.v1beta1.PagedExpandResponseListOrBuilder,
-            com.google.showcase.v1beta1.PagedExpandResponseList,
-            com.google.showcase.v1beta1.PagedExpandResponseList.Builder>
+    private com.google.protobuf.MapField<
+            java.lang.String, com.google.showcase.v1beta1.PagedExpandResponseList>
         internalGetAlphabetized() {
       if (alphabetized_ == null) {
-        return new com.google.protobuf.MapFieldBuilder<>(alphabetizedConverter);
+        return com.google.protobuf.MapField.emptyMapField(
+            AlphabetizedDefaultEntryHolder.defaultEntry);
       }
       return alphabetized_;
     }
 
-    private com.google.protobuf.MapFieldBuilder<
-            java.lang.String,
-            com.google.showcase.v1beta1.PagedExpandResponseListOrBuilder,
-            com.google.showcase.v1beta1.PagedExpandResponseList,
-            com.google.showcase.v1beta1.PagedExpandResponseList.Builder>
+    private com.google.protobuf.MapField<
+            java.lang.String, com.google.showcase.v1beta1.PagedExpandResponseList>
         internalGetMutableAlphabetized() {
+      onChanged();
+      ;
       if (alphabetized_ == null) {
-        alphabetized_ = new com.google.protobuf.MapFieldBuilder<>(alphabetizedConverter);
+        alphabetized_ =
+            com.google.protobuf.MapField.newMapField(AlphabetizedDefaultEntryHolder.defaultEntry);
+      }
+      if (!alphabetized_.isMutable()) {
+        alphabetized_ = alphabetized_.copy();
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
       return alphabetized_;
     }
 
     public int getAlphabetizedCount() {
-      return internalGetAlphabetized().ensureBuilderMap().size();
+      return internalGetAlphabetized().getMap().size();
     }
 
     /**
@@ -733,7 +686,7 @@ public boolean containsAlphabetized(java.lang.String key) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      return internalGetAlphabetized().ensureBuilderMap().containsKey(key);
+      return internalGetAlphabetized().getMap().containsKey(key);
     }
 
     /** Use {@link #getAlphabetizedMap()} instead. */
@@ -759,7 +712,7 @@ public boolean containsAlphabetized(java.lang.String key) {
     @java.lang.Override
     public java.util.Map
         getAlphabetizedMap() {
-      return internalGetAlphabetized().getImmutableMap();
+      return internalGetAlphabetized().getMap();
     }
 
     /**
@@ -775,17 +728,14 @@ public boolean containsAlphabetized(java.lang.String key) {
      * 
      */
     @java.lang.Override
-    public /* nullable */ com.google.showcase.v1beta1.PagedExpandResponseList
-        getAlphabetizedOrDefault(
-            java.lang.String key,
-            /* nullable */
-            com.google.showcase.v1beta1.PagedExpandResponseList defaultValue) {
+    public com.google.showcase.v1beta1.PagedExpandResponseList getAlphabetizedOrDefault(
+        java.lang.String key, com.google.showcase.v1beta1.PagedExpandResponseList defaultValue) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      java.util.Map
-          map = internalGetMutableAlphabetized().ensureBuilderMap();
-      return map.containsKey(key) ? alphabetizedConverter.build(map.get(key)) : defaultValue;
+      java.util.Map map =
+          internalGetAlphabetized().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
     }
 
     /**
@@ -806,17 +756,16 @@ public com.google.showcase.v1beta1.PagedExpandResponseList getAlphabetizedOrThro
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      java.util.Map
-          map = internalGetMutableAlphabetized().ensureBuilderMap();
+      java.util.Map map =
+          internalGetAlphabetized().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
-      return alphabetizedConverter.build(map.get(key));
+      return map.get(key);
     }
 
     public Builder clearAlphabetized() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      internalGetMutableAlphabetized().clear();
+      internalGetMutableAlphabetized().getMutableMap().clear();
       return this;
     }
 
@@ -836,7 +785,7 @@ public Builder removeAlphabetized(java.lang.String key) {
       if (key == null) {
         throw new NullPointerException("map key");
       }
-      internalGetMutableAlphabetized().ensureBuilderMap().remove(key);
+      internalGetMutableAlphabetized().getMutableMap().remove(key);
       return this;
     }
 
@@ -844,8 +793,7 @@ public Builder removeAlphabetized(java.lang.String key) {
     @java.lang.Deprecated
     public java.util.Map
         getMutableAlphabetized() {
-      bitField0_ |= 0x00000001;
-      return internalGetMutableAlphabetized().ensureMessageMap();
+      return internalGetMutableAlphabetized().getMutableMap();
     }
 
     /**
@@ -868,8 +816,8 @@ public Builder putAlphabetized(
       if (value == null) {
         throw new NullPointerException("map value");
       }
-      internalGetMutableAlphabetized().ensureBuilderMap().put(key, value);
-      bitField0_ |= 0x00000001;
+
+      internalGetMutableAlphabetized().getMutableMap().put(key, value);
       return this;
     }
 
@@ -888,46 +836,10 @@ public Builder putAlphabetized(
     public Builder putAllAlphabetized(
         java.util.Map
             values) {
-      for (java.util.Map.Entry<
-              java.lang.String, com.google.showcase.v1beta1.PagedExpandResponseList>
-          e : values.entrySet()) {
-        if (e.getKey() == null || e.getValue() == null) {
-          throw new NullPointerException();
-        }
-      }
-      internalGetMutableAlphabetized().ensureBuilderMap().putAll(values);
-      bitField0_ |= 0x00000001;
+      internalGetMutableAlphabetized().getMutableMap().putAll(values);
       return this;
     }
 
-    /**
-     *
-     *
-     * 
-     * The words that were expanded, indexed by their initial character.
-     * (-- aip.dev/not-precedent: This is a legacy, non-standard pattern that violates
-     *     aip.dev/158. Ordinarily, this should be a `repeated` field, as in PagedExpandResponse. --)
-     * 

-     *
-     * map<string, .google.showcase.v1beta1.PagedExpandResponseList> alphabetized = 1;
-     * 
-     */
-    public com.google.showcase.v1beta1.PagedExpandResponseList.Builder
-        putAlphabetizedBuilderIfAbsent(java.lang.String key) {
-      java.util.Map
-          builderMap = internalGetMutableAlphabetized().ensureBuilderMap();
-      com.google.showcase.v1beta1.PagedExpandResponseListOrBuilder entry = builderMap.get(key);
-      if (entry == null) {
-        entry = com.google.showcase.v1beta1.PagedExpandResponseList.newBuilder();
-        builderMap.put(key, entry);
-      }
-      if (entry instanceof com.google.showcase.v1beta1.PagedExpandResponseList) {
-        entry = ((com.google.showcase.v1beta1.PagedExpandResponseList) entry).toBuilder();
-        builderMap.put(key, entry);
-      }
-      return (com.google.showcase.v1beta1.PagedExpandResponseList.Builder) entry;
-    }
-
     private java.lang.Object nextPageToken_ = "";
 
     /**
@@ -992,8 +904,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1010,8 +922,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1033,8 +945,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyMappedResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyMappedResponseOrBuilder.java
index 718d2a5c8d..fadc9734cd 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyMappedResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyMappedResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface PagedExpandLegacyMappedResponseOrBuilder
@@ -84,6 +83,7 @@ public interface PagedExpandLegacyMappedResponseOrBuilder
    * map<string, .google.showcase.v1beta1.PagedExpandResponseList> alphabetized = 1;
    * 
    */
+
   /* nullable */
   com.google.showcase.v1beta1.PagedExpandResponseList getAlphabetizedOrDefault(
       java.lang.String key,
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyRequest.java
index 21f8094725..83418afa86 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PagedExpandLegacyRequest();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_PagedExpandLegacyRequest_descriptor;
@@ -68,9 +72,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONTENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object content_ = "";
+  private volatile java.lang.Object content_;
 
   /**
    *
@@ -121,7 +123,7 @@ public com.google.protobuf.ByteString getContentBytes() {
   }
 
   public static final int MAX_RESULTS_FIELD_NUMBER = 2;
-  private int maxResults_ = 0;
+  private int maxResults_;
 
   /**
    *
@@ -142,9 +144,7 @@ public int getMaxResults() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -412,10 +412,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       content_ = "";
+
       maxResults_ = 0;
+
       pageToken_ = "";
+
       return this;
     }
 
@@ -443,26 +445,13 @@ public com.google.showcase.v1beta1.PagedExpandLegacyRequest build() {
     public com.google.showcase.v1beta1.PagedExpandLegacyRequest buildPartial() {
       com.google.showcase.v1beta1.PagedExpandLegacyRequest result =
           new com.google.showcase.v1beta1.PagedExpandLegacyRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.content_ = content_;
+      result.maxResults_ = maxResults_;
+      result.pageToken_ = pageToken_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.PagedExpandLegacyRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.content_ = content_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.maxResults_ = maxResults_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -511,7 +500,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.PagedExpandLegacyRequest ot
         return this;
       if (!other.getContent().isEmpty()) {
         content_ = other.content_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getMaxResults() != 0) {
@@ -519,7 +507,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.PagedExpandLegacyRequest ot
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -551,19 +538,19 @@ public Builder mergeFrom(
             case 10:
               {
                 content_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 maxResults_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -583,8 +570,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object content_ = "";
 
     /**
@@ -649,8 +634,8 @@ public Builder setContent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       content_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -667,8 +652,8 @@ public Builder setContent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearContent() {
+
       content_ = getDefaultInstance().getContent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -690,8 +675,8 @@ public Builder setContentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       content_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -733,7 +718,6 @@ public int getMaxResults() {
     public Builder setMaxResults(int value) {
 
       maxResults_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -752,7 +736,7 @@ public Builder setMaxResults(int value) {
      * @return This builder for chaining.
      */
     public Builder clearMaxResults() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       maxResults_ = 0;
       onChanged();
       return this;
@@ -822,8 +806,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -840,8 +824,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -863,8 +847,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyRequestOrBuilder.java
index f9069c5c2a..c9e94d7c28 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface PagedExpandLegacyRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandRequest.java
index 8a03a7bd2e..89c5eff26f 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PagedExpandRequest();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_PagedExpandRequest_descriptor;
@@ -66,9 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONTENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object content_ = "";
+  private volatile java.lang.Object content_;
 
   /**
    *
@@ -119,7 +121,7 @@ public com.google.protobuf.ByteString getContentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -138,9 +140,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -406,10 +406,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       content_ = "";
+
       pageSize_ = 0;
+
       pageToken_ = "";
+
       return this;
     }
 
@@ -437,26 +439,13 @@ public com.google.showcase.v1beta1.PagedExpandRequest build() {
     public com.google.showcase.v1beta1.PagedExpandRequest buildPartial() {
       com.google.showcase.v1beta1.PagedExpandRequest result =
           new com.google.showcase.v1beta1.PagedExpandRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.content_ = content_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.PagedExpandRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.content_ = content_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -504,7 +493,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.PagedExpandRequest other) {
       if (other == com.google.showcase.v1beta1.PagedExpandRequest.getDefaultInstance()) return this;
       if (!other.getContent().isEmpty()) {
         content_ = other.content_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -512,7 +500,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.PagedExpandRequest other) {
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -544,19 +531,19 @@ public Builder mergeFrom(
             case 10:
               {
                 content_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             default:
@@ -576,8 +563,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object content_ = "";
 
     /**
@@ -642,8 +627,8 @@ public Builder setContent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       content_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -660,8 +645,8 @@ public Builder setContent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearContent() {
+
       content_ = getDefaultInstance().getContent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -683,8 +668,8 @@ public Builder setContentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       content_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -722,7 +707,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -739,7 +723,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -809,8 +793,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -827,8 +811,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -850,8 +834,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandRequestOrBuilder.java
index 0f48fc0565..c111c66bb2 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface PagedExpandRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponse.java
index 1b24f5adaf..486f624164 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PagedExpandResponse();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_PagedExpandResponse_descriptor;
@@ -66,8 +70,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int RESPONSES_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List responses_;
 
   /**
@@ -142,9 +144,7 @@ public com.google.showcase.v1beta1.EchoResponseOrBuilder getResponsesOrBuilder(i
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -403,7 +403,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (responsesBuilder_ == null) {
         responses_ = java.util.Collections.emptyList();
       } else {
@@ -412,6 +411,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -439,16 +439,7 @@ public com.google.showcase.v1beta1.PagedExpandResponse build() {
     public com.google.showcase.v1beta1.PagedExpandResponse buildPartial() {
       com.google.showcase.v1beta1.PagedExpandResponse result =
           new com.google.showcase.v1beta1.PagedExpandResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(
-        com.google.showcase.v1beta1.PagedExpandResponse result) {
+      int from_bitField0_ = bitField0_;
       if (responsesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           responses_ = java.util.Collections.unmodifiableList(responses_);
@@ -458,13 +449,9 @@ private void buildPartialRepeatedFields(
       } else {
         result.responses_ = responsesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.PagedExpandResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -542,7 +529,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.PagedExpandResponse other)
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -587,7 +573,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1039,8 +1025,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1057,8 +1043,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1080,8 +1066,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponseList.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponseList.java
index daf42853ef..bc7e814088 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponseList.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponseList.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -40,7 +39,7 @@ private PagedExpandResponseList(com.google.protobuf.GeneratedMessageV3.Builderrepeated string words = 1;
@@ -313,8 +314,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      words_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      words_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -342,21 +343,16 @@ public com.google.showcase.v1beta1.PagedExpandResponseList build() {
     public com.google.showcase.v1beta1.PagedExpandResponseList buildPartial() {
       com.google.showcase.v1beta1.PagedExpandResponseList result =
           new com.google.showcase.v1beta1.PagedExpandResponseList(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        words_ = words_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
+      result.words_ = words_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.PagedExpandResponseList result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        words_.makeImmutable();
-        result.words_ = words_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -406,7 +402,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.PagedExpandResponseList oth
       if (!other.words_.isEmpty()) {
         if (words_.isEmpty()) {
           words_ = other.words_;
-          bitField0_ |= 0x00000001;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureWordsIsMutable();
           words_.addAll(other.words_);
@@ -465,14 +461,14 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private com.google.protobuf.LazyStringArrayList words_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList words_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureWordsIsMutable() {
-      if (!words_.isModifiable()) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         words_ = new com.google.protobuf.LazyStringArrayList(words_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000001;
     }
 
     /**
@@ -481,8 +477,7 @@ private void ensureWordsIsMutable() {
      * @return A list containing the words.
      */
     public com.google.protobuf.ProtocolStringList getWordsList() {
-      words_.makeImmutable();
-      return words_;
+      return words_.getUnmodifiableView();
     }
 
     /**
@@ -527,7 +522,6 @@ public Builder setWords(int index, java.lang.String value) {
       }
       ensureWordsIsMutable();
       words_.set(index, value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -544,7 +538,6 @@ public Builder addWords(java.lang.String value) {
       }
       ensureWordsIsMutable();
       words_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -558,7 +551,6 @@ public Builder addWords(java.lang.String value) {
     public Builder addAllWords(java.lang.Iterable values) {
       ensureWordsIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, words_);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -569,9 +561,8 @@ public Builder addAllWords(java.lang.Iterable values) {
      * @return This builder for chaining.
      */
     public Builder clearWords() {
-      words_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      words_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000001);
-      ;
       onChanged();
       return this;
     }
@@ -589,7 +580,6 @@ public Builder addWordsBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureWordsIsMutable();
       words_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponseListOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponseListOrBuilder.java
index 7e0c5fc85c..ca8e53aab6 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponseListOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponseListOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface PagedExpandResponseListOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponseOrBuilder.java
index 398878774d..9171114d4a 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface PagedExpandResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PoetryError.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PoetryError.java
index 3e59901f48..684b6a6032 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PoetryError.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PoetryError.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new PoetryError();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_PoetryError_descriptor;
@@ -67,9 +71,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int POEM_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object poem_ = "";
+  private volatile java.lang.Object poem_;
 
   /**
    * string poem = 1;
@@ -306,8 +308,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       poem_ = "";
+
       return this;
     }
 
@@ -335,20 +337,11 @@ public com.google.showcase.v1beta1.PoetryError build() {
     public com.google.showcase.v1beta1.PoetryError buildPartial() {
       com.google.showcase.v1beta1.PoetryError result =
           new com.google.showcase.v1beta1.PoetryError(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.poem_ = poem_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.PoetryError result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.poem_ = poem_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -396,7 +389,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.PoetryError other) {
       if (other == com.google.showcase.v1beta1.PoetryError.getDefaultInstance()) return this;
       if (!other.getPoem().isEmpty()) {
         poem_ = other.poem_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -428,7 +420,7 @@ public Builder mergeFrom(
             case 10:
               {
                 poem_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -448,8 +440,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object poem_ = "";
 
     /**
@@ -496,8 +486,8 @@ public Builder setPoem(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       poem_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -508,8 +498,8 @@ public Builder setPoem(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPoem() {
+
       poem_ = getDefaultInstance().getPoem();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -525,8 +515,8 @@ public Builder setPoemBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       poem_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PoetryErrorOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PoetryErrorOrBuilder.java
index eda8651105..a7ae660a46 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PoetryErrorOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PoetryErrorOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface PoetryErrorOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatRequest.java
index a757c870c5..d40a196379 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.RepeatRequest} */
@@ -42,6 +41,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new RepeatRequest();
   }
 
+  @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.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_RepeatRequest_descriptor;
@@ -59,9 +63,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    * string name = 1;
@@ -109,7 +111,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    */
   @java.lang.Override
   public boolean hasInfo() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return info_ != null;
   }
 
   /**
@@ -125,11 +127,11 @@ public com.google.showcase.v1beta1.ComplianceData getInfo() {
   /** .google.showcase.v1beta1.ComplianceData info = 2; */
   @java.lang.Override
   public com.google.showcase.v1beta1.ComplianceDataOrBuilder getInfoOrBuilder() {
-    return info_ == null ? com.google.showcase.v1beta1.ComplianceData.getDefaultInstance() : info_;
+    return getInfo();
   }
 
   public static final int SERVER_VERIFY_FIELD_NUMBER = 3;
-  private boolean serverVerify_ = false;
+  private boolean serverVerify_;
 
   /**
    *
@@ -149,9 +151,7 @@ public boolean getServerVerify() {
   }
 
   public static final int INTENDED_BINDING_URI_FIELD_NUMBER = 10;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object intendedBindingUri_ = "";
+  private volatile java.lang.Object intendedBindingUri_;
 
   /**
    *
@@ -166,7 +166,7 @@ public boolean getServerVerify() {
    */
   @java.lang.Override
   public boolean hasIntendedBindingUri() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return ((bitField0_ & 0x00000001) != 0);
   }
 
   /**
@@ -218,7 +218,7 @@ public com.google.protobuf.ByteString getIntendedBindingUriBytes() {
   }
 
   public static final int F_INT32_FIELD_NUMBER = 4;
-  private int fInt32_ = 0;
+  private int fInt32_;
 
   /**
    *
@@ -238,7 +238,7 @@ public int getFInt32() {
   }
 
   public static final int F_INT64_FIELD_NUMBER = 5;
-  private long fInt64_ = 0L;
+  private long fInt64_;
 
   /**
    * int64 f_int64 = 5;
@@ -251,7 +251,7 @@ public long getFInt64() {
   }
 
   public static final int F_DOUBLE_FIELD_NUMBER = 6;
-  private double fDouble_ = 0D;
+  private double fDouble_;
 
   /**
    * double f_double = 6;
@@ -264,7 +264,7 @@ public double getFDouble() {
   }
 
   public static final int P_INT32_FIELD_NUMBER = 7;
-  private int pInt32_ = 0;
+  private int pInt32_;
 
   /**
    * optional int32 p_int32 = 7;
@@ -273,7 +273,7 @@ public double getFDouble() {
    */
   @java.lang.Override
   public boolean hasPInt32() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return ((bitField0_ & 0x00000002) != 0);
   }
 
   /**
@@ -287,7 +287,7 @@ public int getPInt32() {
   }
 
   public static final int P_INT64_FIELD_NUMBER = 8;
-  private long pInt64_ = 0L;
+  private long pInt64_;
 
   /**
    * optional int64 p_int64 = 8;
@@ -296,7 +296,7 @@ public int getPInt32() {
    */
   @java.lang.Override
   public boolean hasPInt64() {
-    return ((bitField0_ & 0x00000008) != 0);
+    return ((bitField0_ & 0x00000004) != 0);
   }
 
   /**
@@ -310,7 +310,7 @@ public long getPInt64() {
   }
 
   public static final int P_DOUBLE_FIELD_NUMBER = 9;
-  private double pDouble_ = 0D;
+  private double pDouble_;
 
   /**
    * optional double p_double = 9;
@@ -319,7 +319,7 @@ public long getPInt64() {
    */
   @java.lang.Override
   public boolean hasPDouble() {
-    return ((bitField0_ & 0x00000010) != 0);
+    return ((bitField0_ & 0x00000008) != 0);
   }
 
   /**
@@ -349,7 +349,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (info_ != null) {
       output.writeMessage(2, getInfo());
     }
     if (serverVerify_ != false) {
@@ -364,16 +364,16 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (java.lang.Double.doubleToRawLongBits(fDouble_) != 0) {
       output.writeDouble(6, fDouble_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeInt32(7, pInt32_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       output.writeInt64(8, pInt64_);
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       output.writeDouble(9, pDouble_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 10, intendedBindingUri_);
     }
     getUnknownFields().writeTo(output);
@@ -388,7 +388,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (info_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getInfo());
     }
     if (serverVerify_ != false) {
@@ -403,16 +403,16 @@ public int getSerializedSize() {
     if (java.lang.Double.doubleToRawLongBits(fDouble_) != 0) {
       size += com.google.protobuf.CodedOutputStream.computeDoubleSize(6, fDouble_);
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(7, pInt32_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeInt64Size(8, pInt64_);
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeDoubleSize(9, pDouble_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, intendedBindingUri_);
     }
     size += getUnknownFields().getSerializedSize();
@@ -627,39 +627,39 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.RepeatRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getInfoFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
-      info_ = null;
-      if (infoBuilder_ != null) {
-        infoBuilder_.dispose();
+
+      if (infoBuilder_ == null) {
+        info_ = null;
+      } else {
+        info_ = null;
         infoBuilder_ = null;
       }
       serverVerify_ = false;
+
       intendedBindingUri_ = "";
+      bitField0_ = (bitField0_ & ~0x00000001);
       fInt32_ = 0;
+
       fInt64_ = 0L;
+
       fDouble_ = 0D;
+
       pInt32_ = 0;
+      bitField0_ = (bitField0_ & ~0x00000002);
       pInt64_ = 0L;
+      bitField0_ = (bitField0_ & ~0x00000004);
       pDouble_ = 0D;
+      bitField0_ = (bitField0_ & ~0x00000008);
       return this;
     }
 
@@ -687,52 +687,37 @@ public com.google.showcase.v1beta1.RepeatRequest build() {
     public com.google.showcase.v1beta1.RepeatRequest buildPartial() {
       com.google.showcase.v1beta1.RepeatRequest result =
           new com.google.showcase.v1beta1.RepeatRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.RepeatRequest result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
       int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.info_ = infoBuilder_ == null ? info_ : infoBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.serverVerify_ = serverVerify_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.intendedBindingUri_ = intendedBindingUri_;
-        to_bitField0_ |= 0x00000002;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.fInt32_ = fInt32_;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.fInt64_ = fInt64_;
+      result.name_ = name_;
+      if (infoBuilder_ == null) {
+        result.info_ = info_;
+      } else {
+        result.info_ = infoBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.fDouble_ = fDouble_;
+      result.serverVerify_ = serverVerify_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        to_bitField0_ |= 0x00000001;
       }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
+      result.intendedBindingUri_ = intendedBindingUri_;
+      result.fInt32_ = fInt32_;
+      result.fInt64_ = fInt64_;
+      result.fDouble_ = fDouble_;
+      if (((from_bitField0_ & 0x00000002) != 0)) {
         result.pInt32_ = pInt32_;
-        to_bitField0_ |= 0x00000004;
+        to_bitField0_ |= 0x00000002;
       }
-      if (((from_bitField0_ & 0x00000100) != 0)) {
+      if (((from_bitField0_ & 0x00000004) != 0)) {
         result.pInt64_ = pInt64_;
-        to_bitField0_ |= 0x00000008;
+        to_bitField0_ |= 0x00000004;
       }
-      if (((from_bitField0_ & 0x00000200) != 0)) {
+      if (((from_bitField0_ & 0x00000008) != 0)) {
         result.pDouble_ = pDouble_;
-        to_bitField0_ |= 0x00000010;
+        to_bitField0_ |= 0x00000008;
       }
-      result.bitField0_ |= to_bitField0_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -782,7 +767,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.RepeatRequest other) {
       if (other == com.google.showcase.v1beta1.RepeatRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasInfo()) {
@@ -792,8 +776,8 @@ public Builder mergeFrom(com.google.showcase.v1beta1.RepeatRequest other) {
         setServerVerify(other.getServerVerify());
       }
       if (other.hasIntendedBindingUri()) {
+        bitField0_ |= 0x00000001;
         intendedBindingUri_ = other.intendedBindingUri_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       if (other.getFInt32() != 0) {
@@ -843,61 +827,61 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getInfoFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 24:
               {
                 serverVerify_ = input.readBool();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 32:
               {
                 fInt32_ = input.readInt32();
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 32
             case 40:
               {
                 fInt64_ = input.readInt64();
-                bitField0_ |= 0x00000020;
+
                 break;
               } // case 40
             case 49:
               {
                 fDouble_ = input.readDouble();
-                bitField0_ |= 0x00000040;
+
                 break;
               } // case 49
             case 56:
               {
                 pInt32_ = input.readInt32();
-                bitField0_ |= 0x00000080;
+                bitField0_ |= 0x00000002;
                 break;
               } // case 56
             case 64:
               {
                 pInt64_ = input.readInt64();
-                bitField0_ |= 0x00000100;
+                bitField0_ |= 0x00000004;
                 break;
               } // case 64
             case 73:
               {
                 pDouble_ = input.readDouble();
-                bitField0_ |= 0x00000200;
+                bitField0_ |= 0x00000008;
                 break;
               } // case 73
             case 82:
               {
                 intendedBindingUri_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+                bitField0_ |= 0x00000001;
                 break;
               } // case 82
             default:
@@ -965,8 +949,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -977,8 +961,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -994,8 +978,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1013,7 +997,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the info field is set.
      */
     public boolean hasInfo() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return infoBuilder_ != null || info_ != null;
     }
 
     /**
@@ -1038,11 +1022,11 @@ public Builder setInfo(com.google.showcase.v1beta1.ComplianceData value) {
           throw new NullPointerException();
         }
         info_ = value;
+        onChanged();
       } else {
         infoBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -1050,49 +1034,49 @@ public Builder setInfo(com.google.showcase.v1beta1.ComplianceData value) {
     public Builder setInfo(com.google.showcase.v1beta1.ComplianceData.Builder builderForValue) {
       if (infoBuilder_ == null) {
         info_ = builderForValue.build();
+        onChanged();
       } else {
         infoBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
     /** .google.showcase.v1beta1.ComplianceData info = 2; */
     public Builder mergeInfo(com.google.showcase.v1beta1.ComplianceData value) {
       if (infoBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && info_ != null
-            && info_ != com.google.showcase.v1beta1.ComplianceData.getDefaultInstance()) {
-          getInfoBuilder().mergeFrom(value);
+        if (info_ != null) {
+          info_ =
+              com.google.showcase.v1beta1.ComplianceData.newBuilder(info_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           info_ = value;
         }
+        onChanged();
       } else {
         infoBuilder_.mergeFrom(value);
       }
-      if (info_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
     /** .google.showcase.v1beta1.ComplianceData info = 2; */
     public Builder clearInfo() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      info_ = null;
-      if (infoBuilder_ != null) {
-        infoBuilder_.dispose();
+      if (infoBuilder_ == null) {
+        info_ = null;
+        onChanged();
+      } else {
+        info_ = null;
         infoBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
     /** .google.showcase.v1beta1.ComplianceData info = 2; */
     public com.google.showcase.v1beta1.ComplianceData.Builder getInfoBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getInfoFieldBuilder().getBuilder();
     }
@@ -1161,7 +1145,6 @@ public boolean getServerVerify() {
     public Builder setServerVerify(boolean value) {
 
       serverVerify_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1179,7 +1162,7 @@ public Builder setServerVerify(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearServerVerify() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       serverVerify_ = false;
       onChanged();
       return this;
@@ -1199,7 +1182,7 @@ public Builder clearServerVerify() {
      * @return Whether the intendedBindingUri field is set.
      */
     public boolean hasIntendedBindingUri() {
-      return ((bitField0_ & 0x00000008) != 0);
+      return ((bitField0_ & 0x00000001) != 0);
     }
 
     /**
@@ -1264,8 +1247,8 @@ public Builder setIntendedBindingUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+      bitField0_ |= 0x00000001;
       intendedBindingUri_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1282,8 +1265,8 @@ public Builder setIntendedBindingUri(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearIntendedBindingUri() {
+      bitField0_ = (bitField0_ & ~0x00000001);
       intendedBindingUri_ = getDefaultInstance().getIntendedBindingUri();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1305,8 +1288,8 @@ public Builder setIntendedBindingUriBytes(com.google.protobuf.ByteString value)
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+      bitField0_ |= 0x00000001;
       intendedBindingUri_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1346,7 +1329,6 @@ public int getFInt32() {
     public Builder setFInt32(int value) {
 
       fInt32_ = value;
-      bitField0_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -1364,7 +1346,7 @@ public Builder setFInt32(int value) {
      * @return This builder for chaining.
      */
     public Builder clearFInt32() {
-      bitField0_ = (bitField0_ & ~0x00000010);
+
       fInt32_ = 0;
       onChanged();
       return this;
@@ -1391,7 +1373,6 @@ public long getFInt64() {
     public Builder setFInt64(long value) {
 
       fInt64_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1402,7 +1383,7 @@ public Builder setFInt64(long value) {
      * @return This builder for chaining.
      */
     public Builder clearFInt64() {
-      bitField0_ = (bitField0_ & ~0x00000020);
+
       fInt64_ = 0L;
       onChanged();
       return this;
@@ -1429,7 +1410,6 @@ public double getFDouble() {
     public Builder setFDouble(double value) {
 
       fDouble_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1440,7 +1420,7 @@ public Builder setFDouble(double value) {
      * @return This builder for chaining.
      */
     public Builder clearFDouble() {
-      bitField0_ = (bitField0_ & ~0x00000040);
+
       fDouble_ = 0D;
       onChanged();
       return this;
@@ -1455,7 +1435,7 @@ public Builder clearFDouble() {
      */
     @java.lang.Override
     public boolean hasPInt32() {
-      return ((bitField0_ & 0x00000080) != 0);
+      return ((bitField0_ & 0x00000002) != 0);
     }
 
     /**
@@ -1475,9 +1455,8 @@ public int getPInt32() {
      * @return This builder for chaining.
      */
     public Builder setPInt32(int value) {
-
+      bitField0_ |= 0x00000002;
       pInt32_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -1488,7 +1467,7 @@ public Builder setPInt32(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPInt32() {
-      bitField0_ = (bitField0_ & ~0x00000080);
+      bitField0_ = (bitField0_ & ~0x00000002);
       pInt32_ = 0;
       onChanged();
       return this;
@@ -1503,7 +1482,7 @@ public Builder clearPInt32() {
      */
     @java.lang.Override
     public boolean hasPInt64() {
-      return ((bitField0_ & 0x00000100) != 0);
+      return ((bitField0_ & 0x00000004) != 0);
     }
 
     /**
@@ -1523,9 +1502,8 @@ public long getPInt64() {
      * @return This builder for chaining.
      */
     public Builder setPInt64(long value) {
-
+      bitField0_ |= 0x00000004;
       pInt64_ = value;
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -1536,7 +1514,7 @@ public Builder setPInt64(long value) {
      * @return This builder for chaining.
      */
     public Builder clearPInt64() {
-      bitField0_ = (bitField0_ & ~0x00000100);
+      bitField0_ = (bitField0_ & ~0x00000004);
       pInt64_ = 0L;
       onChanged();
       return this;
@@ -1551,7 +1529,7 @@ public Builder clearPInt64() {
      */
     @java.lang.Override
     public boolean hasPDouble() {
-      return ((bitField0_ & 0x00000200) != 0);
+      return ((bitField0_ & 0x00000008) != 0);
     }
 
     /**
@@ -1571,9 +1549,8 @@ public double getPDouble() {
      * @return This builder for chaining.
      */
     public Builder setPDouble(double value) {
-
+      bitField0_ |= 0x00000008;
       pDouble_ = value;
-      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -1584,7 +1561,7 @@ public Builder setPDouble(double value) {
      * @return This builder for chaining.
      */
     public Builder clearPDouble() {
-      bitField0_ = (bitField0_ & ~0x00000200);
+      bitField0_ = (bitField0_ & ~0x00000008);
       pDouble_ = 0D;
       onChanged();
       return this;
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatRequestOrBuilder.java
index 77bde23495..8fc2590475 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface RepeatRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatResponse.java
index f84b5e2fb2..e5f3f6a1ea 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.RepeatResponse} */
@@ -41,6 +40,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new RepeatResponse();
   }
 
+  @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.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_RepeatResponse_descriptor;
@@ -56,7 +60,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.RepeatResponse.Builder.class);
   }
 
-  private int bitField0_;
   public static final int REQUEST_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.RepeatRequest request_;
 
@@ -67,7 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasRequest() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return request_ != null;
   }
 
   /**
@@ -85,15 +88,11 @@ public com.google.showcase.v1beta1.RepeatRequest getRequest() {
   /** .google.showcase.v1beta1.RepeatRequest request = 1; */
   @java.lang.Override
   public com.google.showcase.v1beta1.RepeatRequestOrBuilder getRequestOrBuilder() {
-    return request_ == null
-        ? com.google.showcase.v1beta1.RepeatRequest.getDefaultInstance()
-        : request_;
+    return getRequest();
   }
 
   public static final int BINDING_URI_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object bindingUri_ = "";
+  private volatile java.lang.Object bindingUri_;
 
   /**
    *
@@ -157,7 +156,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (request_ != null) {
       output.writeMessage(1, getRequest());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bindingUri_)) {
@@ -172,7 +171,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (request_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getRequest());
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bindingUri_)) {
@@ -338,31 +337,23 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.RepeatResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getRequestFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      request_ = null;
-      if (requestBuilder_ != null) {
-        requestBuilder_.dispose();
+      if (requestBuilder_ == null) {
+        request_ = null;
+      } else {
+        request_ = null;
         requestBuilder_ = null;
       }
       bindingUri_ = "";
+
       return this;
     }
 
@@ -390,26 +381,16 @@ public com.google.showcase.v1beta1.RepeatResponse build() {
     public com.google.showcase.v1beta1.RepeatResponse buildPartial() {
       com.google.showcase.v1beta1.RepeatResponse result =
           new com.google.showcase.v1beta1.RepeatResponse(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (requestBuilder_ == null) {
+        result.request_ = request_;
+      } else {
+        result.request_ = requestBuilder_.build();
       }
+      result.bindingUri_ = bindingUri_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.RepeatResponse result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.request_ = requestBuilder_ == null ? request_ : requestBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.bindingUri_ = bindingUri_;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -460,7 +441,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.RepeatResponse other) {
       }
       if (!other.getBindingUri().isEmpty()) {
         bindingUri_ = other.bindingUri_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -492,13 +472,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getRequestFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 bindingUri_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -518,8 +498,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.showcase.v1beta1.RepeatRequest request_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.showcase.v1beta1.RepeatRequest,
@@ -533,7 +511,7 @@ public Builder mergeFrom(
      * @return Whether the request field is set.
      */
     public boolean hasRequest() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return requestBuilder_ != null || request_ != null;
     }
 
     /**
@@ -558,11 +536,11 @@ public Builder setRequest(com.google.showcase.v1beta1.RepeatRequest value) {
           throw new NullPointerException();
         }
         request_ = value;
+        onChanged();
       } else {
         requestBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -570,49 +548,49 @@ public Builder setRequest(com.google.showcase.v1beta1.RepeatRequest value) {
     public Builder setRequest(com.google.showcase.v1beta1.RepeatRequest.Builder builderForValue) {
       if (requestBuilder_ == null) {
         request_ = builderForValue.build();
+        onChanged();
       } else {
         requestBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
     /** .google.showcase.v1beta1.RepeatRequest request = 1; */
     public Builder mergeRequest(com.google.showcase.v1beta1.RepeatRequest value) {
       if (requestBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && request_ != null
-            && request_ != com.google.showcase.v1beta1.RepeatRequest.getDefaultInstance()) {
-          getRequestBuilder().mergeFrom(value);
+        if (request_ != null) {
+          request_ =
+              com.google.showcase.v1beta1.RepeatRequest.newBuilder(request_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           request_ = value;
         }
+        onChanged();
       } else {
         requestBuilder_.mergeFrom(value);
       }
-      if (request_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
     /** .google.showcase.v1beta1.RepeatRequest request = 1; */
     public Builder clearRequest() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      request_ = null;
-      if (requestBuilder_ != null) {
-        requestBuilder_.dispose();
+      if (requestBuilder_ == null) {
+        request_ = null;
+        onChanged();
+      } else {
+        request_ = null;
         requestBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
     /** .google.showcase.v1beta1.RepeatRequest request = 1; */
     public com.google.showcase.v1beta1.RepeatRequest.Builder getRequestBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getRequestFieldBuilder().getBuilder();
     }
@@ -710,8 +688,8 @@ public Builder setBindingUri(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       bindingUri_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -728,8 +706,8 @@ public Builder setBindingUri(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearBindingUri() {
+
       bindingUri_ = getDefaultInstance().getBindingUri();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -751,8 +729,8 @@ public Builder setBindingUriBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       bindingUri_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatResponseOrBuilder.java
index 91566806cf..db14129a3e 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/compliance.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface RepeatResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionRequest.java
index 85557289e1..c895127439 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ReportSessionRequest();
   }
 
+  @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.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_ReportSessionRequest_descriptor;
@@ -65,9 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -315,8 +317,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       return this;
     }
 
@@ -344,20 +346,11 @@ public com.google.showcase.v1beta1.ReportSessionRequest build() {
     public com.google.showcase.v1beta1.ReportSessionRequest buildPartial() {
       com.google.showcase.v1beta1.ReportSessionRequest result =
           new com.google.showcase.v1beta1.ReportSessionRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.ReportSessionRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -406,7 +399,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ReportSessionRequest other)
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -438,7 +430,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -458,8 +450,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -524,8 +514,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -542,8 +532,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -565,8 +555,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionRequestOrBuilder.java
index b5407ccf05..63fed63d3b 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ReportSessionRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionResponse.java
index afb092d408..d411518ed0 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new ReportSessionResponse();
   }
 
+  @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.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_ReportSessionResponse_descriptor;
@@ -234,7 +238,7 @@ private Result(int value) {
   }
 
   public static final int RESULT_FIELD_NUMBER = 1;
-  private int result_ = 0;
+  private int result_;
 
   /**
    *
@@ -265,16 +269,15 @@ public int getResultValue() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.ReportSessionResponse.Result getResult() {
+    @SuppressWarnings("deprecation")
     com.google.showcase.v1beta1.ReportSessionResponse.Result result =
-        com.google.showcase.v1beta1.ReportSessionResponse.Result.forNumber(result_);
+        com.google.showcase.v1beta1.ReportSessionResponse.Result.valueOf(result_);
     return result == null
         ? com.google.showcase.v1beta1.ReportSessionResponse.Result.UNRECOGNIZED
         : result;
   }
 
   public static final int TEST_RUNS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List testRuns_;
 
   /**
@@ -561,15 +564,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       result_ = 0;
+
       if (testRunsBuilder_ == null) {
         testRuns_ = java.util.Collections.emptyList();
       } else {
         testRuns_ = null;
         testRunsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -597,32 +600,19 @@ public com.google.showcase.v1beta1.ReportSessionResponse build() {
     public com.google.showcase.v1beta1.ReportSessionResponse buildPartial() {
       com.google.showcase.v1beta1.ReportSessionResponse result =
           new com.google.showcase.v1beta1.ReportSessionResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(
-        com.google.showcase.v1beta1.ReportSessionResponse result) {
+      int from_bitField0_ = bitField0_;
+      result.result_ = result_;
       if (testRunsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           testRuns_ = java.util.Collections.unmodifiableList(testRuns_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.testRuns_ = testRuns_;
       } else {
         result.testRuns_ = testRunsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.ReportSessionResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.result_ = result_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -678,7 +668,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ReportSessionResponse other
         if (!other.testRuns_.isEmpty()) {
           if (testRuns_.isEmpty()) {
             testRuns_ = other.testRuns_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureTestRunsIsMutable();
             testRuns_.addAll(other.testRuns_);
@@ -691,7 +681,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ReportSessionResponse other
             testRunsBuilder_.dispose();
             testRunsBuilder_ = null;
             testRuns_ = other.testRuns_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             testRunsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getTestRunsFieldBuilder()
@@ -730,7 +720,7 @@ public Builder mergeFrom(
             case 8:
               {
                 result_ = input.readEnum();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 8
             case 18:
@@ -796,8 +786,8 @@ public int getResultValue() {
      * @return This builder for chaining.
      */
     public Builder setResultValue(int value) {
+
       result_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -815,8 +805,9 @@ public Builder setResultValue(int value) {
      */
     @java.lang.Override
     public com.google.showcase.v1beta1.ReportSessionResponse.Result getResult() {
+      @SuppressWarnings("deprecation")
       com.google.showcase.v1beta1.ReportSessionResponse.Result result =
-          com.google.showcase.v1beta1.ReportSessionResponse.Result.forNumber(result_);
+          com.google.showcase.v1beta1.ReportSessionResponse.Result.valueOf(result_);
       return result == null
           ? com.google.showcase.v1beta1.ReportSessionResponse.Result.UNRECOGNIZED
           : result;
@@ -838,7 +829,7 @@ public Builder setResult(com.google.showcase.v1beta1.ReportSessionResponse.Resul
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000001;
+
       result_ = value.getNumber();
       onChanged();
       return this;
@@ -856,7 +847,7 @@ public Builder setResult(com.google.showcase.v1beta1.ReportSessionResponse.Resul
      * @return This builder for chaining.
      */
     public Builder clearResult() {
-      bitField0_ = (bitField0_ & ~0x00000001);
+
       result_ = 0;
       onChanged();
       return this;
@@ -866,9 +857,9 @@ public Builder clearResult() {
         java.util.Collections.emptyList();
 
     private void ensureTestRunsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         testRuns_ = new java.util.ArrayList(testRuns_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1093,7 +1084,7 @@ public Builder addAllTestRuns(
     public Builder clearTestRuns() {
       if (testRunsBuilder_ == null) {
         testRuns_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         testRunsBuilder_.clear();
@@ -1221,7 +1212,7 @@ public java.util.List getTestRunsBu
                 com.google.showcase.v1beta1.TestRun,
                 com.google.showcase.v1beta1.TestRun.Builder,
                 com.google.showcase.v1beta1.TestRunOrBuilder>(
-                testRuns_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                testRuns_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         testRuns_ = null;
       }
       return testRunsBuilder_;
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionResponseOrBuilder.java
index 55a54e50b9..c37784bc94 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface ReportSessionResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RestError.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RestError.java
index 86c92d1566..f99185ef0f 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RestError.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RestError.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/rest_error.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -48,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new RestError();
   }
 
+  @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.showcase.v1beta1.RestErrorOuterClass
         .internal_static_google_showcase_v1beta1_RestError_descriptor;
@@ -213,6 +217,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.showcase.v1beta1.RestErrorOuterClass
           .internal_static_google_showcase_v1beta1_RestError_Status_descriptor;
@@ -229,7 +238,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     public static final int CODE_FIELD_NUMBER = 1;
-    private int code_ = 0;
+    private int code_;
 
     /**
      *
@@ -248,9 +257,7 @@ public int getCode() {
     }
 
     public static final int MESSAGE_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object message_ = "";
+    private volatile java.lang.Object message_;
 
     /**
      *
@@ -301,7 +308,7 @@ public com.google.protobuf.ByteString getMessageBytes() {
     }
 
     public static final int STATUS_FIELD_NUMBER = 4;
-    private int status_ = 0;
+    private int status_;
 
     /**
      *
@@ -332,13 +339,12 @@ public int getStatusValue() {
      */
     @java.lang.Override
     public com.google.rpc.Code getStatus() {
-      com.google.rpc.Code result = com.google.rpc.Code.forNumber(status_);
+      @SuppressWarnings("deprecation")
+      com.google.rpc.Code result = com.google.rpc.Code.valueOf(status_);
       return result == null ? com.google.rpc.Code.UNRECOGNIZED : result;
     }
 
     public static final int DETAILS_FIELD_NUMBER = 5;
-
-    @SuppressWarnings("serial")
     private java.util.List details_;
 
     /**
@@ -632,17 +638,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         code_ = 0;
+
         message_ = "";
+
         status_ = 0;
+
         if (detailsBuilder_ == null) {
           details_ = java.util.Collections.emptyList();
         } else {
           details_ = null;
           detailsBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -670,37 +678,21 @@ public com.google.showcase.v1beta1.RestError.Status build() {
       public com.google.showcase.v1beta1.RestError.Status buildPartial() {
         com.google.showcase.v1beta1.RestError.Status result =
             new com.google.showcase.v1beta1.RestError.Status(this);
-        buildPartialRepeatedFields(result);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
-        onBuilt();
-        return result;
-      }
-
-      private void buildPartialRepeatedFields(com.google.showcase.v1beta1.RestError.Status result) {
+        int from_bitField0_ = bitField0_;
+        result.code_ = code_;
+        result.message_ = message_;
+        result.status_ = status_;
         if (detailsBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             details_ = java.util.Collections.unmodifiableList(details_);
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.details_ = details_;
         } else {
           result.details_ = detailsBuilder_.build();
         }
-      }
-
-      private void buildPartial0(com.google.showcase.v1beta1.RestError.Status result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.code_ = code_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.message_ = message_;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.status_ = status_;
-        }
+        onBuilt();
+        return result;
       }
 
       @java.lang.Override
@@ -755,7 +747,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.RestError.Status other) {
         }
         if (!other.getMessage().isEmpty()) {
           message_ = other.message_;
-          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.status_ != 0) {
@@ -765,7 +756,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.RestError.Status other) {
           if (!other.details_.isEmpty()) {
             if (details_.isEmpty()) {
               details_ = other.details_;
-              bitField0_ = (bitField0_ & ~0x00000008);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureDetailsIsMutable();
               details_.addAll(other.details_);
@@ -778,7 +769,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.RestError.Status other) {
               detailsBuilder_.dispose();
               detailsBuilder_ = null;
               details_ = other.details_;
-              bitField0_ = (bitField0_ & ~0x00000008);
+              bitField0_ = (bitField0_ & ~0x00000001);
               detailsBuilder_ =
                   com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                       ? getDetailsFieldBuilder()
@@ -817,19 +808,19 @@ public Builder mergeFrom(
               case 8:
                 {
                   code_ = input.readInt32();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 8
               case 18:
                 {
                   message_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               case 32:
                 {
                   status_ = input.readEnum();
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 32
               case 42:
@@ -896,7 +887,6 @@ public int getCode() {
       public Builder setCode(int value) {
 
         code_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -913,7 +903,7 @@ public Builder setCode(int value) {
        * @return This builder for chaining.
        */
       public Builder clearCode() {
-        bitField0_ = (bitField0_ & ~0x00000001);
+
         code_ = 0;
         onChanged();
         return this;
@@ -983,8 +973,8 @@ public Builder setMessage(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         message_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1001,8 +991,8 @@ public Builder setMessage(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearMessage() {
+
         message_ = getDefaultInstance().getMessage();
-        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1024,8 +1014,8 @@ public Builder setMessageBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         message_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1061,8 +1051,8 @@ public int getStatusValue() {
        * @return This builder for chaining.
        */
       public Builder setStatusValue(int value) {
+
         status_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1080,7 +1070,8 @@ public Builder setStatusValue(int value) {
        */
       @java.lang.Override
       public com.google.rpc.Code getStatus() {
-        com.google.rpc.Code result = com.google.rpc.Code.forNumber(status_);
+        @SuppressWarnings("deprecation")
+        com.google.rpc.Code result = com.google.rpc.Code.valueOf(status_);
         return result == null ? com.google.rpc.Code.UNRECOGNIZED : result;
       }
 
@@ -1100,7 +1091,7 @@ public Builder setStatus(com.google.rpc.Code value) {
         if (value == null) {
           throw new NullPointerException();
         }
-        bitField0_ |= 0x00000004;
+
         status_ = value.getNumber();
         onChanged();
         return this;
@@ -1118,7 +1109,7 @@ public Builder setStatus(com.google.rpc.Code value) {
        * @return This builder for chaining.
        */
       public Builder clearStatus() {
-        bitField0_ = (bitField0_ & ~0x00000004);
+
         status_ = 0;
         onChanged();
         return this;
@@ -1127,9 +1118,9 @@ public Builder clearStatus() {
       private java.util.List details_ = java.util.Collections.emptyList();
 
       private void ensureDetailsIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           details_ = new java.util.ArrayList(details_);
-          bitField0_ |= 0x00000008;
+          bitField0_ |= 0x00000001;
         }
       }
 
@@ -1351,7 +1342,7 @@ public Builder addAllDetails(java.lang.Iterable getDetailsBuilderList() {
                   com.google.protobuf.Any,
                   com.google.protobuf.Any.Builder,
                   com.google.protobuf.AnyOrBuilder>(
-                  details_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
+                  details_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
           details_ = null;
         }
         return detailsBuilder_;
@@ -1547,7 +1538,6 @@ public com.google.showcase.v1beta1.RestError.Status getDefaultInstanceForType()
     }
   }
 
-  private int bitField0_;
   public static final int ERROR_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.RestError.Status error_;
 
@@ -1558,7 +1548,7 @@ public com.google.showcase.v1beta1.RestError.Status getDefaultInstanceForType()
    */
   @java.lang.Override
   public boolean hasError() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return error_ != null;
   }
 
   /**
@@ -1576,9 +1566,7 @@ public com.google.showcase.v1beta1.RestError.Status getError() {
   /** .google.showcase.v1beta1.RestError.Status error = 1; */
   @java.lang.Override
   public com.google.showcase.v1beta1.RestError.StatusOrBuilder getErrorOrBuilder() {
-    return error_ == null
-        ? com.google.showcase.v1beta1.RestError.Status.getDefaultInstance()
-        : error_;
+    return getError();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -1595,7 +1583,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (error_ != null) {
       output.writeMessage(1, getError());
     }
     getUnknownFields().writeTo(output);
@@ -1607,7 +1595,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (error_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getError());
     }
     size += getUnknownFields().getSerializedSize();
@@ -1774,28 +1762,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.RestError.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getErrorFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      error_ = null;
-      if (errorBuilder_ != null) {
-        errorBuilder_.dispose();
+      if (errorBuilder_ == null) {
+        error_ = null;
+      } else {
+        error_ = null;
         errorBuilder_ = null;
       }
       return this;
@@ -1825,23 +1804,15 @@ public com.google.showcase.v1beta1.RestError build() {
     public com.google.showcase.v1beta1.RestError buildPartial() {
       com.google.showcase.v1beta1.RestError result =
           new com.google.showcase.v1beta1.RestError(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (errorBuilder_ == null) {
+        result.error_ = error_;
+      } else {
+        result.error_ = errorBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.RestError result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.error_ = errorBuilder_ == null ? error_ : errorBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -1919,7 +1890,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getErrorFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -1939,8 +1910,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.showcase.v1beta1.RestError.Status error_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.showcase.v1beta1.RestError.Status,
@@ -1954,7 +1923,7 @@ public Builder mergeFrom(
      * @return Whether the error field is set.
      */
     public boolean hasError() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return errorBuilder_ != null || error_ != null;
     }
 
     /**
@@ -1979,11 +1948,11 @@ public Builder setError(com.google.showcase.v1beta1.RestError.Status value) {
           throw new NullPointerException();
         }
         error_ = value;
+        onChanged();
       } else {
         errorBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -1991,49 +1960,49 @@ public Builder setError(com.google.showcase.v1beta1.RestError.Status value) {
     public Builder setError(com.google.showcase.v1beta1.RestError.Status.Builder builderForValue) {
       if (errorBuilder_ == null) {
         error_ = builderForValue.build();
+        onChanged();
       } else {
         errorBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
     /** .google.showcase.v1beta1.RestError.Status error = 1; */
     public Builder mergeError(com.google.showcase.v1beta1.RestError.Status value) {
       if (errorBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && error_ != null
-            && error_ != com.google.showcase.v1beta1.RestError.Status.getDefaultInstance()) {
-          getErrorBuilder().mergeFrom(value);
+        if (error_ != null) {
+          error_ =
+              com.google.showcase.v1beta1.RestError.Status.newBuilder(error_)
+                  .mergeFrom(value)
+                  .buildPartial();
         } else {
           error_ = value;
         }
+        onChanged();
       } else {
         errorBuilder_.mergeFrom(value);
       }
-      if (error_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
     /** .google.showcase.v1beta1.RestError.Status error = 1; */
     public Builder clearError() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      error_ = null;
-      if (errorBuilder_ != null) {
-        errorBuilder_.dispose();
+      if (errorBuilder_ == null) {
+        error_ = null;
+        onChanged();
+      } else {
+        error_ = null;
         errorBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
     /** .google.showcase.v1beta1.RestError.Status error = 1; */
     public com.google.showcase.v1beta1.RestError.Status.Builder getErrorBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getErrorFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RestErrorOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RestErrorOrBuilder.java
index da9e058e83..c5bd85534f 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RestErrorOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RestErrorOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/rest_error.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface RestErrorOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RestErrorOuterClass.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RestErrorOuterClass.java
index 72659abca9..62a5a5cdc0 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RestErrorOuterClass.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RestErrorOuterClass.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/rest_error.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public final class RestErrorOuterClass {
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Room.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Room.java
index 2717e4ee26..161cd8b028 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Room.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Room.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Room();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_Room_descriptor;
@@ -65,11 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.Room.class, com.google.showcase.v1beta1.Room.Builder.class);
   }
 
-  private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -120,9 +121,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object displayName_ = "";
+  private volatile java.lang.Object displayName_;
 
   /**
    *
@@ -173,9 +172,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object description_ = "";
+  private volatile java.lang.Object description_;
 
   /**
    *
@@ -242,7 +239,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return createTime_ != null;
   }
 
   /**
@@ -274,7 +271,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+    return getCreateTime();
   }
 
   public static final int UPDATE_TIME_FIELD_NUMBER = 5;
@@ -294,7 +291,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateTime() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return updateTime_ != null;
   }
 
   /**
@@ -326,7 +323,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+    return getUpdateTime();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -352,10 +349,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, description_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       output.writeMessage(4, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateTime_ != null) {
       output.writeMessage(5, getUpdateTime());
     }
     getUnknownFields().writeTo(output);
@@ -376,10 +373,10 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, description_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getUpdateTime());
     }
     size += getUnknownFields().getSerializedSize();
@@ -562,37 +559,31 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.Room.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCreateTimeFieldBuilder();
-        getUpdateTimeFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       displayName_ = "";
+
       description_ = "";
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
       return this;
@@ -621,36 +612,23 @@ public com.google.showcase.v1beta1.Room build() {
     @java.lang.Override
     public com.google.showcase.v1beta1.Room buildPartial() {
       com.google.showcase.v1beta1.Room result = new com.google.showcase.v1beta1.Room(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.name_ = name_;
+      result.displayName_ = displayName_;
+      result.description_ = description_;
+      if (createTimeBuilder_ == null) {
+        result.createTime_ = createTime_;
+      } else {
+        result.createTime_ = createTimeBuilder_.build();
+      }
+      if (updateTimeBuilder_ == null) {
+        result.updateTime_ = updateTime_;
+      } else {
+        result.updateTime_ = updateTimeBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.Room result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.displayName_ = displayName_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.description_ = description_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -698,17 +676,14 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Room other) {
       if (other == com.google.showcase.v1beta1.Room.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.hasCreateTime()) {
@@ -746,31 +721,31 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 description_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             case 42:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 42
             default:
@@ -790,8 +765,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -856,8 +829,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -874,8 +847,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -897,8 +870,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -967,8 +940,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       displayName_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -985,8 +958,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
+
       displayName_ = getDefaultInstance().getDisplayName();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1008,8 +981,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       displayName_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1078,8 +1051,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       description_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1096,8 +1069,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
+
       description_ = getDefaultInstance().getDescription();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1119,8 +1092,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       description_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1146,7 +1119,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return ((bitField0_ & 0x00000008) != 0);
+      return createTimeBuilder_ != null || createTime_ != null;
     }
 
     /**
@@ -1189,11 +1162,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -1211,11 +1184,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -1232,20 +1205,17 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)
-            && createTime_ != null
-            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getCreateTimeBuilder().mergeFrom(value);
+        if (createTime_ != null) {
+          createTime_ =
+              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
         } else {
           createTime_ = value;
         }
+        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-      if (createTime_ != null) {
-        bitField0_ |= 0x00000008;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1261,13 +1231,14 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearCreateTime() {
-      bitField0_ = (bitField0_ & ~0x00000008);
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+        onChanged();
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1283,7 +1254,7 @@ public Builder clearCreateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-      bitField0_ |= 0x00000008;
+
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -1358,7 +1329,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      * @return Whether the updateTime field is set.
      */
     public boolean hasUpdateTime() {
-      return ((bitField0_ & 0x00000010) != 0);
+      return updateTimeBuilder_ != null || updateTime_ != null;
     }
 
     /**
@@ -1401,11 +1372,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         updateTime_ = value;
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -1423,11 +1394,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
     public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (updateTimeBuilder_ == null) {
         updateTime_ = builderForValue.build();
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -1444,20 +1415,17 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       if (updateTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)
-            && updateTime_ != null
-            && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getUpdateTimeBuilder().mergeFrom(value);
+        if (updateTime_ != null) {
+          updateTime_ =
+              com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
         } else {
           updateTime_ = value;
         }
+        onChanged();
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-      if (updateTime_ != null) {
-        bitField0_ |= 0x00000010;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1473,13 +1441,14 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearUpdateTime() {
-      bitField0_ = (bitField0_ & ~0x00000010);
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+        onChanged();
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1495,7 +1464,7 @@ public Builder clearUpdateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-      bitField0_ |= 0x00000010;
+
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RoomOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RoomOrBuilder.java
index 486d7cbfa6..bd16570831 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RoomOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RoomOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface RoomOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsMetadata.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsMetadata.java
index ca42f14761..2db8e869cb 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsMetadata.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsMetadata.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -48,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SearchBlurbsMetadata();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_SearchBlurbsMetadata_descriptor;
@@ -63,7 +67,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.SearchBlurbsMetadata.Builder.class);
   }
 
-  private int bitField0_;
   public static final int RETRY_INFO_FIELD_NUMBER = 1;
   private com.google.rpc.RetryInfo retryInfo_;
 
@@ -80,7 +83,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasRetryInfo() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return retryInfo_ != null;
   }
 
   /**
@@ -110,7 +113,7 @@ public com.google.rpc.RetryInfo getRetryInfo() {
    */
   @java.lang.Override
   public com.google.rpc.RetryInfoOrBuilder getRetryInfoOrBuilder() {
-    return retryInfo_ == null ? com.google.rpc.RetryInfo.getDefaultInstance() : retryInfo_;
+    return getRetryInfo();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -127,7 +130,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (retryInfo_ != null) {
       output.writeMessage(1, getRetryInfo());
     }
     getUnknownFields().writeTo(output);
@@ -139,7 +142,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (retryInfo_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getRetryInfo());
     }
     size += getUnknownFields().getSerializedSize();
@@ -308,28 +311,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.SearchBlurbsMetadata.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getRetryInfoFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      retryInfo_ = null;
-      if (retryInfoBuilder_ != null) {
-        retryInfoBuilder_.dispose();
+      if (retryInfoBuilder_ == null) {
+        retryInfo_ = null;
+      } else {
+        retryInfo_ = null;
         retryInfoBuilder_ = null;
       }
       return this;
@@ -359,23 +353,15 @@ public com.google.showcase.v1beta1.SearchBlurbsMetadata build() {
     public com.google.showcase.v1beta1.SearchBlurbsMetadata buildPartial() {
       com.google.showcase.v1beta1.SearchBlurbsMetadata result =
           new com.google.showcase.v1beta1.SearchBlurbsMetadata(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (retryInfoBuilder_ == null) {
+        result.retryInfo_ = retryInfo_;
+      } else {
+        result.retryInfo_ = retryInfoBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.SearchBlurbsMetadata result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.retryInfo_ = retryInfoBuilder_ == null ? retryInfo_ : retryInfoBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -454,7 +440,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getRetryInfoFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -474,8 +460,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.rpc.RetryInfo retryInfo_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.rpc.RetryInfo,
@@ -495,7 +479,7 @@ public Builder mergeFrom(
      * @return Whether the retryInfo field is set.
      */
     public boolean hasRetryInfo() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return retryInfoBuilder_ != null || retryInfo_ != null;
     }
 
     /**
@@ -532,11 +516,11 @@ public Builder setRetryInfo(com.google.rpc.RetryInfo value) {
           throw new NullPointerException();
         }
         retryInfo_ = value;
+        onChanged();
       } else {
         retryInfoBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -552,11 +536,11 @@ public Builder setRetryInfo(com.google.rpc.RetryInfo value) {
     public Builder setRetryInfo(com.google.rpc.RetryInfo.Builder builderForValue) {
       if (retryInfoBuilder_ == null) {
         retryInfo_ = builderForValue.build();
+        onChanged();
       } else {
         retryInfoBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -571,20 +555,17 @@ public Builder setRetryInfo(com.google.rpc.RetryInfo.Builder builderForValue) {
      */
     public Builder mergeRetryInfo(com.google.rpc.RetryInfo value) {
       if (retryInfoBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && retryInfo_ != null
-            && retryInfo_ != com.google.rpc.RetryInfo.getDefaultInstance()) {
-          getRetryInfoBuilder().mergeFrom(value);
+        if (retryInfo_ != null) {
+          retryInfo_ =
+              com.google.rpc.RetryInfo.newBuilder(retryInfo_).mergeFrom(value).buildPartial();
         } else {
           retryInfo_ = value;
         }
+        onChanged();
       } else {
         retryInfoBuilder_.mergeFrom(value);
       }
-      if (retryInfo_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -598,13 +579,14 @@ public Builder mergeRetryInfo(com.google.rpc.RetryInfo value) {
      * .google.rpc.RetryInfo retry_info = 1;
      */
     public Builder clearRetryInfo() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      retryInfo_ = null;
-      if (retryInfoBuilder_ != null) {
-        retryInfoBuilder_.dispose();
+      if (retryInfoBuilder_ == null) {
+        retryInfo_ = null;
+        onChanged();
+      } else {
+        retryInfo_ = null;
         retryInfoBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -618,7 +600,7 @@ public Builder clearRetryInfo() {
      * .google.rpc.RetryInfo retry_info = 1;
      */
     public com.google.rpc.RetryInfo.Builder getRetryInfoBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getRetryInfoFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsMetadataOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsMetadataOrBuilder.java
index 0ba92ceba3..bb168ffb4f 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsMetadataOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsMetadataOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface SearchBlurbsMetadataOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsRequest.java
index 9da8cb9aef..6284cad382 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SearchBlurbsRequest();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_SearchBlurbsRequest_descriptor;
@@ -68,9 +72,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int QUERY_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object query_ = "";
+  private volatile java.lang.Object query_;
 
   /**
    *
@@ -123,9 +125,7 @@ public com.google.protobuf.ByteString getQueryBytes() {
   }
 
   public static final int PARENT_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object parent_ = "";
+  private volatile java.lang.Object parent_;
 
   /**
    *
@@ -178,7 +178,7 @@ public com.google.protobuf.ByteString getParentBytes() {
   }
 
   public static final int PAGE_SIZE_FIELD_NUMBER = 3;
-  private int pageSize_ = 0;
+  private int pageSize_;
 
   /**
    *
@@ -199,9 +199,7 @@ public int getPageSize() {
   }
 
   public static final int PAGE_TOKEN_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object pageToken_ = "";
+  private volatile java.lang.Object pageToken_;
 
   /**
    *
@@ -483,11 +481,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       query_ = "";
+
       parent_ = "";
+
       pageSize_ = 0;
+
       pageToken_ = "";
+
       return this;
     }
 
@@ -515,29 +516,14 @@ public com.google.showcase.v1beta1.SearchBlurbsRequest build() {
     public com.google.showcase.v1beta1.SearchBlurbsRequest buildPartial() {
       com.google.showcase.v1beta1.SearchBlurbsRequest result =
           new com.google.showcase.v1beta1.SearchBlurbsRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.query_ = query_;
+      result.parent_ = parent_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.SearchBlurbsRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.query_ = query_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.parent_ = parent_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.pageSize_ = pageSize_;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.pageToken_ = pageToken_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -586,12 +572,10 @@ public Builder mergeFrom(com.google.showcase.v1beta1.SearchBlurbsRequest other)
         return this;
       if (!other.getQuery().isEmpty()) {
         query_ = other.query_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getParent().isEmpty()) {
         parent_ = other.parent_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (other.getPageSize() != 0) {
@@ -599,7 +583,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.SearchBlurbsRequest other)
       }
       if (!other.getPageToken().isEmpty()) {
         pageToken_ = other.pageToken_;
-        bitField0_ |= 0x00000008;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -631,25 +614,25 @@ public Builder mergeFrom(
             case 10:
               {
                 query_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 parent_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 24:
               {
                 pageSize_ = input.readInt32();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 24
             case 34:
               {
                 pageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             default:
@@ -669,8 +652,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object query_ = "";
 
     /**
@@ -738,8 +719,8 @@ public Builder setQuery(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       query_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -757,8 +738,8 @@ public Builder setQuery(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearQuery() {
+
       query_ = getDefaultInstance().getQuery();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -781,8 +762,8 @@ public Builder setQueryBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       query_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -854,8 +835,8 @@ public Builder setParent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       parent_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -873,8 +854,8 @@ public Builder setParent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearParent() {
+
       parent_ = getDefaultInstance().getParent();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -897,8 +878,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       parent_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -940,7 +921,6 @@ public int getPageSize() {
     public Builder setPageSize(int value) {
 
       pageSize_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -959,7 +939,7 @@ public Builder setPageSize(int value) {
      * @return This builder for chaining.
      */
     public Builder clearPageSize() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+
       pageSize_ = 0;
       onChanged();
       return this;
@@ -1038,8 +1018,8 @@ public Builder setPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       pageToken_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -1059,8 +1039,8 @@ public Builder setPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearPageToken() {
+
       pageToken_ = getDefaultInstance().getPageToken();
-      bitField0_ = (bitField0_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -1085,8 +1065,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       pageToken_ = value;
-      bitField0_ |= 0x00000008;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsRequestOrBuilder.java
index f06817323a..c55a0f9e4a 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface SearchBlurbsRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsResponse.java
index cbd0a1c7e8..29da80e282 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -51,6 +50,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SearchBlurbsResponse();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_SearchBlurbsResponse_descriptor;
@@ -67,8 +71,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int BLURBS_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
   private java.util.List blurbs_;
 
   /**
@@ -143,9 +145,7 @@ public com.google.showcase.v1beta1.BlurbOrBuilder getBlurbsOrBuilder(int index)
   }
 
   public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nextPageToken_ = "";
+  private volatile java.lang.Object nextPageToken_;
 
   /**
    *
@@ -411,7 +411,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (blurbsBuilder_ == null) {
         blurbs_ = java.util.Collections.emptyList();
       } else {
@@ -420,6 +419,7 @@ public Builder clear() {
       }
       bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
+
       return this;
     }
 
@@ -447,16 +447,7 @@ public com.google.showcase.v1beta1.SearchBlurbsResponse build() {
     public com.google.showcase.v1beta1.SearchBlurbsResponse buildPartial() {
       com.google.showcase.v1beta1.SearchBlurbsResponse result =
           new com.google.showcase.v1beta1.SearchBlurbsResponse(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(
-        com.google.showcase.v1beta1.SearchBlurbsResponse result) {
+      int from_bitField0_ = bitField0_;
       if (blurbsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           blurbs_ = java.util.Collections.unmodifiableList(blurbs_);
@@ -466,13 +457,9 @@ private void buildPartialRepeatedFields(
       } else {
         result.blurbs_ = blurbsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.SearchBlurbsResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.nextPageToken_ = nextPageToken_;
-      }
+      result.nextPageToken_ = nextPageToken_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -550,7 +537,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.SearchBlurbsResponse other)
       }
       if (!other.getNextPageToken().isEmpty()) {
         nextPageToken_ = other.nextPageToken_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -595,7 +581,7 @@ public Builder mergeFrom(
             case 18:
               {
                 nextPageToken_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -1053,8 +1039,8 @@ public Builder setNextPageToken(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1074,8 +1060,8 @@ public Builder setNextPageToken(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNextPageToken() {
+
       nextPageToken_ = getDefaultInstance().getNextPageToken();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1100,8 +1086,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       nextPageToken_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsResponseOrBuilder.java
index d0c6cc0798..90f1e1e1b4 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface SearchBlurbsResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SendBlurbsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SendBlurbsResponse.java
index a65386b9b6..b16f955ac1 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SendBlurbsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SendBlurbsResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -41,7 +40,7 @@ private SendBlurbsResponse(com.google.protobuf.GeneratedMessageV3.Builder bui
   }
 
   private SendBlurbsResponse() {
-    names_ = com.google.protobuf.LazyStringArrayList.emptyList();
+    names_ = com.google.protobuf.LazyStringArrayList.EMPTY;
   }
 
   @java.lang.Override
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new SendBlurbsResponse();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_SendBlurbsResponse_descriptor;
@@ -66,10 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAMES_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.LazyStringArrayList names_ =
-      com.google.protobuf.LazyStringArrayList.emptyList();
+  private com.google.protobuf.LazyStringList names_;
 
   /**
    *
@@ -339,8 +340,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      names_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      names_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -368,21 +369,16 @@ public com.google.showcase.v1beta1.SendBlurbsResponse build() {
     public com.google.showcase.v1beta1.SendBlurbsResponse buildPartial() {
       com.google.showcase.v1beta1.SendBlurbsResponse result =
           new com.google.showcase.v1beta1.SendBlurbsResponse(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        names_ = names_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
+      result.names_ = names_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.SendBlurbsResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        names_.makeImmutable();
-        result.names_ = names_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -431,7 +427,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.SendBlurbsResponse other) {
       if (!other.names_.isEmpty()) {
         if (names_.isEmpty()) {
           names_ = other.names_;
-          bitField0_ |= 0x00000001;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureNamesIsMutable();
           names_.addAll(other.names_);
@@ -490,14 +486,14 @@ public Builder mergeFrom(
 
     private int bitField0_;
 
-    private com.google.protobuf.LazyStringArrayList names_ =
-        com.google.protobuf.LazyStringArrayList.emptyList();
+    private com.google.protobuf.LazyStringList names_ =
+        com.google.protobuf.LazyStringArrayList.EMPTY;
 
     private void ensureNamesIsMutable() {
-      if (!names_.isModifiable()) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         names_ = new com.google.protobuf.LazyStringArrayList(names_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000001;
     }
 
     /**
@@ -512,8 +508,7 @@ private void ensureNamesIsMutable() {
      * @return A list containing the names.
      */
     public com.google.protobuf.ProtocolStringList getNamesList() {
-      names_.makeImmutable();
-      return names_;
+      return names_.getUnmodifiableView();
     }
 
     /**
@@ -582,7 +577,6 @@ public Builder setNames(int index, java.lang.String value) {
       }
       ensureNamesIsMutable();
       names_.set(index, value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -605,7 +599,6 @@ public Builder addNames(java.lang.String value) {
       }
       ensureNamesIsMutable();
       names_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -625,7 +618,6 @@ public Builder addNames(java.lang.String value) {
     public Builder addAllNames(java.lang.Iterable values) {
       ensureNamesIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, names_);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -642,9 +634,8 @@ public Builder addAllNames(java.lang.Iterable values) {
      * @return This builder for chaining.
      */
     public Builder clearNames() {
-      names_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      names_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000001);
-      ;
       onChanged();
       return this;
     }
@@ -668,7 +659,6 @@ public Builder addNamesBytes(com.google.protobuf.ByteString value) {
       checkByteStringIsUtf8(value);
       ensureNamesIsMutable();
       names_.add(value);
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SendBlurbsResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SendBlurbsResponseOrBuilder.java
index 2160e86809..658b06a1e5 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SendBlurbsResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SendBlurbsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface SendBlurbsResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Sequence.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Sequence.java
index ab361d6200..6abf68277c 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Sequence.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Sequence.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.Sequence} */
@@ -42,6 +41,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Sequence();
   }
 
+  @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.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_Sequence_descriptor;
@@ -165,6 +169,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.showcase.v1beta1.SequenceOuterClass
           .internal_static_google_showcase_v1beta1_Sequence_Response_descriptor;
@@ -180,7 +189,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
               com.google.showcase.v1beta1.Sequence.Response.Builder.class);
     }
 
-    private int bitField0_;
     public static final int STATUS_FIELD_NUMBER = 1;
     private com.google.rpc.Status status_;
 
@@ -197,7 +205,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      */
     @java.lang.Override
     public boolean hasStatus() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return status_ != null;
     }
 
     /**
@@ -227,7 +235,7 @@ public com.google.rpc.Status getStatus() {
      */
     @java.lang.Override
     public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
-      return status_ == null ? com.google.rpc.Status.getDefaultInstance() : status_;
+      return getStatus();
     }
 
     public static final int DELAY_FIELD_NUMBER = 2;
@@ -246,7 +254,7 @@ public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
      */
     @java.lang.Override
     public boolean hasDelay() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return delay_ != null;
     }
 
     /**
@@ -276,7 +284,7 @@ public com.google.protobuf.Duration getDelay() {
      */
     @java.lang.Override
     public com.google.protobuf.DurationOrBuilder getDelayOrBuilder() {
-      return delay_ == null ? com.google.protobuf.Duration.getDefaultInstance() : delay_;
+      return getDelay();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -293,10 +301,10 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (status_ != null) {
         output.writeMessage(1, getStatus());
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (delay_ != null) {
         output.writeMessage(2, getDelay());
       }
       getUnknownFields().writeTo(output);
@@ -308,10 +316,10 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (status_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getStatus());
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (delay_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getDelay());
       }
       size += getUnknownFields().getSerializedSize();
@@ -489,34 +497,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.showcase.v1beta1.Sequence.Response.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getStatusFieldBuilder();
-          getDelayFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
-        status_ = null;
-        if (statusBuilder_ != null) {
-          statusBuilder_.dispose();
+        if (statusBuilder_ == null) {
+          status_ = null;
+        } else {
+          status_ = null;
           statusBuilder_ = null;
         }
-        delay_ = null;
-        if (delayBuilder_ != null) {
-          delayBuilder_.dispose();
+        if (delayBuilder_ == null) {
+          delay_ = null;
+        } else {
+          delay_ = null;
           delayBuilder_ = null;
         }
         return this;
@@ -546,27 +545,20 @@ public com.google.showcase.v1beta1.Sequence.Response build() {
       public com.google.showcase.v1beta1.Sequence.Response buildPartial() {
         com.google.showcase.v1beta1.Sequence.Response result =
             new com.google.showcase.v1beta1.Sequence.Response(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        if (statusBuilder_ == null) {
+          result.status_ = status_;
+        } else {
+          result.status_ = statusBuilder_.build();
+        }
+        if (delayBuilder_ == null) {
+          result.delay_ = delay_;
+        } else {
+          result.delay_ = delayBuilder_.build();
         }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.showcase.v1beta1.Sequence.Response result) {
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.status_ = statusBuilder_ == null ? status_ : statusBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.delay_ = delayBuilder_ == null ? delay_ : delayBuilder_.build();
-          to_bitField0_ |= 0x00000002;
-        }
-        result.bitField0_ |= to_bitField0_;
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -650,13 +642,13 @@ public Builder mergeFrom(
               case 10:
                 {
                   input.readMessage(getStatusFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   input.readMessage(getDelayFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               default:
@@ -676,8 +668,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private com.google.rpc.Status status_;
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder>
@@ -695,7 +685,7 @@ public Builder mergeFrom(
        * @return Whether the status field is set.
        */
       public boolean hasStatus() {
-        return ((bitField0_ & 0x00000001) != 0);
+        return statusBuilder_ != null || status_ != null;
       }
 
       /**
@@ -732,11 +722,11 @@ public Builder setStatus(com.google.rpc.Status value) {
             throw new NullPointerException();
           }
           status_ = value;
+          onChanged();
         } else {
           statusBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+
         return this;
       }
 
@@ -752,11 +742,11 @@ public Builder setStatus(com.google.rpc.Status value) {
       public Builder setStatus(com.google.rpc.Status.Builder builderForValue) {
         if (statusBuilder_ == null) {
           status_ = builderForValue.build();
+          onChanged();
         } else {
           statusBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+
         return this;
       }
 
@@ -771,20 +761,16 @@ public Builder setStatus(com.google.rpc.Status.Builder builderForValue) {
        */
       public Builder mergeStatus(com.google.rpc.Status value) {
         if (statusBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)
-              && status_ != null
-              && status_ != com.google.rpc.Status.getDefaultInstance()) {
-            getStatusBuilder().mergeFrom(value);
+          if (status_ != null) {
+            status_ = com.google.rpc.Status.newBuilder(status_).mergeFrom(value).buildPartial();
           } else {
             status_ = value;
           }
+          onChanged();
         } else {
           statusBuilder_.mergeFrom(value);
         }
-        if (status_ != null) {
-          bitField0_ |= 0x00000001;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -798,13 +784,14 @@ public Builder mergeStatus(com.google.rpc.Status value) {
        * .google.rpc.Status status = 1;
        */
       public Builder clearStatus() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        status_ = null;
-        if (statusBuilder_ != null) {
-          statusBuilder_.dispose();
+        if (statusBuilder_ == null) {
+          status_ = null;
+          onChanged();
+        } else {
+          status_ = null;
           statusBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -818,7 +805,7 @@ public Builder clearStatus() {
        * .google.rpc.Status status = 1;
        */
       public com.google.rpc.Status.Builder getStatusBuilder() {
-        bitField0_ |= 0x00000001;
+
         onChanged();
         return getStatusFieldBuilder().getBuilder();
       }
@@ -882,7 +869,7 @@ public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
        * @return Whether the delay field is set.
        */
       public boolean hasDelay() {
-        return ((bitField0_ & 0x00000002) != 0);
+        return delayBuilder_ != null || delay_ != null;
       }
 
       /**
@@ -919,11 +906,11 @@ public Builder setDelay(com.google.protobuf.Duration value) {
             throw new NullPointerException();
           }
           delay_ = value;
+          onChanged();
         } else {
           delayBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -939,11 +926,11 @@ public Builder setDelay(com.google.protobuf.Duration value) {
       public Builder setDelay(com.google.protobuf.Duration.Builder builderForValue) {
         if (delayBuilder_ == null) {
           delay_ = builderForValue.build();
+          onChanged();
         } else {
           delayBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -958,20 +945,17 @@ public Builder setDelay(com.google.protobuf.Duration.Builder builderForValue) {
        */
       public Builder mergeDelay(com.google.protobuf.Duration value) {
         if (delayBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)
-              && delay_ != null
-              && delay_ != com.google.protobuf.Duration.getDefaultInstance()) {
-            getDelayBuilder().mergeFrom(value);
+          if (delay_ != null) {
+            delay_ =
+                com.google.protobuf.Duration.newBuilder(delay_).mergeFrom(value).buildPartial();
           } else {
             delay_ = value;
           }
+          onChanged();
         } else {
           delayBuilder_.mergeFrom(value);
         }
-        if (delay_ != null) {
-          bitField0_ |= 0x00000002;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -985,13 +969,14 @@ public Builder mergeDelay(com.google.protobuf.Duration value) {
        * .google.protobuf.Duration delay = 2;
        */
       public Builder clearDelay() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        delay_ = null;
-        if (delayBuilder_ != null) {
-          delayBuilder_.dispose();
+        if (delayBuilder_ == null) {
+          delay_ = null;
+          onChanged();
+        } else {
+          delay_ = null;
           delayBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1005,7 +990,7 @@ public Builder clearDelay() {
        * .google.protobuf.Duration delay = 2;
        */
       public com.google.protobuf.Duration.Builder getDelayBuilder() {
-        bitField0_ |= 0x00000002;
+
         onChanged();
         return getDelayFieldBuilder().getBuilder();
       }
@@ -1118,9 +1103,7 @@ public com.google.showcase.v1beta1.Sequence.Response getDefaultInstanceForType()
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    * string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];
@@ -1159,8 +1142,6 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int RESPONSES_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List responses_;
 
   /**
@@ -1438,15 +1419,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       if (responsesBuilder_ == null) {
         responses_ = java.util.Collections.emptyList();
       } else {
         responses_ = null;
         responsesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -1473,31 +1454,19 @@ public com.google.showcase.v1beta1.Sequence build() {
     @java.lang.Override
     public com.google.showcase.v1beta1.Sequence buildPartial() {
       com.google.showcase.v1beta1.Sequence result = new com.google.showcase.v1beta1.Sequence(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.showcase.v1beta1.Sequence result) {
+      int from_bitField0_ = bitField0_;
+      result.name_ = name_;
       if (responsesBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           responses_ = java.util.Collections.unmodifiableList(responses_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.responses_ = responses_;
       } else {
         result.responses_ = responsesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.Sequence result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1547,14 +1516,13 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Sequence other) {
       if (other == com.google.showcase.v1beta1.Sequence.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (responsesBuilder_ == null) {
         if (!other.responses_.isEmpty()) {
           if (responses_.isEmpty()) {
             responses_ = other.responses_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureResponsesIsMutable();
             responses_.addAll(other.responses_);
@@ -1567,7 +1535,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Sequence other) {
             responsesBuilder_.dispose();
             responsesBuilder_ = null;
             responses_ = other.responses_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             responsesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getResponsesFieldBuilder()
@@ -1606,7 +1574,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -1687,8 +1655,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1699,8 +1667,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1716,8 +1684,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1726,10 +1694,10 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureResponsesIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         responses_ =
             new java.util.ArrayList(responses_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -1966,7 +1934,7 @@ public Builder addAllResponses(
     public Builder clearResponses() {
       if (responsesBuilder_ == null) {
         responses_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         responsesBuilder_.clear();
@@ -2102,7 +2070,7 @@ public com.google.showcase.v1beta1.Sequence.Response.Builder addResponsesBuilder
                 com.google.showcase.v1beta1.Sequence.Response,
                 com.google.showcase.v1beta1.Sequence.Response.Builder,
                 com.google.showcase.v1beta1.Sequence.ResponseOrBuilder>(
-                responses_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                responses_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         responses_ = null;
       }
       return responsesBuilder_;
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceOrBuilder.java
index 132a9d9e0b..448b730da9 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface SequenceOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceOuterClass.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceOuterClass.java
index b16125befb..8767f3199f 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceOuterClass.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceOuterClass.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public final class SequenceOuterClass {
@@ -146,46 +145,46 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "quence\"h\n\036CreateStreamingSequenceRequest"
           + "\022F\n\022streaming_sequence\030\001 \001(\0132*.google.sh"
           + "owcase.v1beta1.StreamingSequence\"P\n\026Atte"
-          + "mptSequenceRequest\0226\n\004name\030\001 \001(\tB(\340A\002\372A\""
-          + "\n showcase.googleapis.com/Sequence\"\200\001\n\037A"
+          + "mptSequenceRequest\0226\n\004name\030\001 \001(\tB(\372A\"\n s"
+          + "howcase.googleapis.com/Sequence\340A\002\"\200\001\n\037A"
           + "ttemptStreamingSequenceRequest\022?\n\004name\030\001"
-          + " \001(\tB1\340A\002\372A+\n)showcase.googleapis.com/St"
-          + "reamingSequence\022\034\n\017last_fail_index\030\002 \001(\005"
+          + " \001(\tB1\372A+\n)showcase.googleapis.com/Strea"
+          + "mingSequence\340A\002\022\034\n\017last_fail_index\030\002 \001(\005"
           + "B\003\340A\001\"3\n AttemptStreamingSequenceRespons"
           + "e\022\017\n\007content\030\001 \001(\t\"X\n\030GetSequenceReportR"
-          + "equest\022<\n\004name\030\001 \001(\tB.\340A\002\372A(\n&showcase.g"
-          + "oogleapis.com/SequenceReport\"j\n!GetStrea"
+          + "equest\022<\n\004name\030\001 \001(\tB.\372A(\n&showcase.goog"
+          + "leapis.com/SequenceReport\340A\002\"j\n!GetStrea"
           + "mingSequenceReportRequest\022E\n\004name\030\001 \001(\tB"
-          + "7\340A\002\372A1\n/showcase.googleapis.com/Streami"
-          + "ngSequenceReport2\360\010\n\017SequenceService\022\224\001\n"
+          + "7\372A1\n/showcase.googleapis.com/StreamingS"
+          + "equenceReport\340A\0022\360\010\n\017SequenceService\022\224\001\n"
           + "\016CreateSequence\022..google.showcase.v1beta"
           + "1.CreateSequenceRequest\032!.google.showcas"
-          + "e.v1beta1.Sequence\"/\332A\010sequence\202\323\344\223\002\036\"\022/"
-          + "v1beta1/sequences:\010sequence\022\314\001\n\027CreateSt"
+          + "e.v1beta1.Sequence\"/\202\323\344\223\002\036\"\022/v1beta1/seq"
+          + "uences:\010sequence\332A\010sequence\022\314\001\n\027CreateSt"
           + "reamingSequence\0227.google.showcase.v1beta"
           + "1.CreateStreamingSequenceRequest\032*.googl"
-          + "e.showcase.v1beta1.StreamingSequence\"L\332A"
-          + "\022streaming_sequence\202\323\344\223\0021\"\033/v1beta1/stre"
-          + "amingSequences:\022streaming_sequence\022\252\001\n\021G"
+          + "e.showcase.v1beta1.StreamingSequence\"L\202\323"
+          + "\344\223\0021\"\033/v1beta1/streamingSequences:\022strea"
+          + "ming_sequence\332A\022streaming_sequence\022\252\001\n\021G"
           + "etSequenceReport\0221.google.showcase.v1bet"
           + "a1.GetSequenceReportRequest\032\'.google.sho"
-          + "wcase.v1beta1.SequenceReport\"9\332A\004name\202\323\344"
-          + "\223\002,\022*/v1beta1/{name=sequences/*/sequence"
-          + "Report}\022\327\001\n\032GetStreamingSequenceReport\022:"
+          + "wcase.v1beta1.SequenceReport\"9\202\323\344\223\002,\022*/v"
+          + "1beta1/{name=sequences/*/sequenceReport}"
+          + "\332A\004name\022\327\001\n\032GetStreamingSequenceReport\022:"
           + ".google.showcase.v1beta1.GetStreamingSeq"
           + "uenceReportRequest\0320.google.showcase.v1b"
-          + "eta1.StreamingSequenceReport\"K\332A\004name\202\323\344"
-          + "\223\002>\022\022.google.protobuf.Timestamp attempt_deadline = 2;
        */
       public Builder clearAttemptDeadline() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        attemptDeadline_ = null;
-        if (attemptDeadlineBuilder_ != null) {
-          attemptDeadlineBuilder_.dispose();
+        if (attemptDeadlineBuilder_ == null) {
+          attemptDeadline_ = null;
+          onChanged();
+        } else {
+          attemptDeadline_ = null;
           attemptDeadlineBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1198,7 +1179,7 @@ public Builder clearAttemptDeadline() {
        * .google.protobuf.Timestamp attempt_deadline = 2;
        */
       public com.google.protobuf.Timestamp.Builder getAttemptDeadlineBuilder() {
-        bitField0_ |= 0x00000002;
+
         onChanged();
         return getAttemptDeadlineFieldBuilder().getBuilder();
       }
@@ -1268,7 +1249,7 @@ public com.google.protobuf.TimestampOrBuilder getAttemptDeadlineOrBuilder() {
        * @return Whether the responseTime field is set.
        */
       public boolean hasResponseTime() {
-        return ((bitField0_ & 0x00000004) != 0);
+        return responseTimeBuilder_ != null || responseTime_ != null;
       }
 
       /**
@@ -1309,11 +1290,11 @@ public Builder setResponseTime(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           responseTime_ = value;
+          onChanged();
         } else {
           responseTimeBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
+
         return this;
       }
 
@@ -1330,11 +1311,11 @@ public Builder setResponseTime(com.google.protobuf.Timestamp value) {
       public Builder setResponseTime(com.google.protobuf.Timestamp.Builder builderForValue) {
         if (responseTimeBuilder_ == null) {
           responseTime_ = builderForValue.build();
+          onChanged();
         } else {
           responseTimeBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
+
         return this;
       }
 
@@ -1350,20 +1331,19 @@ public Builder setResponseTime(com.google.protobuf.Timestamp.Builder builderForV
        */
       public Builder mergeResponseTime(com.google.protobuf.Timestamp value) {
         if (responseTimeBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) != 0)
-              && responseTime_ != null
-              && responseTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-            getResponseTimeBuilder().mergeFrom(value);
+          if (responseTime_ != null) {
+            responseTime_ =
+                com.google.protobuf.Timestamp.newBuilder(responseTime_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             responseTime_ = value;
           }
+          onChanged();
         } else {
           responseTimeBuilder_.mergeFrom(value);
         }
-        if (responseTime_ != null) {
-          bitField0_ |= 0x00000004;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -1378,13 +1358,14 @@ public Builder mergeResponseTime(com.google.protobuf.Timestamp value) {
        * .google.protobuf.Timestamp response_time = 3;
        */
       public Builder clearResponseTime() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        responseTime_ = null;
-        if (responseTimeBuilder_ != null) {
-          responseTimeBuilder_.dispose();
+        if (responseTimeBuilder_ == null) {
+          responseTime_ = null;
+          onChanged();
+        } else {
+          responseTime_ = null;
           responseTimeBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1399,7 +1380,7 @@ public Builder clearResponseTime() {
        * .google.protobuf.Timestamp response_time = 3;
        */
       public com.google.protobuf.Timestamp.Builder getResponseTimeBuilder() {
-        bitField0_ |= 0x00000004;
+
         onChanged();
         return getResponseTimeFieldBuilder().getBuilder();
       }
@@ -1471,7 +1452,7 @@ public com.google.protobuf.TimestampOrBuilder getResponseTimeOrBuilder() {
        * @return Whether the attemptDelay field is set.
        */
       public boolean hasAttemptDelay() {
-        return ((bitField0_ & 0x00000008) != 0);
+        return attemptDelayBuilder_ != null || attemptDelay_ != null;
       }
 
       /**
@@ -1512,11 +1493,11 @@ public Builder setAttemptDelay(com.google.protobuf.Duration value) {
             throw new NullPointerException();
           }
           attemptDelay_ = value;
+          onChanged();
         } else {
           attemptDelayBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000008;
-        onChanged();
+
         return this;
       }
 
@@ -1533,11 +1514,11 @@ public Builder setAttemptDelay(com.google.protobuf.Duration value) {
       public Builder setAttemptDelay(com.google.protobuf.Duration.Builder builderForValue) {
         if (attemptDelayBuilder_ == null) {
           attemptDelay_ = builderForValue.build();
+          onChanged();
         } else {
           attemptDelayBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000008;
-        onChanged();
+
         return this;
       }
 
@@ -1553,20 +1534,19 @@ public Builder setAttemptDelay(com.google.protobuf.Duration.Builder builderForVa
        */
       public Builder mergeAttemptDelay(com.google.protobuf.Duration value) {
         if (attemptDelayBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) != 0)
-              && attemptDelay_ != null
-              && attemptDelay_ != com.google.protobuf.Duration.getDefaultInstance()) {
-            getAttemptDelayBuilder().mergeFrom(value);
+          if (attemptDelay_ != null) {
+            attemptDelay_ =
+                com.google.protobuf.Duration.newBuilder(attemptDelay_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             attemptDelay_ = value;
           }
+          onChanged();
         } else {
           attemptDelayBuilder_.mergeFrom(value);
         }
-        if (attemptDelay_ != null) {
-          bitField0_ |= 0x00000008;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -1581,13 +1561,14 @@ public Builder mergeAttemptDelay(com.google.protobuf.Duration value) {
        * .google.protobuf.Duration attempt_delay = 4;
        */
       public Builder clearAttemptDelay() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        attemptDelay_ = null;
-        if (attemptDelayBuilder_ != null) {
-          attemptDelayBuilder_.dispose();
+        if (attemptDelayBuilder_ == null) {
+          attemptDelay_ = null;
+          onChanged();
+        } else {
+          attemptDelay_ = null;
           attemptDelayBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1602,7 +1583,7 @@ public Builder clearAttemptDelay() {
        * .google.protobuf.Duration attempt_delay = 4;
        */
       public com.google.protobuf.Duration.Builder getAttemptDelayBuilder() {
-        bitField0_ |= 0x00000008;
+
         onChanged();
         return getAttemptDelayFieldBuilder().getBuilder();
       }
@@ -1671,7 +1652,7 @@ public com.google.protobuf.DurationOrBuilder getAttemptDelayOrBuilder() {
        * @return Whether the status field is set.
        */
       public boolean hasStatus() {
-        return ((bitField0_ & 0x00000010) != 0);
+        return statusBuilder_ != null || status_ != null;
       }
 
       /**
@@ -1708,11 +1689,11 @@ public Builder setStatus(com.google.rpc.Status value) {
             throw new NullPointerException();
           }
           status_ = value;
+          onChanged();
         } else {
           statusBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000010;
-        onChanged();
+
         return this;
       }
 
@@ -1728,11 +1709,11 @@ public Builder setStatus(com.google.rpc.Status value) {
       public Builder setStatus(com.google.rpc.Status.Builder builderForValue) {
         if (statusBuilder_ == null) {
           status_ = builderForValue.build();
+          onChanged();
         } else {
           statusBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000010;
-        onChanged();
+
         return this;
       }
 
@@ -1747,20 +1728,16 @@ public Builder setStatus(com.google.rpc.Status.Builder builderForValue) {
        */
       public Builder mergeStatus(com.google.rpc.Status value) {
         if (statusBuilder_ == null) {
-          if (((bitField0_ & 0x00000010) != 0)
-              && status_ != null
-              && status_ != com.google.rpc.Status.getDefaultInstance()) {
-            getStatusBuilder().mergeFrom(value);
+          if (status_ != null) {
+            status_ = com.google.rpc.Status.newBuilder(status_).mergeFrom(value).buildPartial();
           } else {
             status_ = value;
           }
+          onChanged();
         } else {
           statusBuilder_.mergeFrom(value);
         }
-        if (status_ != null) {
-          bitField0_ |= 0x00000010;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -1774,13 +1751,14 @@ public Builder mergeStatus(com.google.rpc.Status value) {
        * .google.rpc.Status status = 5;
        */
       public Builder clearStatus() {
-        bitField0_ = (bitField0_ & ~0x00000010);
-        status_ = null;
-        if (statusBuilder_ != null) {
-          statusBuilder_.dispose();
+        if (statusBuilder_ == null) {
+          status_ = null;
+          onChanged();
+        } else {
+          status_ = null;
           statusBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1794,7 +1772,7 @@ public Builder clearStatus() {
        * .google.rpc.Status status = 5;
        */
       public com.google.rpc.Status.Builder getStatusBuilder() {
-        bitField0_ |= 0x00000010;
+
         onChanged();
         return getStatusFieldBuilder().getBuilder();
       }
@@ -1904,9 +1882,7 @@ public com.google.showcase.v1beta1.SequenceReport.Attempt getDefaultInstanceForT
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    * string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];
@@ -1945,8 +1921,6 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int ATTEMPTS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List attempts_;
 
   /**
@@ -2222,15 +2196,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       if (attemptsBuilder_ == null) {
         attempts_ = java.util.Collections.emptyList();
       } else {
         attempts_ = null;
         attemptsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -2258,31 +2232,19 @@ public com.google.showcase.v1beta1.SequenceReport build() {
     public com.google.showcase.v1beta1.SequenceReport buildPartial() {
       com.google.showcase.v1beta1.SequenceReport result =
           new com.google.showcase.v1beta1.SequenceReport(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.showcase.v1beta1.SequenceReport result) {
+      int from_bitField0_ = bitField0_;
+      result.name_ = name_;
       if (attemptsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           attempts_ = java.util.Collections.unmodifiableList(attempts_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.attempts_ = attempts_;
       } else {
         result.attempts_ = attemptsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.SequenceReport result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -2332,14 +2294,13 @@ public Builder mergeFrom(com.google.showcase.v1beta1.SequenceReport other) {
       if (other == com.google.showcase.v1beta1.SequenceReport.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (attemptsBuilder_ == null) {
         if (!other.attempts_.isEmpty()) {
           if (attempts_.isEmpty()) {
             attempts_ = other.attempts_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureAttemptsIsMutable();
             attempts_.addAll(other.attempts_);
@@ -2352,7 +2313,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.SequenceReport other) {
             attemptsBuilder_.dispose();
             attemptsBuilder_ = null;
             attempts_ = other.attempts_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             attemptsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getAttemptsFieldBuilder()
@@ -2391,7 +2352,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -2473,8 +2434,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2485,8 +2446,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -2502,8 +2463,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2512,10 +2473,10 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureAttemptsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         attempts_ =
             new java.util.ArrayList(attempts_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -2743,7 +2704,7 @@ public Builder addAllAttempts(
     public Builder clearAttempts() {
       if (attemptsBuilder_ == null) {
         attempts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         attemptsBuilder_.clear();
@@ -2876,7 +2837,7 @@ public com.google.showcase.v1beta1.SequenceReport.Attempt.Builder addAttemptsBui
                 com.google.showcase.v1beta1.SequenceReport.Attempt,
                 com.google.showcase.v1beta1.SequenceReport.Attempt.Builder,
                 com.google.showcase.v1beta1.SequenceReport.AttemptOrBuilder>(
-                attempts_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                attempts_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         attempts_ = null;
       }
       return attemptsBuilder_;
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceReportOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceReportOrBuilder.java
index 4f7ead5745..c1b362d84b 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceReportOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceReportOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface SequenceReportOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Session.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Session.java
index 7da9b8081c..a017e8a9f6 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Session.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Session.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -25,7 +24,6 @@
  * 
  * A session is a suite of tests, generally being made in the context
  * of testing code generation.
- *
  * A session defines tests it may expect, based on which version of the
  * code generation spec is in use.
  * 

@@ -54,6 +52,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Session();
   }
 
+  @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.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_Session_descriptor;
@@ -231,9 +234,7 @@ private Version(int value) {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -286,7 +287,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int VERSION_FIELD_NUMBER = 2;
-  private int version_ = 0;
+  private int version_;
 
   /**
    *
@@ -317,8 +318,9 @@ public int getVersionValue() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.Session.Version getVersion() {
+    @SuppressWarnings("deprecation")
     com.google.showcase.v1beta1.Session.Version result =
-        com.google.showcase.v1beta1.Session.Version.forNumber(version_);
+        com.google.showcase.v1beta1.Session.Version.valueOf(version_);
     return result == null ? com.google.showcase.v1beta1.Session.Version.UNRECOGNIZED : result;
   }
 
@@ -495,7 +497,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * 
    * A session is a suite of tests, generally being made in the context
    * of testing code generation.
-   *
    * A session defines tests it may expect, based on which version of the
    * code generation spec is in use.
    * 

@@ -531,9 +532,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       version_ = 0;
+
       return this;
     }
 
@@ -560,23 +562,12 @@ public com.google.showcase.v1beta1.Session build() {
     @java.lang.Override
     public com.google.showcase.v1beta1.Session buildPartial() {
       com.google.showcase.v1beta1.Session result = new com.google.showcase.v1beta1.Session(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.name_ = name_;
+      result.version_ = version_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.Session result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.version_ = version_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -624,7 +615,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Session other) {
       if (other == com.google.showcase.v1beta1.Session.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.version_ != 0) {
@@ -659,13 +649,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 version_ = input.readEnum();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             default:
@@ -685,8 +675,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -754,8 +742,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -773,8 +761,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -797,8 +785,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -834,8 +822,8 @@ public int getVersionValue() {
      * @return This builder for chaining.
      */
     public Builder setVersionValue(int value) {
+
       version_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -853,8 +841,9 @@ public Builder setVersionValue(int value) {
      */
     @java.lang.Override
     public com.google.showcase.v1beta1.Session.Version getVersion() {
+      @SuppressWarnings("deprecation")
       com.google.showcase.v1beta1.Session.Version result =
-          com.google.showcase.v1beta1.Session.Version.forNumber(version_);
+          com.google.showcase.v1beta1.Session.Version.valueOf(version_);
       return result == null ? com.google.showcase.v1beta1.Session.Version.UNRECOGNIZED : result;
     }
 
@@ -874,7 +863,7 @@ public Builder setVersion(com.google.showcase.v1beta1.Session.Version value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000002;
+
       version_ = value.getNumber();
       onChanged();
       return this;
@@ -892,7 +881,7 @@ public Builder setVersion(com.google.showcase.v1beta1.Session.Version value) {
      * @return This builder for chaining.
      */
     public Builder clearVersion() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       version_ = 0;
       onChanged();
       return this;
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SessionOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SessionOrBuilder.java
index 09b18bf4f1..395bec0425 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SessionOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SessionOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface SessionOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Severity.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Severity.java
index 7359ba44d2..968c84bcb3 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Severity.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Severity.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsRequest.java
index 5a6148d001..2f7f2e2f17 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new StreamBlurbsRequest();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_StreamBlurbsRequest_descriptor;
@@ -65,11 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.StreamBlurbsRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -140,7 +141,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    */
   @java.lang.Override
   public boolean hasExpireTime() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return expireTime_ != null;
   }
 
   /**
@@ -172,7 +173,7 @@ public com.google.protobuf.Timestamp getExpireTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getExpireTimeOrBuilder() {
-    return expireTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expireTime_;
+    return getExpireTime();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -192,7 +193,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (expireTime_ != null) {
       output.writeMessage(2, getExpireTime());
     }
     getUnknownFields().writeTo(output);
@@ -207,7 +208,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (expireTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getExpireTime());
     }
     size += getUnknownFields().getSerializedSize();
@@ -379,29 +380,21 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.StreamBlurbsRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getExpireTimeFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
-      expireTime_ = null;
-      if (expireTimeBuilder_ != null) {
-        expireTimeBuilder_.dispose();
+
+      if (expireTimeBuilder_ == null) {
+        expireTime_ = null;
+      } else {
+        expireTime_ = null;
         expireTimeBuilder_ = null;
       }
       return this;
@@ -431,26 +424,16 @@ public com.google.showcase.v1beta1.StreamBlurbsRequest build() {
     public com.google.showcase.v1beta1.StreamBlurbsRequest buildPartial() {
       com.google.showcase.v1beta1.StreamBlurbsRequest result =
           new com.google.showcase.v1beta1.StreamBlurbsRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.name_ = name_;
+      if (expireTimeBuilder_ == null) {
+        result.expireTime_ = expireTime_;
+      } else {
+        result.expireTime_ = expireTimeBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.StreamBlurbsRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.expireTime_ = expireTimeBuilder_ == null ? expireTime_ : expireTimeBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -499,7 +482,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.StreamBlurbsRequest other)
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasExpireTime()) {
@@ -534,13 +516,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getExpireTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -560,8 +542,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object name_ = "";
 
     /**
@@ -632,8 +612,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -652,8 +632,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -677,8 +657,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -703,7 +683,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * @return Whether the expireTime field is set.
      */
     public boolean hasExpireTime() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return expireTimeBuilder_ != null || expireTime_ != null;
     }
 
     /**
@@ -744,11 +724,11 @@ public Builder setExpireTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         expireTime_ = value;
+        onChanged();
       } else {
         expireTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -765,11 +745,11 @@ public Builder setExpireTime(com.google.protobuf.Timestamp value) {
     public Builder setExpireTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (expireTimeBuilder_ == null) {
         expireTime_ = builderForValue.build();
+        onChanged();
       } else {
         expireTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -785,20 +765,17 @@ public Builder setExpireTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeExpireTime(com.google.protobuf.Timestamp value) {
       if (expireTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && expireTime_ != null
-            && expireTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getExpireTimeBuilder().mergeFrom(value);
+        if (expireTime_ != null) {
+          expireTime_ =
+              com.google.protobuf.Timestamp.newBuilder(expireTime_).mergeFrom(value).buildPartial();
         } else {
           expireTime_ = value;
         }
+        onChanged();
       } else {
         expireTimeBuilder_.mergeFrom(value);
       }
-      if (expireTime_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -813,13 +790,14 @@ public Builder mergeExpireTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearExpireTime() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      expireTime_ = null;
-      if (expireTimeBuilder_ != null) {
-        expireTimeBuilder_.dispose();
+      if (expireTimeBuilder_ == null) {
+        expireTime_ = null;
+        onChanged();
+      } else {
+        expireTime_ = null;
         expireTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -834,7 +812,7 @@ public Builder clearExpireTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getExpireTimeBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getExpireTimeFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsRequestOrBuilder.java
index 099900af6b..12f8efe90a 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface StreamBlurbsRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsResponse.java
index d080cfc08a..e09a06f05a 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -50,6 +49,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new StreamBlurbsResponse();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_StreamBlurbsResponse_descriptor;
@@ -231,7 +235,6 @@ private Action(int value) {
     // @@protoc_insertion_point(enum_scope:google.showcase.v1beta1.StreamBlurbsResponse.Action)
   }
 
-  private int bitField0_;
   public static final int BLURB_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.Blurb blurb_;
 
@@ -248,7 +251,7 @@ private Action(int value) {
    */
   @java.lang.Override
   public boolean hasBlurb() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return blurb_ != null;
   }
 
   /**
@@ -278,11 +281,11 @@ public com.google.showcase.v1beta1.Blurb getBlurb() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.BlurbOrBuilder getBlurbOrBuilder() {
-    return blurb_ == null ? com.google.showcase.v1beta1.Blurb.getDefaultInstance() : blurb_;
+    return getBlurb();
   }
 
   public static final int ACTION_FIELD_NUMBER = 2;
-  private int action_ = 0;
+  private int action_;
 
   /**
    *
@@ -313,8 +316,9 @@ public int getActionValue() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.StreamBlurbsResponse.Action getAction() {
+    @SuppressWarnings("deprecation")
     com.google.showcase.v1beta1.StreamBlurbsResponse.Action result =
-        com.google.showcase.v1beta1.StreamBlurbsResponse.Action.forNumber(action_);
+        com.google.showcase.v1beta1.StreamBlurbsResponse.Action.valueOf(action_);
     return result == null
         ? com.google.showcase.v1beta1.StreamBlurbsResponse.Action.UNRECOGNIZED
         : result;
@@ -334,7 +338,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (blurb_ != null) {
       output.writeMessage(1, getBlurb());
     }
     if (action_
@@ -350,7 +354,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (blurb_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getBlurb());
     }
     if (action_
@@ -526,31 +530,23 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.StreamBlurbsResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getBlurbFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      blurb_ = null;
-      if (blurbBuilder_ != null) {
-        blurbBuilder_.dispose();
+      if (blurbBuilder_ == null) {
+        blurb_ = null;
+      } else {
+        blurb_ = null;
         blurbBuilder_ = null;
       }
       action_ = 0;
+
       return this;
     }
 
@@ -578,26 +574,16 @@ public com.google.showcase.v1beta1.StreamBlurbsResponse build() {
     public com.google.showcase.v1beta1.StreamBlurbsResponse buildPartial() {
       com.google.showcase.v1beta1.StreamBlurbsResponse result =
           new com.google.showcase.v1beta1.StreamBlurbsResponse(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (blurbBuilder_ == null) {
+        result.blurb_ = blurb_;
+      } else {
+        result.blurb_ = blurbBuilder_.build();
       }
+      result.action_ = action_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.StreamBlurbsResponse result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.blurb_ = blurbBuilder_ == null ? blurb_ : blurbBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.action_ = action_;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -679,13 +665,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getBlurbFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 action_ = input.readEnum();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             default:
@@ -705,8 +691,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.showcase.v1beta1.Blurb blurb_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.showcase.v1beta1.Blurb,
@@ -726,7 +710,7 @@ public Builder mergeFrom(
      * @return Whether the blurb field is set.
      */
     public boolean hasBlurb() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return blurbBuilder_ != null || blurb_ != null;
     }
 
     /**
@@ -763,11 +747,11 @@ public Builder setBlurb(com.google.showcase.v1beta1.Blurb value) {
           throw new NullPointerException();
         }
         blurb_ = value;
+        onChanged();
       } else {
         blurbBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -783,11 +767,11 @@ public Builder setBlurb(com.google.showcase.v1beta1.Blurb value) {
     public Builder setBlurb(com.google.showcase.v1beta1.Blurb.Builder builderForValue) {
       if (blurbBuilder_ == null) {
         blurb_ = builderForValue.build();
+        onChanged();
       } else {
         blurbBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -802,20 +786,17 @@ public Builder setBlurb(com.google.showcase.v1beta1.Blurb.Builder builderForValu
      */
     public Builder mergeBlurb(com.google.showcase.v1beta1.Blurb value) {
       if (blurbBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && blurb_ != null
-            && blurb_ != com.google.showcase.v1beta1.Blurb.getDefaultInstance()) {
-          getBlurbBuilder().mergeFrom(value);
+        if (blurb_ != null) {
+          blurb_ =
+              com.google.showcase.v1beta1.Blurb.newBuilder(blurb_).mergeFrom(value).buildPartial();
         } else {
           blurb_ = value;
         }
+        onChanged();
       } else {
         blurbBuilder_.mergeFrom(value);
       }
-      if (blurb_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -829,13 +810,14 @@ public Builder mergeBlurb(com.google.showcase.v1beta1.Blurb value) {
      * .google.showcase.v1beta1.Blurb blurb = 1;
      */
     public Builder clearBlurb() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      blurb_ = null;
-      if (blurbBuilder_ != null) {
-        blurbBuilder_.dispose();
+      if (blurbBuilder_ == null) {
+        blurb_ = null;
+        onChanged();
+      } else {
+        blurb_ = null;
         blurbBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -849,7 +831,7 @@ public Builder clearBlurb() {
      * .google.showcase.v1beta1.Blurb blurb = 1;
      */
     public com.google.showcase.v1beta1.Blurb.Builder getBlurbBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getBlurbFieldBuilder().getBuilder();
     }
@@ -928,8 +910,8 @@ public int getActionValue() {
      * @return This builder for chaining.
      */
     public Builder setActionValue(int value) {
+
       action_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -947,8 +929,9 @@ public Builder setActionValue(int value) {
      */
     @java.lang.Override
     public com.google.showcase.v1beta1.StreamBlurbsResponse.Action getAction() {
+      @SuppressWarnings("deprecation")
       com.google.showcase.v1beta1.StreamBlurbsResponse.Action result =
-          com.google.showcase.v1beta1.StreamBlurbsResponse.Action.forNumber(action_);
+          com.google.showcase.v1beta1.StreamBlurbsResponse.Action.valueOf(action_);
       return result == null
           ? com.google.showcase.v1beta1.StreamBlurbsResponse.Action.UNRECOGNIZED
           : result;
@@ -970,7 +953,7 @@ public Builder setAction(com.google.showcase.v1beta1.StreamBlurbsResponse.Action
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000002;
+
       action_ = value.getNumber();
       onChanged();
       return this;
@@ -988,7 +971,7 @@ public Builder setAction(com.google.showcase.v1beta1.StreamBlurbsResponse.Action
      * @return This builder for chaining.
      */
     public Builder clearAction() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       action_ = 0;
       onChanged();
       return this;
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsResponseOrBuilder.java
index fae6d5c28f..44652ad61d 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface StreamBlurbsResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequence.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequence.java
index 8156ad63af..81e5baa680 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequence.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequence.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.StreamingSequence} */
@@ -43,6 +42,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new StreamingSequence();
   }
 
+  @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.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_StreamingSequence_descriptor;
@@ -179,6 +183,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.showcase.v1beta1.SequenceOuterClass
           .internal_static_google_showcase_v1beta1_StreamingSequence_Response_descriptor;
@@ -194,7 +203,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
               com.google.showcase.v1beta1.StreamingSequence.Response.Builder.class);
     }
 
-    private int bitField0_;
     public static final int STATUS_FIELD_NUMBER = 1;
     private com.google.rpc.Status status_;
 
@@ -211,7 +219,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      */
     @java.lang.Override
     public boolean hasStatus() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return status_ != null;
     }
 
     /**
@@ -241,7 +249,7 @@ public com.google.rpc.Status getStatus() {
      */
     @java.lang.Override
     public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
-      return status_ == null ? com.google.rpc.Status.getDefaultInstance() : status_;
+      return getStatus();
     }
 
     public static final int DELAY_FIELD_NUMBER = 2;
@@ -260,7 +268,7 @@ public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
      */
     @java.lang.Override
     public boolean hasDelay() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return delay_ != null;
     }
 
     /**
@@ -290,11 +298,11 @@ public com.google.protobuf.Duration getDelay() {
      */
     @java.lang.Override
     public com.google.protobuf.DurationOrBuilder getDelayOrBuilder() {
-      return delay_ == null ? com.google.protobuf.Duration.getDefaultInstance() : delay_;
+      return getDelay();
     }
 
     public static final int RESPONSE_INDEX_FIELD_NUMBER = 3;
-    private int responseIndex_ = 0;
+    private int responseIndex_;
 
     /**
      *
@@ -326,10 +334,10 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (status_ != null) {
         output.writeMessage(1, getStatus());
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (delay_ != null) {
         output.writeMessage(2, getDelay());
       }
       if (responseIndex_ != 0) {
@@ -344,10 +352,10 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (status_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getStatus());
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (delay_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getDelay());
       }
       if (responseIndex_ != 0) {
@@ -532,37 +540,29 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.showcase.v1beta1.StreamingSequence.Response.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getStatusFieldBuilder();
-          getDelayFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
-        status_ = null;
-        if (statusBuilder_ != null) {
-          statusBuilder_.dispose();
+        if (statusBuilder_ == null) {
+          status_ = null;
+        } else {
+          status_ = null;
           statusBuilder_ = null;
         }
-        delay_ = null;
-        if (delayBuilder_ != null) {
-          delayBuilder_.dispose();
+        if (delayBuilder_ == null) {
+          delay_ = null;
+        } else {
+          delay_ = null;
           delayBuilder_ = null;
         }
         responseIndex_ = 0;
+
         return this;
       }
 
@@ -590,30 +590,21 @@ public com.google.showcase.v1beta1.StreamingSequence.Response build() {
       public com.google.showcase.v1beta1.StreamingSequence.Response buildPartial() {
         com.google.showcase.v1beta1.StreamingSequence.Response result =
             new com.google.showcase.v1beta1.StreamingSequence.Response(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        if (statusBuilder_ == null) {
+          result.status_ = status_;
+        } else {
+          result.status_ = statusBuilder_.build();
+        }
+        if (delayBuilder_ == null) {
+          result.delay_ = delay_;
+        } else {
+          result.delay_ = delayBuilder_.build();
         }
+        result.responseIndex_ = responseIndex_;
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.google.showcase.v1beta1.StreamingSequence.Response result) {
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.status_ = statusBuilder_ == null ? status_ : statusBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.delay_ = delayBuilder_ == null ? delay_ : delayBuilder_.build();
-          to_bitField0_ |= 0x00000002;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.responseIndex_ = responseIndex_;
-        }
-        result.bitField0_ |= to_bitField0_;
-      }
-
       @java.lang.Override
       public Builder clone() {
         return super.clone();
@@ -700,19 +691,19 @@ public Builder mergeFrom(
               case 10:
                 {
                   input.readMessage(getStatusFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   input.readMessage(getDelayFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               case 24:
                 {
                   responseIndex_ = input.readInt32();
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 24
               default:
@@ -732,8 +723,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private com.google.rpc.Status status_;
       private com.google.protobuf.SingleFieldBuilderV3<
               com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder>
@@ -751,7 +740,7 @@ public Builder mergeFrom(
        * @return Whether the status field is set.
        */
       public boolean hasStatus() {
-        return ((bitField0_ & 0x00000001) != 0);
+        return statusBuilder_ != null || status_ != null;
       }
 
       /**
@@ -788,11 +777,11 @@ public Builder setStatus(com.google.rpc.Status value) {
             throw new NullPointerException();
           }
           status_ = value;
+          onChanged();
         } else {
           statusBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+
         return this;
       }
 
@@ -808,11 +797,11 @@ public Builder setStatus(com.google.rpc.Status value) {
       public Builder setStatus(com.google.rpc.Status.Builder builderForValue) {
         if (statusBuilder_ == null) {
           status_ = builderForValue.build();
+          onChanged();
         } else {
           statusBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000001;
-        onChanged();
+
         return this;
       }
 
@@ -827,20 +816,16 @@ public Builder setStatus(com.google.rpc.Status.Builder builderForValue) {
        */
       public Builder mergeStatus(com.google.rpc.Status value) {
         if (statusBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)
-              && status_ != null
-              && status_ != com.google.rpc.Status.getDefaultInstance()) {
-            getStatusBuilder().mergeFrom(value);
+          if (status_ != null) {
+            status_ = com.google.rpc.Status.newBuilder(status_).mergeFrom(value).buildPartial();
           } else {
             status_ = value;
           }
+          onChanged();
         } else {
           statusBuilder_.mergeFrom(value);
         }
-        if (status_ != null) {
-          bitField0_ |= 0x00000001;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -854,13 +839,14 @@ public Builder mergeStatus(com.google.rpc.Status value) {
        * .google.rpc.Status status = 1;
        */
       public Builder clearStatus() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        status_ = null;
-        if (statusBuilder_ != null) {
-          statusBuilder_.dispose();
+        if (statusBuilder_ == null) {
+          status_ = null;
+          onChanged();
+        } else {
+          status_ = null;
           statusBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -874,7 +860,7 @@ public Builder clearStatus() {
        * .google.rpc.Status status = 1;
        */
       public com.google.rpc.Status.Builder getStatusBuilder() {
-        bitField0_ |= 0x00000001;
+
         onChanged();
         return getStatusFieldBuilder().getBuilder();
       }
@@ -938,7 +924,7 @@ public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
        * @return Whether the delay field is set.
        */
       public boolean hasDelay() {
-        return ((bitField0_ & 0x00000002) != 0);
+        return delayBuilder_ != null || delay_ != null;
       }
 
       /**
@@ -975,11 +961,11 @@ public Builder setDelay(com.google.protobuf.Duration value) {
             throw new NullPointerException();
           }
           delay_ = value;
+          onChanged();
         } else {
           delayBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -995,11 +981,11 @@ public Builder setDelay(com.google.protobuf.Duration value) {
       public Builder setDelay(com.google.protobuf.Duration.Builder builderForValue) {
         if (delayBuilder_ == null) {
           delay_ = builderForValue.build();
+          onChanged();
         } else {
           delayBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -1014,20 +1000,17 @@ public Builder setDelay(com.google.protobuf.Duration.Builder builderForValue) {
        */
       public Builder mergeDelay(com.google.protobuf.Duration value) {
         if (delayBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)
-              && delay_ != null
-              && delay_ != com.google.protobuf.Duration.getDefaultInstance()) {
-            getDelayBuilder().mergeFrom(value);
+          if (delay_ != null) {
+            delay_ =
+                com.google.protobuf.Duration.newBuilder(delay_).mergeFrom(value).buildPartial();
           } else {
             delay_ = value;
           }
+          onChanged();
         } else {
           delayBuilder_.mergeFrom(value);
         }
-        if (delay_ != null) {
-          bitField0_ |= 0x00000002;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -1041,13 +1024,14 @@ public Builder mergeDelay(com.google.protobuf.Duration value) {
        * .google.protobuf.Duration delay = 2;
        */
       public Builder clearDelay() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        delay_ = null;
-        if (delayBuilder_ != null) {
-          delayBuilder_.dispose();
+        if (delayBuilder_ == null) {
+          delay_ = null;
+          onChanged();
+        } else {
+          delay_ = null;
           delayBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1061,7 +1045,7 @@ public Builder clearDelay() {
        * .google.protobuf.Duration delay = 2;
        */
       public com.google.protobuf.Duration.Builder getDelayBuilder() {
-        bitField0_ |= 0x00000002;
+
         onChanged();
         return getDelayFieldBuilder().getBuilder();
       }
@@ -1142,7 +1126,6 @@ public int getResponseIndex() {
       public Builder setResponseIndex(int value) {
 
         responseIndex_ = value;
-        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -1159,7 +1142,7 @@ public Builder setResponseIndex(int value) {
        * @return This builder for chaining.
        */
       public Builder clearResponseIndex() {
-        bitField0_ = (bitField0_ & ~0x00000004);
+
         responseIndex_ = 0;
         onChanged();
         return this;
@@ -1230,9 +1213,7 @@ public com.google.showcase.v1beta1.StreamingSequence.Response getDefaultInstance
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    * string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];
@@ -1271,9 +1252,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int CONTENT_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object content_ = "";
+  private volatile java.lang.Object content_;
 
   /**
    *
@@ -1324,8 +1303,6 @@ public com.google.protobuf.ByteString getContentBytes() {
   }
 
   public static final int RESPONSES_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
   private java.util.List responses_;
 
   /**
@@ -1615,16 +1592,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       content_ = "";
+
       if (responsesBuilder_ == null) {
         responses_ = java.util.Collections.emptyList();
       } else {
         responses_ = null;
         responsesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -1652,34 +1630,20 @@ public com.google.showcase.v1beta1.StreamingSequence build() {
     public com.google.showcase.v1beta1.StreamingSequence buildPartial() {
       com.google.showcase.v1beta1.StreamingSequence result =
           new com.google.showcase.v1beta1.StreamingSequence(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.showcase.v1beta1.StreamingSequence result) {
+      int from_bitField0_ = bitField0_;
+      result.name_ = name_;
+      result.content_ = content_;
       if (responsesBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           responses_ = java.util.Collections.unmodifiableList(responses_);
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.responses_ = responses_;
       } else {
         result.responses_ = responsesBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.StreamingSequence result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.content_ = content_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -1729,19 +1693,17 @@ public Builder mergeFrom(com.google.showcase.v1beta1.StreamingSequence other) {
       if (other == com.google.showcase.v1beta1.StreamingSequence.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getContent().isEmpty()) {
         content_ = other.content_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (responsesBuilder_ == null) {
         if (!other.responses_.isEmpty()) {
           if (responses_.isEmpty()) {
             responses_ = other.responses_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureResponsesIsMutable();
             responses_.addAll(other.responses_);
@@ -1754,7 +1716,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.StreamingSequence other) {
             responsesBuilder_.dispose();
             responsesBuilder_ = null;
             responses_ = other.responses_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
             responsesBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getResponsesFieldBuilder()
@@ -1793,13 +1755,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 content_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
@@ -1881,8 +1843,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1893,8 +1855,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1910,8 +1872,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1980,8 +1942,8 @@ public Builder setContent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       content_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1998,8 +1960,8 @@ public Builder setContent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearContent() {
+
       content_ = getDefaultInstance().getContent();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -2021,8 +1983,8 @@ public Builder setContentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       content_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -2031,11 +1993,11 @@ public Builder setContentBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureResponsesIsMutable() {
-      if (!((bitField0_ & 0x00000004) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         responses_ =
             new java.util.ArrayList(
                 responses_);
-        bitField0_ |= 0x00000004;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -2276,7 +2238,7 @@ public Builder addAllResponses(
     public Builder clearResponses() {
       if (responsesBuilder_ == null) {
         responses_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         responsesBuilder_.clear();
@@ -2416,7 +2378,7 @@ public com.google.showcase.v1beta1.StreamingSequence.Response.Builder addRespons
                 com.google.showcase.v1beta1.StreamingSequence.Response,
                 com.google.showcase.v1beta1.StreamingSequence.Response.Builder,
                 com.google.showcase.v1beta1.StreamingSequence.ResponseOrBuilder>(
-                responses_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
+                responses_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         responses_ = null;
       }
       return responsesBuilder_;
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceOrBuilder.java
index 17fa8c3a57..2c05ec00aa 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface StreamingSequenceOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReport.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReport.java
index ca3ca8ff34..6774a5cfc5 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReport.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReport.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.StreamingSequenceReport} */
@@ -42,6 +41,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new StreamingSequenceReport();
   }
 
+  @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.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_StreamingSequenceReport_descriptor;
@@ -258,6 +262,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Attempt();
     }
 
+    @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.showcase.v1beta1.SequenceOuterClass
           .internal_static_google_showcase_v1beta1_StreamingSequenceReport_Attempt_descriptor;
@@ -273,9 +282,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
               com.google.showcase.v1beta1.StreamingSequenceReport.Attempt.Builder.class);
     }
 
-    private int bitField0_;
     public static final int ATTEMPT_NUMBER_FIELD_NUMBER = 1;
-    private int attemptNumber_ = 0;
+    private int attemptNumber_;
 
     /**
      *
@@ -309,7 +317,7 @@ public int getAttemptNumber() {
      */
     @java.lang.Override
     public boolean hasAttemptDeadline() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return attemptDeadline_ != null;
     }
 
     /**
@@ -341,9 +349,7 @@ public com.google.protobuf.Timestamp getAttemptDeadline() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getAttemptDeadlineOrBuilder() {
-      return attemptDeadline_ == null
-          ? com.google.protobuf.Timestamp.getDefaultInstance()
-          : attemptDeadline_;
+      return getAttemptDeadline();
     }
 
     public static final int RESPONSE_TIME_FIELD_NUMBER = 3;
@@ -363,7 +369,7 @@ public com.google.protobuf.TimestampOrBuilder getAttemptDeadlineOrBuilder() {
      */
     @java.lang.Override
     public boolean hasResponseTime() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return responseTime_ != null;
     }
 
     /**
@@ -397,9 +403,7 @@ public com.google.protobuf.Timestamp getResponseTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getResponseTimeOrBuilder() {
-      return responseTime_ == null
-          ? com.google.protobuf.Timestamp.getDefaultInstance()
-          : responseTime_;
+      return getResponseTime();
     }
 
     public static final int ATTEMPT_DELAY_FIELD_NUMBER = 4;
@@ -419,7 +423,7 @@ public com.google.protobuf.TimestampOrBuilder getResponseTimeOrBuilder() {
      */
     @java.lang.Override
     public boolean hasAttemptDelay() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return attemptDelay_ != null;
     }
 
     /**
@@ -453,9 +457,7 @@ public com.google.protobuf.Duration getAttemptDelay() {
      */
     @java.lang.Override
     public com.google.protobuf.DurationOrBuilder getAttemptDelayOrBuilder() {
-      return attemptDelay_ == null
-          ? com.google.protobuf.Duration.getDefaultInstance()
-          : attemptDelay_;
+      return getAttemptDelay();
     }
 
     public static final int STATUS_FIELD_NUMBER = 5;
@@ -474,7 +476,7 @@ public com.google.protobuf.DurationOrBuilder getAttemptDelayOrBuilder() {
      */
     @java.lang.Override
     public boolean hasStatus() {
-      return ((bitField0_ & 0x00000008) != 0);
+      return status_ != null;
     }
 
     /**
@@ -504,7 +506,7 @@ public com.google.rpc.Status getStatus() {
      */
     @java.lang.Override
     public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
-      return status_ == null ? com.google.rpc.Status.getDefaultInstance() : status_;
+      return getStatus();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -524,16 +526,16 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (attemptNumber_ != 0) {
         output.writeInt32(1, attemptNumber_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (attemptDeadline_ != null) {
         output.writeMessage(2, getAttemptDeadline());
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (responseTime_ != null) {
         output.writeMessage(3, getResponseTime());
       }
-      if (((bitField0_ & 0x00000004) != 0)) {
+      if (attemptDelay_ != null) {
         output.writeMessage(4, getAttemptDelay());
       }
-      if (((bitField0_ & 0x00000008) != 0)) {
+      if (status_ != null) {
         output.writeMessage(5, getStatus());
       }
       getUnknownFields().writeTo(output);
@@ -548,16 +550,16 @@ public int getSerializedSize() {
       if (attemptNumber_ != 0) {
         size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, attemptNumber_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (attemptDeadline_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getAttemptDeadline());
       }
-      if (((bitField0_ & 0x00000002) != 0)) {
+      if (responseTime_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getResponseTime());
       }
-      if (((bitField0_ & 0x00000004) != 0)) {
+      if (attemptDelay_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getAttemptDelay());
       }
-      if (((bitField0_ & 0x00000008) != 0)) {
+      if (status_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getStatus());
       }
       size += getUnknownFields().getSerializedSize();
@@ -755,47 +757,39 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.showcase.v1beta1.StreamingSequenceReport.Attempt.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getAttemptDeadlineFieldBuilder();
-          getResponseTimeFieldBuilder();
-          getAttemptDelayFieldBuilder();
-          getStatusFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         attemptNumber_ = 0;
-        attemptDeadline_ = null;
-        if (attemptDeadlineBuilder_ != null) {
-          attemptDeadlineBuilder_.dispose();
+
+        if (attemptDeadlineBuilder_ == null) {
+          attemptDeadline_ = null;
+        } else {
+          attemptDeadline_ = null;
           attemptDeadlineBuilder_ = null;
         }
-        responseTime_ = null;
-        if (responseTimeBuilder_ != null) {
-          responseTimeBuilder_.dispose();
+        if (responseTimeBuilder_ == null) {
+          responseTime_ = null;
+        } else {
+          responseTime_ = null;
           responseTimeBuilder_ = null;
         }
-        attemptDelay_ = null;
-        if (attemptDelayBuilder_ != null) {
-          attemptDelayBuilder_.dispose();
+        if (attemptDelayBuilder_ == null) {
+          attemptDelay_ = null;
+        } else {
+          attemptDelay_ = null;
           attemptDelayBuilder_ = null;
         }
-        status_ = null;
-        if (statusBuilder_ != null) {
-          statusBuilder_.dispose();
+        if (statusBuilder_ == null) {
+          status_ = null;
+        } else {
+          status_ = null;
           statusBuilder_ = null;
         }
         return this;
@@ -826,40 +820,29 @@ public com.google.showcase.v1beta1.StreamingSequenceReport.Attempt build() {
       public com.google.showcase.v1beta1.StreamingSequenceReport.Attempt buildPartial() {
         com.google.showcase.v1beta1.StreamingSequenceReport.Attempt result =
             new com.google.showcase.v1beta1.StreamingSequenceReport.Attempt(this);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
-        }
-        onBuilt();
-        return result;
-      }
-
-      private void buildPartial0(
-          com.google.showcase.v1beta1.StreamingSequenceReport.Attempt result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.attemptNumber_ = attemptNumber_;
-        }
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.attemptDeadline_ =
-              attemptDeadlineBuilder_ == null ? attemptDeadline_ : attemptDeadlineBuilder_.build();
-          to_bitField0_ |= 0x00000001;
+        result.attemptNumber_ = attemptNumber_;
+        if (attemptDeadlineBuilder_ == null) {
+          result.attemptDeadline_ = attemptDeadline_;
+        } else {
+          result.attemptDeadline_ = attemptDeadlineBuilder_.build();
         }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.responseTime_ =
-              responseTimeBuilder_ == null ? responseTime_ : responseTimeBuilder_.build();
-          to_bitField0_ |= 0x00000002;
+        if (responseTimeBuilder_ == null) {
+          result.responseTime_ = responseTime_;
+        } else {
+          result.responseTime_ = responseTimeBuilder_.build();
         }
-        if (((from_bitField0_ & 0x00000008) != 0)) {
-          result.attemptDelay_ =
-              attemptDelayBuilder_ == null ? attemptDelay_ : attemptDelayBuilder_.build();
-          to_bitField0_ |= 0x00000004;
+        if (attemptDelayBuilder_ == null) {
+          result.attemptDelay_ = attemptDelay_;
+        } else {
+          result.attemptDelay_ = attemptDelayBuilder_.build();
         }
-        if (((from_bitField0_ & 0x00000010) != 0)) {
-          result.status_ = statusBuilder_ == null ? status_ : statusBuilder_.build();
-          to_bitField0_ |= 0x00000008;
+        if (statusBuilder_ == null) {
+          result.status_ = status_;
+        } else {
+          result.status_ = statusBuilder_.build();
         }
-        result.bitField0_ |= to_bitField0_;
+        onBuilt();
+        return result;
       }
 
       @java.lang.Override
@@ -955,32 +938,32 @@ public Builder mergeFrom(
               case 8:
                 {
                   attemptNumber_ = input.readInt32();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 8
               case 18:
                 {
                   input.readMessage(
                       getAttemptDeadlineFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               case 26:
                 {
                   input.readMessage(getResponseTimeFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 26
               case 34:
                 {
                   input.readMessage(getAttemptDelayFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000008;
+
                   break;
                 } // case 34
               case 42:
                 {
                   input.readMessage(getStatusFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000010;
+
                   break;
                 } // case 42
               default:
@@ -1000,8 +983,6 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int bitField0_;
-
       private int attemptNumber_;
 
       /**
@@ -1035,7 +1016,6 @@ public int getAttemptNumber() {
       public Builder setAttemptNumber(int value) {
 
         attemptNumber_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1052,7 +1032,7 @@ public Builder setAttemptNumber(int value) {
        * @return This builder for chaining.
        */
       public Builder clearAttemptNumber() {
-        bitField0_ = (bitField0_ & ~0x00000001);
+
         attemptNumber_ = 0;
         onChanged();
         return this;
@@ -1077,7 +1057,7 @@ public Builder clearAttemptNumber() {
        * @return Whether the attemptDeadline field is set.
        */
       public boolean hasAttemptDeadline() {
-        return ((bitField0_ & 0x00000002) != 0);
+        return attemptDeadlineBuilder_ != null || attemptDeadline_ != null;
       }
 
       /**
@@ -1116,11 +1096,11 @@ public Builder setAttemptDeadline(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           attemptDeadline_ = value;
+          onChanged();
         } else {
           attemptDeadlineBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -1136,11 +1116,11 @@ public Builder setAttemptDeadline(com.google.protobuf.Timestamp value) {
       public Builder setAttemptDeadline(com.google.protobuf.Timestamp.Builder builderForValue) {
         if (attemptDeadlineBuilder_ == null) {
           attemptDeadline_ = builderForValue.build();
+          onChanged();
         } else {
           attemptDeadlineBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000002;
-        onChanged();
+
         return this;
       }
 
@@ -1155,20 +1135,19 @@ public Builder setAttemptDeadline(com.google.protobuf.Timestamp.Builder builderF
        */
       public Builder mergeAttemptDeadline(com.google.protobuf.Timestamp value) {
         if (attemptDeadlineBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)
-              && attemptDeadline_ != null
-              && attemptDeadline_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-            getAttemptDeadlineBuilder().mergeFrom(value);
+          if (attemptDeadline_ != null) {
+            attemptDeadline_ =
+                com.google.protobuf.Timestamp.newBuilder(attemptDeadline_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             attemptDeadline_ = value;
           }
+          onChanged();
         } else {
           attemptDeadlineBuilder_.mergeFrom(value);
         }
-        if (attemptDeadline_ != null) {
-          bitField0_ |= 0x00000002;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -1182,13 +1161,14 @@ public Builder mergeAttemptDeadline(com.google.protobuf.Timestamp value) {
        * .google.protobuf.Timestamp attempt_deadline = 2;
        */
       public Builder clearAttemptDeadline() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        attemptDeadline_ = null;
-        if (attemptDeadlineBuilder_ != null) {
-          attemptDeadlineBuilder_.dispose();
+        if (attemptDeadlineBuilder_ == null) {
+          attemptDeadline_ = null;
+          onChanged();
+        } else {
+          attemptDeadline_ = null;
           attemptDeadlineBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1202,7 +1182,7 @@ public Builder clearAttemptDeadline() {
        * .google.protobuf.Timestamp attempt_deadline = 2;
        */
       public com.google.protobuf.Timestamp.Builder getAttemptDeadlineBuilder() {
-        bitField0_ |= 0x00000002;
+
         onChanged();
         return getAttemptDeadlineFieldBuilder().getBuilder();
       }
@@ -1272,7 +1252,7 @@ public com.google.protobuf.TimestampOrBuilder getAttemptDeadlineOrBuilder() {
        * @return Whether the responseTime field is set.
        */
       public boolean hasResponseTime() {
-        return ((bitField0_ & 0x00000004) != 0);
+        return responseTimeBuilder_ != null || responseTime_ != null;
       }
 
       /**
@@ -1313,11 +1293,11 @@ public Builder setResponseTime(com.google.protobuf.Timestamp value) {
             throw new NullPointerException();
           }
           responseTime_ = value;
+          onChanged();
         } else {
           responseTimeBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
+
         return this;
       }
 
@@ -1334,11 +1314,11 @@ public Builder setResponseTime(com.google.protobuf.Timestamp value) {
       public Builder setResponseTime(com.google.protobuf.Timestamp.Builder builderForValue) {
         if (responseTimeBuilder_ == null) {
           responseTime_ = builderForValue.build();
+          onChanged();
         } else {
           responseTimeBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
+
         return this;
       }
 
@@ -1354,20 +1334,19 @@ public Builder setResponseTime(com.google.protobuf.Timestamp.Builder builderForV
        */
       public Builder mergeResponseTime(com.google.protobuf.Timestamp value) {
         if (responseTimeBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) != 0)
-              && responseTime_ != null
-              && responseTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-            getResponseTimeBuilder().mergeFrom(value);
+          if (responseTime_ != null) {
+            responseTime_ =
+                com.google.protobuf.Timestamp.newBuilder(responseTime_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             responseTime_ = value;
           }
+          onChanged();
         } else {
           responseTimeBuilder_.mergeFrom(value);
         }
-        if (responseTime_ != null) {
-          bitField0_ |= 0x00000004;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -1382,13 +1361,14 @@ public Builder mergeResponseTime(com.google.protobuf.Timestamp value) {
        * .google.protobuf.Timestamp response_time = 3;
        */
       public Builder clearResponseTime() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        responseTime_ = null;
-        if (responseTimeBuilder_ != null) {
-          responseTimeBuilder_.dispose();
+        if (responseTimeBuilder_ == null) {
+          responseTime_ = null;
+          onChanged();
+        } else {
+          responseTime_ = null;
           responseTimeBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1403,7 +1383,7 @@ public Builder clearResponseTime() {
        * .google.protobuf.Timestamp response_time = 3;
        */
       public com.google.protobuf.Timestamp.Builder getResponseTimeBuilder() {
-        bitField0_ |= 0x00000004;
+
         onChanged();
         return getResponseTimeFieldBuilder().getBuilder();
       }
@@ -1475,7 +1455,7 @@ public com.google.protobuf.TimestampOrBuilder getResponseTimeOrBuilder() {
        * @return Whether the attemptDelay field is set.
        */
       public boolean hasAttemptDelay() {
-        return ((bitField0_ & 0x00000008) != 0);
+        return attemptDelayBuilder_ != null || attemptDelay_ != null;
       }
 
       /**
@@ -1516,11 +1496,11 @@ public Builder setAttemptDelay(com.google.protobuf.Duration value) {
             throw new NullPointerException();
           }
           attemptDelay_ = value;
+          onChanged();
         } else {
           attemptDelayBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000008;
-        onChanged();
+
         return this;
       }
 
@@ -1537,11 +1517,11 @@ public Builder setAttemptDelay(com.google.protobuf.Duration value) {
       public Builder setAttemptDelay(com.google.protobuf.Duration.Builder builderForValue) {
         if (attemptDelayBuilder_ == null) {
           attemptDelay_ = builderForValue.build();
+          onChanged();
         } else {
           attemptDelayBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000008;
-        onChanged();
+
         return this;
       }
 
@@ -1557,20 +1537,19 @@ public Builder setAttemptDelay(com.google.protobuf.Duration.Builder builderForVa
        */
       public Builder mergeAttemptDelay(com.google.protobuf.Duration value) {
         if (attemptDelayBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) != 0)
-              && attemptDelay_ != null
-              && attemptDelay_ != com.google.protobuf.Duration.getDefaultInstance()) {
-            getAttemptDelayBuilder().mergeFrom(value);
+          if (attemptDelay_ != null) {
+            attemptDelay_ =
+                com.google.protobuf.Duration.newBuilder(attemptDelay_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             attemptDelay_ = value;
           }
+          onChanged();
         } else {
           attemptDelayBuilder_.mergeFrom(value);
         }
-        if (attemptDelay_ != null) {
-          bitField0_ |= 0x00000008;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -1585,13 +1564,14 @@ public Builder mergeAttemptDelay(com.google.protobuf.Duration value) {
        * .google.protobuf.Duration attempt_delay = 4;
        */
       public Builder clearAttemptDelay() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        attemptDelay_ = null;
-        if (attemptDelayBuilder_ != null) {
-          attemptDelayBuilder_.dispose();
+        if (attemptDelayBuilder_ == null) {
+          attemptDelay_ = null;
+          onChanged();
+        } else {
+          attemptDelay_ = null;
           attemptDelayBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1606,7 +1586,7 @@ public Builder clearAttemptDelay() {
        * .google.protobuf.Duration attempt_delay = 4;
        */
       public com.google.protobuf.Duration.Builder getAttemptDelayBuilder() {
-        bitField0_ |= 0x00000008;
+
         onChanged();
         return getAttemptDelayFieldBuilder().getBuilder();
       }
@@ -1675,7 +1655,7 @@ public com.google.protobuf.DurationOrBuilder getAttemptDelayOrBuilder() {
        * @return Whether the status field is set.
        */
       public boolean hasStatus() {
-        return ((bitField0_ & 0x00000010) != 0);
+        return statusBuilder_ != null || status_ != null;
       }
 
       /**
@@ -1712,11 +1692,11 @@ public Builder setStatus(com.google.rpc.Status value) {
             throw new NullPointerException();
           }
           status_ = value;
+          onChanged();
         } else {
           statusBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000010;
-        onChanged();
+
         return this;
       }
 
@@ -1732,11 +1712,11 @@ public Builder setStatus(com.google.rpc.Status value) {
       public Builder setStatus(com.google.rpc.Status.Builder builderForValue) {
         if (statusBuilder_ == null) {
           status_ = builderForValue.build();
+          onChanged();
         } else {
           statusBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000010;
-        onChanged();
+
         return this;
       }
 
@@ -1751,20 +1731,16 @@ public Builder setStatus(com.google.rpc.Status.Builder builderForValue) {
        */
       public Builder mergeStatus(com.google.rpc.Status value) {
         if (statusBuilder_ == null) {
-          if (((bitField0_ & 0x00000010) != 0)
-              && status_ != null
-              && status_ != com.google.rpc.Status.getDefaultInstance()) {
-            getStatusBuilder().mergeFrom(value);
+          if (status_ != null) {
+            status_ = com.google.rpc.Status.newBuilder(status_).mergeFrom(value).buildPartial();
           } else {
             status_ = value;
           }
+          onChanged();
         } else {
           statusBuilder_.mergeFrom(value);
         }
-        if (status_ != null) {
-          bitField0_ |= 0x00000010;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -1778,13 +1754,14 @@ public Builder mergeStatus(com.google.rpc.Status value) {
        * .google.rpc.Status status = 5;
        */
       public Builder clearStatus() {
-        bitField0_ = (bitField0_ & ~0x00000010);
-        status_ = null;
-        if (statusBuilder_ != null) {
-          statusBuilder_.dispose();
+        if (statusBuilder_ == null) {
+          status_ = null;
+          onChanged();
+        } else {
+          status_ = null;
           statusBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -1798,7 +1775,7 @@ public Builder clearStatus() {
        * .google.rpc.Status status = 5;
        */
       public com.google.rpc.Status.Builder getStatusBuilder() {
-        bitField0_ |= 0x00000010;
+
         onChanged();
         return getStatusFieldBuilder().getBuilder();
       }
@@ -1909,9 +1886,7 @@ public com.google.showcase.v1beta1.StreamingSequenceReport.Attempt getDefaultIns
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    * string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];
@@ -1950,8 +1925,6 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int ATTEMPTS_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
   private java.util.List attempts_;
 
   /**
@@ -2229,15 +2202,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       if (attemptsBuilder_ == null) {
         attempts_ = java.util.Collections.emptyList();
       } else {
         attempts_ = null;
         attemptsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -2265,32 +2238,19 @@ public com.google.showcase.v1beta1.StreamingSequenceReport build() {
     public com.google.showcase.v1beta1.StreamingSequenceReport buildPartial() {
       com.google.showcase.v1beta1.StreamingSequenceReport result =
           new com.google.showcase.v1beta1.StreamingSequenceReport(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(
-        com.google.showcase.v1beta1.StreamingSequenceReport result) {
+      int from_bitField0_ = bitField0_;
+      result.name_ = name_;
       if (attemptsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           attempts_ = java.util.Collections.unmodifiableList(attempts_);
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.attempts_ = attempts_;
       } else {
         result.attempts_ = attemptsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.StreamingSequenceReport result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -2341,14 +2301,13 @@ public Builder mergeFrom(com.google.showcase.v1beta1.StreamingSequenceReport oth
         return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (attemptsBuilder_ == null) {
         if (!other.attempts_.isEmpty()) {
           if (attempts_.isEmpty()) {
             attempts_ = other.attempts_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureAttemptsIsMutable();
             attempts_.addAll(other.attempts_);
@@ -2361,7 +2320,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.StreamingSequenceReport oth
             attemptsBuilder_.dispose();
             attemptsBuilder_ = null;
             attempts_ = other.attempts_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
             attemptsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getAttemptsFieldBuilder()
@@ -2400,7 +2359,7 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
@@ -2482,8 +2441,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2494,8 +2453,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -2511,8 +2470,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -2521,11 +2480,11 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureAttemptsIsMutable() {
-      if (!((bitField0_ & 0x00000002) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         attempts_ =
             new java.util.ArrayList(
                 attempts_);
-        bitField0_ |= 0x00000002;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -2757,7 +2716,7 @@ public Builder addAllAttempts(
     public Builder clearAttempts() {
       if (attemptsBuilder_ == null) {
         attempts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         attemptsBuilder_.clear();
@@ -2894,7 +2853,7 @@ public com.google.showcase.v1beta1.StreamingSequenceReport.Attempt.Builder addAt
                 com.google.showcase.v1beta1.StreamingSequenceReport.Attempt,
                 com.google.showcase.v1beta1.StreamingSequenceReport.Attempt.Builder,
                 com.google.showcase.v1beta1.StreamingSequenceReport.AttemptOrBuilder>(
-                attempts_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+                attempts_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         attempts_ = null;
       }
       return attemptsBuilder_;
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReportOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReportOrBuilder.java
index 9ee1dc893d..0fa913ae50 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReportOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReportOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/sequence.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface StreamingSequenceReportOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Test.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Test.java
index d14bd6278e..e56eae4a41 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Test.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Test.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.Test} */
@@ -44,6 +43,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Test();
   }
 
+  @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.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_Test_descriptor;
@@ -85,10 +89,8 @@ public enum ExpectationLevel implements com.google.protobuf.ProtocolMessageEnum
      *
      * 
      * This test is recommended.
-     *
      * If a generator explicitly ignores a recommended test (see `DeleteTest`),
      * then the report may still pass, but with a warning.
-     *
      * If a generator skips a recommended test and does not explicitly
      * express that intention, the report will fail.
      * 

@@ -101,10 +103,8 @@ public enum ExpectationLevel implements com.google.protobuf.ProtocolMessageEnum
      *
      * 
      * This test is optional.
-     *
      * If a generator explicitly ignores an optional test (see `DeleteTest`),
      * then the report may still pass, and no warning will be issued.
-     *
      * If a generator skips an optional test and does not explicitly
      * express that intention, the report may still pass, but with a
      * warning.
@@ -135,10 +135,8 @@ public enum ExpectationLevel implements com.google.protobuf.ProtocolMessageEnum
      *
      * 
      * This test is recommended.
-     *
      * If a generator explicitly ignores a recommended test (see `DeleteTest`),
      * then the report may still pass, but with a warning.
-     *
      * If a generator skips a recommended test and does not explicitly
      * express that intention, the report will fail.
      * 

@@ -152,10 +150,8 @@ public enum ExpectationLevel implements com.google.protobuf.ProtocolMessageEnum
      *
      * 
      * This test is optional.
-     *
      * If a generator explicitly ignores an optional test (see `DeleteTest`),
      * then the report may still pass, and no warning will be issued.
-     *
      * If a generator skips an optional test and does not explicitly
      * express that intention, the report may still pass, but with a
      * warning.
@@ -445,6 +441,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
       return new Blueprint();
     }
 
+    @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.showcase.v1beta1.TestingOuterClass
           .internal_static_google_showcase_v1beta1_Test_Blueprint_descriptor;
@@ -536,6 +537,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
         return new Invocation();
       }
 
+      @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.showcase.v1beta1.TestingOuterClass
             .internal_static_google_showcase_v1beta1_Test_Blueprint_Invocation_descriptor;
@@ -552,9 +558,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       public static final int METHOD_FIELD_NUMBER = 1;
-
-      @SuppressWarnings("serial")
-      private volatile java.lang.Object method_ = "";
+      private volatile java.lang.Object method_;
 
       /**
        *
@@ -605,8 +609,7 @@ public com.google.protobuf.ByteString getMethodBytes() {
       }
 
       public static final int SERIALIZED_REQUEST_FIELD_NUMBER = 2;
-      private com.google.protobuf.ByteString serializedRequest_ =
-          com.google.protobuf.ByteString.EMPTY;
+      private com.google.protobuf.ByteString serializedRequest_;
 
       /**
        *
@@ -834,9 +837,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
           super.clear();
-          bitField0_ = 0;
           method_ = "";
+
           serializedRequest_ = com.google.protobuf.ByteString.EMPTY;
+
           return this;
         }
 
@@ -864,23 +868,12 @@ public com.google.showcase.v1beta1.Test.Blueprint.Invocation build() {
         public com.google.showcase.v1beta1.Test.Blueprint.Invocation buildPartial() {
           com.google.showcase.v1beta1.Test.Blueprint.Invocation result =
               new com.google.showcase.v1beta1.Test.Blueprint.Invocation(this);
-          if (bitField0_ != 0) {
-            buildPartial0(result);
-          }
+          result.method_ = method_;
+          result.serializedRequest_ = serializedRequest_;
           onBuilt();
           return result;
         }
 
-        private void buildPartial0(com.google.showcase.v1beta1.Test.Blueprint.Invocation result) {
-          int from_bitField0_ = bitField0_;
-          if (((from_bitField0_ & 0x00000001) != 0)) {
-            result.method_ = method_;
-          }
-          if (((from_bitField0_ & 0x00000002) != 0)) {
-            result.serializedRequest_ = serializedRequest_;
-          }
-        }
-
         @java.lang.Override
         public Builder clone() {
           return super.clone();
@@ -931,7 +924,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Test.Blueprint.Invocation o
             return this;
           if (!other.getMethod().isEmpty()) {
             method_ = other.method_;
-            bitField0_ |= 0x00000001;
             onChanged();
           }
           if (other.getSerializedRequest() != com.google.protobuf.ByteString.EMPTY) {
@@ -966,13 +958,13 @@ public Builder mergeFrom(
                 case 10:
                   {
                     method_ = input.readStringRequireUtf8();
-                    bitField0_ |= 0x00000001;
+
                     break;
                   } // case 10
                 case 18:
                   {
                     serializedRequest_ = input.readBytes();
-                    bitField0_ |= 0x00000002;
+
                     break;
                   } // case 18
                 default:
@@ -992,8 +984,6 @@ public Builder mergeFrom(
           return this;
         }
 
-        private int bitField0_;
-
         private java.lang.Object method_ = "";
 
         /**
@@ -1058,8 +1048,8 @@ public Builder setMethod(java.lang.String value) {
           if (value == null) {
             throw new NullPointerException();
           }
+
           method_ = value;
-          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -1076,8 +1066,8 @@ public Builder setMethod(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearMethod() {
+
           method_ = getDefaultInstance().getMethod();
-          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
           return this;
         }
@@ -1099,8 +1089,8 @@ public Builder setMethodBytes(com.google.protobuf.ByteString value) {
             throw new NullPointerException();
           }
           checkByteStringIsUtf8(value);
+
           method_ = value;
-          bitField0_ |= 0x00000001;
           onChanged();
           return this;
         }
@@ -1140,8 +1130,8 @@ public Builder setSerializedRequest(com.google.protobuf.ByteString value) {
           if (value == null) {
             throw new NullPointerException();
           }
+
           serializedRequest_ = value;
-          bitField0_ |= 0x00000002;
           onChanged();
           return this;
         }
@@ -1158,7 +1148,7 @@ public Builder setSerializedRequest(com.google.protobuf.ByteString value) {
          * @return This builder for chaining.
          */
         public Builder clearSerializedRequest() {
-          bitField0_ = (bitField0_ & ~0x00000002);
+
           serializedRequest_ = getDefaultInstance().getSerializedRequest();
           onChanged();
           return this;
@@ -1228,11 +1218,8 @@ public com.google.showcase.v1beta1.Test.Blueprint.Invocation getDefaultInstanceF
       }
     }
 
-    private int bitField0_;
     public static final int NAME_FIELD_NUMBER = 1;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object name_ = "";
+    private volatile java.lang.Object name_;
 
     /**
      *
@@ -1283,9 +1270,7 @@ public com.google.protobuf.ByteString getNameBytes() {
     }
 
     public static final int DESCRIPTION_FIELD_NUMBER = 2;
-
-    @SuppressWarnings("serial")
-    private volatile java.lang.Object description_ = "";
+    private volatile java.lang.Object description_;
 
     /**
      *
@@ -1351,7 +1336,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
      */
     @java.lang.Override
     public boolean hasRequest() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return request_ != null;
     }
 
     /**
@@ -1383,14 +1368,10 @@ public com.google.showcase.v1beta1.Test.Blueprint.Invocation getRequest() {
      */
     @java.lang.Override
     public com.google.showcase.v1beta1.Test.Blueprint.InvocationOrBuilder getRequestOrBuilder() {
-      return request_ == null
-          ? com.google.showcase.v1beta1.Test.Blueprint.Invocation.getDefaultInstance()
-          : request_;
+      return getRequest();
     }
 
     public static final int ADDITIONAL_REQUESTS_FIELD_NUMBER = 4;
-
-    @SuppressWarnings("serial")
     private java.util.List
         additionalRequests_;
 
@@ -1492,7 +1473,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, description_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (request_ != null) {
         output.writeMessage(3, getRequest());
       }
       for (int i = 0; i < additionalRequests_.size(); i++) {
@@ -1513,7 +1494,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, description_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (request_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getRequest());
       }
       for (int i = 0; i < additionalRequests_.size(); i++) {
@@ -1701,31 +1682,23 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.showcase.v1beta1.Test.Blueprint.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
+      private Builder() {}
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-          getRequestFieldBuilder();
-          getAdditionalRequestsFieldBuilder();
-        }
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bitField0_ = 0;
         name_ = "";
+
         description_ = "";
-        request_ = null;
-        if (requestBuilder_ != null) {
-          requestBuilder_.dispose();
+
+        if (requestBuilder_ == null) {
+          request_ = null;
+        } else {
+          request_ = null;
           requestBuilder_ = null;
         }
         if (additionalRequestsBuilder_ == null) {
@@ -1734,7 +1707,7 @@ public Builder clear() {
           additionalRequests_ = null;
           additionalRequestsBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -1762,40 +1735,25 @@ public com.google.showcase.v1beta1.Test.Blueprint build() {
       public com.google.showcase.v1beta1.Test.Blueprint buildPartial() {
         com.google.showcase.v1beta1.Test.Blueprint result =
             new com.google.showcase.v1beta1.Test.Blueprint(this);
-        buildPartialRepeatedFields(result);
-        if (bitField0_ != 0) {
-          buildPartial0(result);
+        int from_bitField0_ = bitField0_;
+        result.name_ = name_;
+        result.description_ = description_;
+        if (requestBuilder_ == null) {
+          result.request_ = request_;
+        } else {
+          result.request_ = requestBuilder_.build();
         }
-        onBuilt();
-        return result;
-      }
-
-      private void buildPartialRepeatedFields(com.google.showcase.v1beta1.Test.Blueprint result) {
         if (additionalRequestsBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             additionalRequests_ = java.util.Collections.unmodifiableList(additionalRequests_);
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.additionalRequests_ = additionalRequests_;
         } else {
           result.additionalRequests_ = additionalRequestsBuilder_.build();
         }
-      }
-
-      private void buildPartial0(com.google.showcase.v1beta1.Test.Blueprint result) {
-        int from_bitField0_ = bitField0_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.name_ = name_;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.description_ = description_;
-        }
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.request_ = requestBuilder_ == null ? request_ : requestBuilder_.build();
-          to_bitField0_ |= 0x00000001;
-        }
-        result.bitField0_ |= to_bitField0_;
+        onBuilt();
+        return result;
       }
 
       @java.lang.Override
@@ -1847,12 +1805,10 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Test.Blueprint other) {
         if (other == com.google.showcase.v1beta1.Test.Blueprint.getDefaultInstance()) return this;
         if (!other.getName().isEmpty()) {
           name_ = other.name_;
-          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (!other.getDescription().isEmpty()) {
           description_ = other.description_;
-          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasRequest()) {
@@ -1862,7 +1818,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Test.Blueprint other) {
           if (!other.additionalRequests_.isEmpty()) {
             if (additionalRequests_.isEmpty()) {
               additionalRequests_ = other.additionalRequests_;
-              bitField0_ = (bitField0_ & ~0x00000008);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureAdditionalRequestsIsMutable();
               additionalRequests_.addAll(other.additionalRequests_);
@@ -1875,7 +1831,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Test.Blueprint other) {
               additionalRequestsBuilder_.dispose();
               additionalRequestsBuilder_ = null;
               additionalRequests_ = other.additionalRequests_;
-              bitField0_ = (bitField0_ & ~0x00000008);
+              bitField0_ = (bitField0_ & ~0x00000001);
               additionalRequestsBuilder_ =
                   com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                       ? getAdditionalRequestsFieldBuilder()
@@ -1914,19 +1870,19 @@ public Builder mergeFrom(
               case 10:
                 {
                   name_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000001;
+
                   break;
                 } // case 10
               case 18:
                 {
                   description_ = input.readStringRequireUtf8();
-                  bitField0_ |= 0x00000002;
+
                   break;
                 } // case 18
               case 26:
                 {
                   input.readMessage(getRequestFieldBuilder().getBuilder(), extensionRegistry);
-                  bitField0_ |= 0x00000004;
+
                   break;
                 } // case 26
               case 34:
@@ -2026,8 +1982,8 @@ public Builder setName(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         name_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2044,8 +2000,8 @@ public Builder setName(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearName() {
+
         name_ = getDefaultInstance().getName();
-        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -2067,8 +2023,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         name_ = value;
-        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2137,8 +2093,8 @@ public Builder setDescription(java.lang.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
+
         description_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2155,8 +2111,8 @@ public Builder setDescription(java.lang.String value) {
        * @return This builder for chaining.
        */
       public Builder clearDescription() {
+
         description_ = getDefaultInstance().getDescription();
-        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -2178,8 +2134,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
           throw new NullPointerException();
         }
         checkByteStringIsUtf8(value);
+
         description_ = value;
-        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2203,7 +2159,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
        * @return Whether the request field is set.
        */
       public boolean hasRequest() {
-        return ((bitField0_ & 0x00000004) != 0);
+        return requestBuilder_ != null || request_ != null;
       }
 
       /**
@@ -2242,11 +2198,11 @@ public Builder setRequest(com.google.showcase.v1beta1.Test.Blueprint.Invocation
             throw new NullPointerException();
           }
           request_ = value;
+          onChanged();
         } else {
           requestBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
+
         return this;
       }
 
@@ -2263,11 +2219,11 @@ public Builder setRequest(
           com.google.showcase.v1beta1.Test.Blueprint.Invocation.Builder builderForValue) {
         if (requestBuilder_ == null) {
           request_ = builderForValue.build();
+          onChanged();
         } else {
           requestBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000004;
-        onChanged();
+
         return this;
       }
 
@@ -2282,21 +2238,19 @@ public Builder setRequest(
        */
       public Builder mergeRequest(com.google.showcase.v1beta1.Test.Blueprint.Invocation value) {
         if (requestBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) != 0)
-              && request_ != null
-              && request_
-                  != com.google.showcase.v1beta1.Test.Blueprint.Invocation.getDefaultInstance()) {
-            getRequestBuilder().mergeFrom(value);
+          if (request_ != null) {
+            request_ =
+                com.google.showcase.v1beta1.Test.Blueprint.Invocation.newBuilder(request_)
+                    .mergeFrom(value)
+                    .buildPartial();
           } else {
             request_ = value;
           }
+          onChanged();
         } else {
           requestBuilder_.mergeFrom(value);
         }
-        if (request_ != null) {
-          bitField0_ |= 0x00000004;
-          onChanged();
-        }
+
         return this;
       }
 
@@ -2310,13 +2264,14 @@ public Builder mergeRequest(com.google.showcase.v1beta1.Test.Blueprint.Invocatio
        * .google.showcase.v1beta1.Test.Blueprint.Invocation request = 3;
        */
       public Builder clearRequest() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        request_ = null;
-        if (requestBuilder_ != null) {
-          requestBuilder_.dispose();
+        if (requestBuilder_ == null) {
+          request_ = null;
+          onChanged();
+        } else {
+          request_ = null;
           requestBuilder_ = null;
         }
-        onChanged();
+
         return this;
       }
 
@@ -2330,7 +2285,7 @@ public Builder clearRequest() {
        * .google.showcase.v1beta1.Test.Blueprint.Invocation request = 3;
        */
       public com.google.showcase.v1beta1.Test.Blueprint.Invocation.Builder getRequestBuilder() {
-        bitField0_ |= 0x00000004;
+
         onChanged();
         return getRequestFieldBuilder().getBuilder();
       }
@@ -2384,11 +2339,11 @@ public com.google.showcase.v1beta1.Test.Blueprint.InvocationOrBuilder getRequest
           additionalRequests_ = java.util.Collections.emptyList();
 
       private void ensureAdditionalRequestsIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           additionalRequests_ =
               new java.util.ArrayList(
                   additionalRequests_);
-          bitField0_ |= 0x00000008;
+          bitField0_ |= 0x00000001;
         }
       }
 
@@ -2633,7 +2588,7 @@ public Builder addAllAdditionalRequests(
       public Builder clearAdditionalRequests() {
         if (additionalRequestsBuilder_ == null) {
           additionalRequests_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
           additionalRequestsBuilder_.clear();
@@ -2776,7 +2731,7 @@ public Builder removeAdditionalRequests(int index) {
                   com.google.showcase.v1beta1.Test.Blueprint.Invocation.Builder,
                   com.google.showcase.v1beta1.Test.Blueprint.InvocationOrBuilder>(
                   additionalRequests_,
-                  ((bitField0_ & 0x00000008) != 0),
+                  ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
           additionalRequests_ = null;
@@ -2849,9 +2804,7 @@ public com.google.showcase.v1beta1.Test.Blueprint getDefaultInstanceForType() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -2906,7 +2859,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int EXPECTATION_LEVEL_FIELD_NUMBER = 2;
-  private int expectationLevel_ = 0;
+  private int expectationLevel_;
 
   /**
    *
@@ -2937,15 +2890,14 @@ public int getExpectationLevelValue() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.Test.ExpectationLevel getExpectationLevel() {
+    @SuppressWarnings("deprecation")
     com.google.showcase.v1beta1.Test.ExpectationLevel result =
-        com.google.showcase.v1beta1.Test.ExpectationLevel.forNumber(expectationLevel_);
+        com.google.showcase.v1beta1.Test.ExpectationLevel.valueOf(expectationLevel_);
     return result == null ? com.google.showcase.v1beta1.Test.ExpectationLevel.UNRECOGNIZED : result;
   }
 
   public static final int DESCRIPTION_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object description_ = "";
+  private volatile java.lang.Object description_;
 
   /**
    *
@@ -2996,8 +2948,6 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
   }
 
   public static final int BLUEPRINTS_FIELD_NUMBER = 4;
-
-  @SuppressWarnings("serial")
   private java.util.List blueprints_;
 
   /**
@@ -3307,17 +3257,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       expectationLevel_ = 0;
+
       description_ = "";
+
       if (blueprintsBuilder_ == null) {
         blueprints_ = java.util.Collections.emptyList();
       } else {
         blueprints_ = null;
         blueprintsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000008);
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -3344,37 +3296,21 @@ public com.google.showcase.v1beta1.Test build() {
     @java.lang.Override
     public com.google.showcase.v1beta1.Test buildPartial() {
       com.google.showcase.v1beta1.Test result = new com.google.showcase.v1beta1.Test(this);
-      buildPartialRepeatedFields(result);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartialRepeatedFields(com.google.showcase.v1beta1.Test result) {
+      int from_bitField0_ = bitField0_;
+      result.name_ = name_;
+      result.expectationLevel_ = expectationLevel_;
+      result.description_ = description_;
       if (blueprintsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           blueprints_ = java.util.Collections.unmodifiableList(blueprints_);
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.blueprints_ = blueprints_;
       } else {
         result.blueprints_ = blueprintsBuilder_.build();
       }
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.Test result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.expectationLevel_ = expectationLevel_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.description_ = description_;
-      }
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -3424,7 +3360,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Test other) {
       if (other == com.google.showcase.v1beta1.Test.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.expectationLevel_ != 0) {
@@ -3432,14 +3367,13 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Test other) {
       }
       if (!other.getDescription().isEmpty()) {
         description_ = other.description_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (blueprintsBuilder_ == null) {
         if (!other.blueprints_.isEmpty()) {
           if (blueprints_.isEmpty()) {
             blueprints_ = other.blueprints_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureBlueprintsIsMutable();
             blueprints_.addAll(other.blueprints_);
@@ -3452,7 +3386,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Test other) {
             blueprintsBuilder_.dispose();
             blueprintsBuilder_ = null;
             blueprints_ = other.blueprints_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000001);
             blueprintsBuilder_ =
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
                     ? getBlueprintsFieldBuilder()
@@ -3491,19 +3425,19 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 16:
               {
                 expectationLevel_ = input.readEnum();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 16
             case 26:
               {
                 description_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
@@ -3608,8 +3542,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3628,8 +3562,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -3653,8 +3587,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -3690,8 +3624,8 @@ public int getExpectationLevelValue() {
      * @return This builder for chaining.
      */
     public Builder setExpectationLevelValue(int value) {
+
       expectationLevel_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -3709,8 +3643,9 @@ public Builder setExpectationLevelValue(int value) {
      */
     @java.lang.Override
     public com.google.showcase.v1beta1.Test.ExpectationLevel getExpectationLevel() {
+      @SuppressWarnings("deprecation")
       com.google.showcase.v1beta1.Test.ExpectationLevel result =
-          com.google.showcase.v1beta1.Test.ExpectationLevel.forNumber(expectationLevel_);
+          com.google.showcase.v1beta1.Test.ExpectationLevel.valueOf(expectationLevel_);
       return result == null
           ? com.google.showcase.v1beta1.Test.ExpectationLevel.UNRECOGNIZED
           : result;
@@ -3732,7 +3667,7 @@ public Builder setExpectationLevel(com.google.showcase.v1beta1.Test.ExpectationL
       if (value == null) {
         throw new NullPointerException();
       }
-      bitField0_ |= 0x00000002;
+
       expectationLevel_ = value.getNumber();
       onChanged();
       return this;
@@ -3750,7 +3685,7 @@ public Builder setExpectationLevel(com.google.showcase.v1beta1.Test.ExpectationL
      * @return This builder for chaining.
      */
     public Builder clearExpectationLevel() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       expectationLevel_ = 0;
       onChanged();
       return this;
@@ -3820,8 +3755,8 @@ public Builder setDescription(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       description_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -3838,8 +3773,8 @@ public Builder setDescription(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDescription() {
+
       description_ = getDefaultInstance().getDescription();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -3861,8 +3796,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       description_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -3871,10 +3806,10 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
         java.util.Collections.emptyList();
 
     private void ensureBlueprintsIsMutable() {
-      if (!((bitField0_ & 0x00000008) != 0)) {
+      if (!((bitField0_ & 0x00000001) != 0)) {
         blueprints_ =
             new java.util.ArrayList(blueprints_);
-        bitField0_ |= 0x00000008;
+        bitField0_ |= 0x00000001;
       }
     }
 
@@ -4133,7 +4068,7 @@ public Builder addAllBlueprints(
     public Builder clearBlueprints() {
       if (blueprintsBuilder_ == null) {
         blueprints_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
       } else {
         blueprintsBuilder_.clear();
@@ -4283,7 +4218,7 @@ public com.google.showcase.v1beta1.Test.Blueprint.Builder addBlueprintsBuilder(i
                 com.google.showcase.v1beta1.Test.Blueprint,
                 com.google.showcase.v1beta1.Test.Blueprint.Builder,
                 com.google.showcase.v1beta1.Test.BlueprintOrBuilder>(
-                blueprints_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
+                blueprints_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
         blueprints_ = null;
       }
       return blueprintsBuilder_;
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestOrBuilder.java
index abeeb7ce8e..a0cc89f870 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface TestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestRun.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestRun.java
index 001fef15ab..57e5e2116c 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestRun.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestRun.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new TestRun();
   }
 
+  @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.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_TestRun_descriptor;
@@ -64,11 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.TestRun.Builder.class);
   }
 
-  private int bitField0_;
   public static final int TEST_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object test_ = "";
+  private volatile java.lang.Object test_;
 
   /**
    *
@@ -138,7 +139,7 @@ public com.google.protobuf.ByteString getTestBytes() {
    */
   @java.lang.Override
   public boolean hasIssue() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return issue_ != null;
   }
 
   /**
@@ -168,7 +169,7 @@ public com.google.showcase.v1beta1.Issue getIssue() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.IssueOrBuilder getIssueOrBuilder() {
-    return issue_ == null ? com.google.showcase.v1beta1.Issue.getDefaultInstance() : issue_;
+    return getIssue();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -188,7 +189,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(test_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, test_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (issue_ != null) {
       output.writeMessage(2, getIssue());
     }
     getUnknownFields().writeTo(output);
@@ -203,7 +204,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(test_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, test_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (issue_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getIssue());
     }
     size += getUnknownFields().getSerializedSize();
@@ -372,29 +373,21 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.TestRun.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getIssueFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       test_ = "";
-      issue_ = null;
-      if (issueBuilder_ != null) {
-        issueBuilder_.dispose();
+
+      if (issueBuilder_ == null) {
+        issue_ = null;
+      } else {
+        issue_ = null;
         issueBuilder_ = null;
       }
       return this;
@@ -423,26 +416,16 @@ public com.google.showcase.v1beta1.TestRun build() {
     @java.lang.Override
     public com.google.showcase.v1beta1.TestRun buildPartial() {
       com.google.showcase.v1beta1.TestRun result = new com.google.showcase.v1beta1.TestRun(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      result.test_ = test_;
+      if (issueBuilder_ == null) {
+        result.issue_ = issue_;
+      } else {
+        result.issue_ = issueBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.TestRun result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.test_ = test_;
-      }
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.issue_ = issueBuilder_ == null ? issue_ : issueBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -490,7 +473,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.TestRun other) {
       if (other == com.google.showcase.v1beta1.TestRun.getDefaultInstance()) return this;
       if (!other.getTest().isEmpty()) {
         test_ = other.test_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasIssue()) {
@@ -525,13 +507,13 @@ public Builder mergeFrom(
             case 10:
               {
                 test_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getIssueFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -551,8 +533,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object test_ = "";
 
     /**
@@ -623,8 +603,8 @@ public Builder setTest(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       test_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -643,8 +623,8 @@ public Builder setTest(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearTest() {
+
       test_ = getDefaultInstance().getTest();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -668,8 +648,8 @@ public Builder setTestBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       test_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -693,7 +673,7 @@ public Builder setTestBytes(com.google.protobuf.ByteString value) {
      * @return Whether the issue field is set.
      */
     public boolean hasIssue() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return issueBuilder_ != null || issue_ != null;
     }
 
     /**
@@ -730,11 +710,11 @@ public Builder setIssue(com.google.showcase.v1beta1.Issue value) {
           throw new NullPointerException();
         }
         issue_ = value;
+        onChanged();
       } else {
         issueBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -750,11 +730,11 @@ public Builder setIssue(com.google.showcase.v1beta1.Issue value) {
     public Builder setIssue(com.google.showcase.v1beta1.Issue.Builder builderForValue) {
       if (issueBuilder_ == null) {
         issue_ = builderForValue.build();
+        onChanged();
       } else {
         issueBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -769,20 +749,17 @@ public Builder setIssue(com.google.showcase.v1beta1.Issue.Builder builderForValu
      */
     public Builder mergeIssue(com.google.showcase.v1beta1.Issue value) {
       if (issueBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && issue_ != null
-            && issue_ != com.google.showcase.v1beta1.Issue.getDefaultInstance()) {
-          getIssueBuilder().mergeFrom(value);
+        if (issue_ != null) {
+          issue_ =
+              com.google.showcase.v1beta1.Issue.newBuilder(issue_).mergeFrom(value).buildPartial();
         } else {
           issue_ = value;
         }
+        onChanged();
       } else {
         issueBuilder_.mergeFrom(value);
       }
-      if (issue_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -796,13 +773,14 @@ public Builder mergeIssue(com.google.showcase.v1beta1.Issue value) {
      * .google.showcase.v1beta1.Issue issue = 2;
      */
     public Builder clearIssue() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      issue_ = null;
-      if (issueBuilder_ != null) {
-        issueBuilder_.dispose();
+      if (issueBuilder_ == null) {
+        issue_ = null;
+        onChanged();
+      } else {
+        issue_ = null;
         issueBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -816,7 +794,7 @@ public Builder clearIssue() {
      * .google.showcase.v1beta1.Issue issue = 2;
      */
     public com.google.showcase.v1beta1.Issue.Builder getIssueBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getIssueFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestRunOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestRunOrBuilder.java
index c60047fe3e..ed31c3c1c9 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestRunOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestRunOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface TestRunOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestingOuterClass.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestingOuterClass.java
index 6527ae96b1..ac16d6e6ab 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestingOuterClass.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestingOuterClass.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public final class TestingOuterClass {
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateBlurbRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateBlurbRequest.java
index 4e0ac845aa..35c2c6ac2b 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateBlurbRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateBlurbRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -48,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new UpdateBlurbRequest();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_UpdateBlurbRequest_descriptor;
@@ -63,7 +67,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.UpdateBlurbRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int BLURB_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.Blurb blurb_;
 
@@ -80,7 +83,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasBlurb() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return blurb_ != null;
   }
 
   /**
@@ -110,7 +113,7 @@ public com.google.showcase.v1beta1.Blurb getBlurb() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.BlurbOrBuilder getBlurbOrBuilder() {
-    return blurb_ == null ? com.google.showcase.v1beta1.Blurb.getDefaultInstance() : blurb_;
+    return getBlurb();
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -130,7 +133,7 @@ public com.google.showcase.v1beta1.BlurbOrBuilder getBlurbOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateMask() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return updateMask_ != null;
   }
 
   /**
@@ -162,7 +165,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+    return getUpdateMask();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -179,10 +182,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (blurb_ != null) {
       output.writeMessage(1, getBlurb());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateMask_ != null) {
       output.writeMessage(2, getUpdateMask());
     }
     getUnknownFields().writeTo(output);
@@ -194,10 +197,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (blurb_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getBlurb());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateMask_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getUpdateMask());
     }
     size += getUnknownFields().getSerializedSize();
@@ -374,34 +377,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.UpdateBlurbRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getBlurbFieldBuilder();
-        getUpdateMaskFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      blurb_ = null;
-      if (blurbBuilder_ != null) {
-        blurbBuilder_.dispose();
+      if (blurbBuilder_ == null) {
+        blurb_ = null;
+      } else {
+        blurb_ = null;
         blurbBuilder_ = null;
       }
-      updateMask_ = null;
-      if (updateMaskBuilder_ != null) {
-        updateMaskBuilder_.dispose();
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+      } else {
+        updateMask_ = null;
         updateMaskBuilder_ = null;
       }
       return this;
@@ -431,27 +425,20 @@ public com.google.showcase.v1beta1.UpdateBlurbRequest build() {
     public com.google.showcase.v1beta1.UpdateBlurbRequest buildPartial() {
       com.google.showcase.v1beta1.UpdateBlurbRequest result =
           new com.google.showcase.v1beta1.UpdateBlurbRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (blurbBuilder_ == null) {
+        result.blurb_ = blurb_;
+      } else {
+        result.blurb_ = blurbBuilder_.build();
+      }
+      if (updateMaskBuilder_ == null) {
+        result.updateMask_ = updateMask_;
+      } else {
+        result.updateMask_ = updateMaskBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.UpdateBlurbRequest result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.blurb_ = blurbBuilder_ == null ? blurb_ : blurbBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -532,13 +519,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getBlurbFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -558,8 +545,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.showcase.v1beta1.Blurb blurb_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.showcase.v1beta1.Blurb,
@@ -579,7 +564,7 @@ public Builder mergeFrom(
      * @return Whether the blurb field is set.
      */
     public boolean hasBlurb() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return blurbBuilder_ != null || blurb_ != null;
     }
 
     /**
@@ -616,11 +601,11 @@ public Builder setBlurb(com.google.showcase.v1beta1.Blurb value) {
           throw new NullPointerException();
         }
         blurb_ = value;
+        onChanged();
       } else {
         blurbBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -636,11 +621,11 @@ public Builder setBlurb(com.google.showcase.v1beta1.Blurb value) {
     public Builder setBlurb(com.google.showcase.v1beta1.Blurb.Builder builderForValue) {
       if (blurbBuilder_ == null) {
         blurb_ = builderForValue.build();
+        onChanged();
       } else {
         blurbBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -655,20 +640,17 @@ public Builder setBlurb(com.google.showcase.v1beta1.Blurb.Builder builderForValu
      */
     public Builder mergeBlurb(com.google.showcase.v1beta1.Blurb value) {
       if (blurbBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && blurb_ != null
-            && blurb_ != com.google.showcase.v1beta1.Blurb.getDefaultInstance()) {
-          getBlurbBuilder().mergeFrom(value);
+        if (blurb_ != null) {
+          blurb_ =
+              com.google.showcase.v1beta1.Blurb.newBuilder(blurb_).mergeFrom(value).buildPartial();
         } else {
           blurb_ = value;
         }
+        onChanged();
       } else {
         blurbBuilder_.mergeFrom(value);
       }
-      if (blurb_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -682,13 +664,14 @@ public Builder mergeBlurb(com.google.showcase.v1beta1.Blurb value) {
      * .google.showcase.v1beta1.Blurb blurb = 1;
      */
     public Builder clearBlurb() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      blurb_ = null;
-      if (blurbBuilder_ != null) {
-        blurbBuilder_.dispose();
+      if (blurbBuilder_ == null) {
+        blurb_ = null;
+        onChanged();
+      } else {
+        blurb_ = null;
         blurbBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -702,7 +685,7 @@ public Builder clearBlurb() {
      * .google.showcase.v1beta1.Blurb blurb = 1;
      */
     public com.google.showcase.v1beta1.Blurb.Builder getBlurbBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getBlurbFieldBuilder().getBuilder();
     }
@@ -770,7 +753,7 @@ public com.google.showcase.v1beta1.BlurbOrBuilder getBlurbOrBuilder() {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return updateMaskBuilder_ != null || updateMask_ != null;
     }
 
     /**
@@ -811,11 +794,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
+        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -832,11 +815,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
+        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -852,20 +835,17 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && updateMask_ != null
-            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
-          getUpdateMaskBuilder().mergeFrom(value);
+        if (updateMask_ != null) {
+          updateMask_ =
+              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
         } else {
           updateMask_ = value;
         }
+        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-      if (updateMask_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -880,13 +860,14 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * .google.protobuf.FieldMask update_mask = 2;
      */
     public Builder clearUpdateMask() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      updateMask_ = null;
-      if (updateMaskBuilder_ != null) {
-        updateMaskBuilder_.dispose();
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+        onChanged();
+      } else {
+        updateMask_ = null;
         updateMaskBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -901,7 +882,7 @@ public Builder clearUpdateMask() {
      * .google.protobuf.FieldMask update_mask = 2;
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateBlurbRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateBlurbRequestOrBuilder.java
index cb573c3388..1569bb6ba6 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateBlurbRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateBlurbRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface UpdateBlurbRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateRoomRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateRoomRequest.java
index 9c35ee243d..94f673334e 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateRoomRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateRoomRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -48,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new UpdateRoomRequest();
   }
 
+  @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.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_UpdateRoomRequest_descriptor;
@@ -63,7 +67,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.UpdateRoomRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int ROOM_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.Room room_;
 
@@ -80,7 +83,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasRoom() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return room_ != null;
   }
 
   /**
@@ -110,7 +113,7 @@ public com.google.showcase.v1beta1.Room getRoom() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.RoomOrBuilder getRoomOrBuilder() {
-    return room_ == null ? com.google.showcase.v1beta1.Room.getDefaultInstance() : room_;
+    return getRoom();
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -130,7 +133,7 @@ public com.google.showcase.v1beta1.RoomOrBuilder getRoomOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateMask() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return updateMask_ != null;
   }
 
   /**
@@ -162,7 +165,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+    return getUpdateMask();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -179,10 +182,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (room_ != null) {
       output.writeMessage(1, getRoom());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateMask_ != null) {
       output.writeMessage(2, getUpdateMask());
     }
     getUnknownFields().writeTo(output);
@@ -194,10 +197,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (room_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getRoom());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateMask_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getUpdateMask());
     }
     size += getUnknownFields().getSerializedSize();
@@ -374,34 +377,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.UpdateRoomRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getRoomFieldBuilder();
-        getUpdateMaskFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      room_ = null;
-      if (roomBuilder_ != null) {
-        roomBuilder_.dispose();
+      if (roomBuilder_ == null) {
+        room_ = null;
+      } else {
+        room_ = null;
         roomBuilder_ = null;
       }
-      updateMask_ = null;
-      if (updateMaskBuilder_ != null) {
-        updateMaskBuilder_.dispose();
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+      } else {
+        updateMask_ = null;
         updateMaskBuilder_ = null;
       }
       return this;
@@ -431,27 +425,20 @@ public com.google.showcase.v1beta1.UpdateRoomRequest build() {
     public com.google.showcase.v1beta1.UpdateRoomRequest buildPartial() {
       com.google.showcase.v1beta1.UpdateRoomRequest result =
           new com.google.showcase.v1beta1.UpdateRoomRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (roomBuilder_ == null) {
+        result.room_ = room_;
+      } else {
+        result.room_ = roomBuilder_.build();
+      }
+      if (updateMaskBuilder_ == null) {
+        result.updateMask_ = updateMask_;
+      } else {
+        result.updateMask_ = updateMaskBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.UpdateRoomRequest result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.room_ = roomBuilder_ == null ? room_ : roomBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -532,13 +519,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getRoomFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -558,8 +545,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.showcase.v1beta1.Room room_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.showcase.v1beta1.Room,
@@ -579,7 +564,7 @@ public Builder mergeFrom(
      * @return Whether the room field is set.
      */
     public boolean hasRoom() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return roomBuilder_ != null || room_ != null;
     }
 
     /**
@@ -616,11 +601,11 @@ public Builder setRoom(com.google.showcase.v1beta1.Room value) {
           throw new NullPointerException();
         }
         room_ = value;
+        onChanged();
       } else {
         roomBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -636,11 +621,11 @@ public Builder setRoom(com.google.showcase.v1beta1.Room value) {
     public Builder setRoom(com.google.showcase.v1beta1.Room.Builder builderForValue) {
       if (roomBuilder_ == null) {
         room_ = builderForValue.build();
+        onChanged();
       } else {
         roomBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -655,20 +640,17 @@ public Builder setRoom(com.google.showcase.v1beta1.Room.Builder builderForValue)
      */
     public Builder mergeRoom(com.google.showcase.v1beta1.Room value) {
       if (roomBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && room_ != null
-            && room_ != com.google.showcase.v1beta1.Room.getDefaultInstance()) {
-          getRoomBuilder().mergeFrom(value);
+        if (room_ != null) {
+          room_ =
+              com.google.showcase.v1beta1.Room.newBuilder(room_).mergeFrom(value).buildPartial();
         } else {
           room_ = value;
         }
+        onChanged();
       } else {
         roomBuilder_.mergeFrom(value);
       }
-      if (room_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -682,13 +664,14 @@ public Builder mergeRoom(com.google.showcase.v1beta1.Room value) {
      * .google.showcase.v1beta1.Room room = 1;
      */
     public Builder clearRoom() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      room_ = null;
-      if (roomBuilder_ != null) {
-        roomBuilder_.dispose();
+      if (roomBuilder_ == null) {
+        room_ = null;
+        onChanged();
+      } else {
+        room_ = null;
         roomBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -702,7 +685,7 @@ public Builder clearRoom() {
      * .google.showcase.v1beta1.Room room = 1;
      */
     public com.google.showcase.v1beta1.Room.Builder getRoomBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getRoomFieldBuilder().getBuilder();
     }
@@ -770,7 +753,7 @@ public com.google.showcase.v1beta1.RoomOrBuilder getRoomOrBuilder() {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return updateMaskBuilder_ != null || updateMask_ != null;
     }
 
     /**
@@ -811,11 +794,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
+        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -832,11 +815,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
+        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -852,20 +835,17 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && updateMask_ != null
-            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
-          getUpdateMaskBuilder().mergeFrom(value);
+        if (updateMask_ != null) {
+          updateMask_ =
+              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
         } else {
           updateMask_ = value;
         }
+        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-      if (updateMask_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -880,13 +860,14 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * .google.protobuf.FieldMask update_mask = 2;
      */
     public Builder clearUpdateMask() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      updateMask_ = null;
-      if (updateMaskBuilder_ != null) {
-        updateMaskBuilder_.dispose();
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+        onChanged();
+      } else {
+        updateMask_ = null;
         updateMaskBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -901,7 +882,7 @@ public Builder clearUpdateMask() {
      * .google.protobuf.FieldMask update_mask = 2;
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateRoomRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateRoomRequestOrBuilder.java
index c2b935993f..8b24d08224 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateRoomRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateRoomRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/messaging.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface UpdateRoomRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateUserRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateUserRequest.java
index 7041abd914..89e53ee8df 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateUserRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateUserRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/identity.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -48,6 +47,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new UpdateUserRequest();
   }
 
+  @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.showcase.v1beta1.IdentityOuterClass
         .internal_static_google_showcase_v1beta1_UpdateUserRequest_descriptor;
@@ -63,7 +67,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.UpdateUserRequest.Builder.class);
   }
 
-  private int bitField0_;
   public static final int USER_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.User user_;
 
@@ -80,7 +83,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasUser() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return user_ != null;
   }
 
   /**
@@ -110,7 +113,7 @@ public com.google.showcase.v1beta1.User getUser() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.UserOrBuilder getUserOrBuilder() {
-    return user_ == null ? com.google.showcase.v1beta1.User.getDefaultInstance() : user_;
+    return getUser();
   }
 
   public static final int UPDATE_MASK_FIELD_NUMBER = 2;
@@ -130,7 +133,7 @@ public com.google.showcase.v1beta1.UserOrBuilder getUserOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateMask() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return updateMask_ != null;
   }
 
   /**
@@ -162,7 +165,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    */
   @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+    return getUpdateMask();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -179,10 +182,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (user_ != null) {
       output.writeMessage(1, getUser());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateMask_ != null) {
       output.writeMessage(2, getUpdateMask());
     }
     getUnknownFields().writeTo(output);
@@ -194,10 +197,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (user_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getUser());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateMask_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getUpdateMask());
     }
     size += getUnknownFields().getSerializedSize();
@@ -374,34 +377,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.UpdateUserRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getUserFieldBuilder();
-        getUpdateMaskFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      user_ = null;
-      if (userBuilder_ != null) {
-        userBuilder_.dispose();
+      if (userBuilder_ == null) {
+        user_ = null;
+      } else {
+        user_ = null;
         userBuilder_ = null;
       }
-      updateMask_ = null;
-      if (updateMaskBuilder_ != null) {
-        updateMaskBuilder_.dispose();
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+      } else {
+        updateMask_ = null;
         updateMaskBuilder_ = null;
       }
       return this;
@@ -431,27 +425,20 @@ public com.google.showcase.v1beta1.UpdateUserRequest build() {
     public com.google.showcase.v1beta1.UpdateUserRequest buildPartial() {
       com.google.showcase.v1beta1.UpdateUserRequest result =
           new com.google.showcase.v1beta1.UpdateUserRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (userBuilder_ == null) {
+        result.user_ = user_;
+      } else {
+        result.user_ = userBuilder_.build();
+      }
+      if (updateMaskBuilder_ == null) {
+        result.updateMask_ = updateMask_;
+      } else {
+        result.updateMask_ = updateMaskBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.UpdateUserRequest result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.user_ = userBuilder_ == null ? user_ : userBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
-        to_bitField0_ |= 0x00000002;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -532,13 +519,13 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getUserFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             default:
@@ -558,8 +545,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.showcase.v1beta1.User user_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.showcase.v1beta1.User,
@@ -579,7 +564,7 @@ public Builder mergeFrom(
      * @return Whether the user field is set.
      */
     public boolean hasUser() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return userBuilder_ != null || user_ != null;
     }
 
     /**
@@ -616,11 +601,11 @@ public Builder setUser(com.google.showcase.v1beta1.User value) {
           throw new NullPointerException();
         }
         user_ = value;
+        onChanged();
       } else {
         userBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -636,11 +621,11 @@ public Builder setUser(com.google.showcase.v1beta1.User value) {
     public Builder setUser(com.google.showcase.v1beta1.User.Builder builderForValue) {
       if (userBuilder_ == null) {
         user_ = builderForValue.build();
+        onChanged();
       } else {
         userBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -655,20 +640,17 @@ public Builder setUser(com.google.showcase.v1beta1.User.Builder builderForValue)
      */
     public Builder mergeUser(com.google.showcase.v1beta1.User value) {
       if (userBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && user_ != null
-            && user_ != com.google.showcase.v1beta1.User.getDefaultInstance()) {
-          getUserBuilder().mergeFrom(value);
+        if (user_ != null) {
+          user_ =
+              com.google.showcase.v1beta1.User.newBuilder(user_).mergeFrom(value).buildPartial();
         } else {
           user_ = value;
         }
+        onChanged();
       } else {
         userBuilder_.mergeFrom(value);
       }
-      if (user_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -682,13 +664,14 @@ public Builder mergeUser(com.google.showcase.v1beta1.User value) {
      * .google.showcase.v1beta1.User user = 1;
      */
     public Builder clearUser() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      user_ = null;
-      if (userBuilder_ != null) {
-        userBuilder_.dispose();
+      if (userBuilder_ == null) {
+        user_ = null;
+        onChanged();
+      } else {
+        user_ = null;
         userBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -702,7 +685,7 @@ public Builder clearUser() {
      * .google.showcase.v1beta1.User user = 1;
      */
     public com.google.showcase.v1beta1.User.Builder getUserBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getUserFieldBuilder().getBuilder();
     }
@@ -770,7 +753,7 @@ public com.google.showcase.v1beta1.UserOrBuilder getUserOrBuilder() {
      * @return Whether the updateMask field is set.
      */
     public boolean hasUpdateMask() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return updateMaskBuilder_ != null || updateMask_ != null;
     }
 
     /**
@@ -811,11 +794,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
           throw new NullPointerException();
         }
         updateMask_ = value;
+        onChanged();
       } else {
         updateMaskBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -832,11 +815,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
     public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) {
       if (updateMaskBuilder_ == null) {
         updateMask_ = builderForValue.build();
+        onChanged();
       } else {
         updateMaskBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000002;
-      onChanged();
+
       return this;
     }
 
@@ -852,20 +835,17 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal
      */
     public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
       if (updateMaskBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) != 0)
-            && updateMask_ != null
-            && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) {
-          getUpdateMaskBuilder().mergeFrom(value);
+        if (updateMask_ != null) {
+          updateMask_ =
+              com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
         } else {
           updateMask_ = value;
         }
+        onChanged();
       } else {
         updateMaskBuilder_.mergeFrom(value);
       }
-      if (updateMask_ != null) {
-        bitField0_ |= 0x00000002;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -880,13 +860,14 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
      * .google.protobuf.FieldMask update_mask = 2;
      */
     public Builder clearUpdateMask() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      updateMask_ = null;
-      if (updateMaskBuilder_ != null) {
-        updateMaskBuilder_.dispose();
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+        onChanged();
+      } else {
+        updateMask_ = null;
         updateMaskBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -901,7 +882,7 @@ public Builder clearUpdateMask() {
      * .google.protobuf.FieldMask update_mask = 2;
      */
     public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-      bitField0_ |= 0x00000002;
+
       onChanged();
       return getUpdateMaskFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateUserRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateUserRequestOrBuilder.java
index 1fb139f12b..18fb3437d8 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateUserRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateUserRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/identity.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface UpdateUserRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/User.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/User.java
index a3a9422d36..69009c9484 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/User.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/User.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/identity.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -52,6 +51,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new User();
   }
 
+  @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.showcase.v1beta1.IdentityOuterClass
         .internal_static_google_showcase_v1beta1_User_descriptor;
@@ -68,9 +72,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
   private int bitField0_;
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -121,9 +123,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object displayName_ = "";
+  private volatile java.lang.Object displayName_;
 
   /**
    *
@@ -174,9 +174,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
   }
 
   public static final int EMAIL_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object email_ = "";
+  private volatile java.lang.Object email_;
 
   /**
    *
@@ -243,7 +241,7 @@ public com.google.protobuf.ByteString getEmailBytes() {
    */
   @java.lang.Override
   public boolean hasCreateTime() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return createTime_ != null;
   }
 
   /**
@@ -275,7 +273,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+    return getCreateTime();
   }
 
   public static final int UPDATE_TIME_FIELD_NUMBER = 5;
@@ -295,7 +293,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasUpdateTime() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return updateTime_ != null;
   }
 
   /**
@@ -327,11 +325,11 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+    return getUpdateTime();
   }
 
   public static final int AGE_FIELD_NUMBER = 6;
-  private int age_ = 0;
+  private int age_;
 
   /**
    *
@@ -346,7 +344,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
    */
   @java.lang.Override
   public boolean hasAge() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return ((bitField0_ & 0x00000001) != 0);
   }
 
   /**
@@ -366,7 +364,7 @@ public int getAge() {
   }
 
   public static final int HEIGHT_FEET_FIELD_NUMBER = 7;
-  private double heightFeet_ = 0D;
+  private double heightFeet_;
 
   /**
    *
@@ -381,7 +379,7 @@ public int getAge() {
    */
   @java.lang.Override
   public boolean hasHeightFeet() {
-    return ((bitField0_ & 0x00000008) != 0);
+    return ((bitField0_ & 0x00000002) != 0);
   }
 
   /**
@@ -401,16 +399,13 @@ public double getHeightFeet() {
   }
 
   public static final int NICKNAME_FIELD_NUMBER = 8;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object nickname_ = "";
+  private volatile java.lang.Object nickname_;
 
   /**
    *
    *
    * 
    * The nickname of the user.
-   *
    * (-- aip.dev/not-precedent: An empty string is a valid nickname.
    *     Ordinarily, proto3_optional should not be used on a `string` field. --)
    * 

@@ -421,7 +416,7 @@ public double getHeightFeet() {
    */
   @java.lang.Override
   public boolean hasNickname() {
-    return ((bitField0_ & 0x00000010) != 0);
+    return ((bitField0_ & 0x00000004) != 0);
   }
 
   /**
@@ -429,7 +424,6 @@ public boolean hasNickname() {
    *
    * 
    * The nickname of the user.
-   *
    * (-- aip.dev/not-precedent: An empty string is a valid nickname.
    *     Ordinarily, proto3_optional should not be used on a `string` field. --)
    * 

@@ -456,7 +450,6 @@ public java.lang.String getNickname() {
    *
    * 
    * The nickname of the user.
-   *
    * (-- aip.dev/not-precedent: An empty string is a valid nickname.
    *     Ordinarily, proto3_optional should not be used on a `string` field. --)
    * 

@@ -479,14 +472,13 @@ public com.google.protobuf.ByteString getNicknameBytes() {
   }
 
   public static final int ENABLE_NOTIFICATIONS_FIELD_NUMBER = 9;
-  private boolean enableNotifications_ = false;
+  private boolean enableNotifications_;
 
   /**
    *
    *
    * 
    * Enables the receiving of notifications. The default is true if unset.
-   *
    * (-- aip.dev/not-precedent: The default for the feature is true.
    *     Ordinarily, the default for a `bool` field should be false. --)
    * 

@@ -497,7 +489,7 @@ public com.google.protobuf.ByteString getNicknameBytes() {
    */
   @java.lang.Override
   public boolean hasEnableNotifications() {
-    return ((bitField0_ & 0x00000020) != 0);
+    return ((bitField0_ & 0x00000008) != 0);
   }
 
   /**
@@ -505,7 +497,6 @@ public boolean hasEnableNotifications() {
    *
    * 
    * Enables the receiving of notifications. The default is true if unset.
-   *
    * (-- aip.dev/not-precedent: The default for the feature is true.
    *     Ordinarily, the default for a `bool` field should be false. --)
    * 

@@ -542,22 +533,22 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(email_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, email_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       output.writeMessage(4, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateTime_ != null) {
       output.writeMessage(5, getUpdateTime());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeInt32(6, age_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeDouble(7, heightFeet_);
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, nickname_);
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       output.writeBool(9, enableNotifications_);
     }
     getUnknownFields().writeTo(output);
@@ -578,22 +569,22 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(email_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, email_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (createTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getCreateTime());
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (updateTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getUpdateTime());
     }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(6, age_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeDoubleSize(7, heightFeet_);
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, nickname_);
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(9, enableNotifications_);
     }
     size += getUnknownFields().getSerializedSize();
@@ -812,43 +803,41 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.User.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getCreateTimeFieldBuilder();
-        getUpdateTimeFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       displayName_ = "";
+
       email_ = "";
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
       age_ = 0;
+      bitField0_ = (bitField0_ & ~0x00000001);
       heightFeet_ = 0D;
+      bitField0_ = (bitField0_ & ~0x00000002);
       nickname_ = "";
+      bitField0_ = (bitField0_ & ~0x00000004);
       enableNotifications_ = false;
+      bitField0_ = (bitField0_ & ~0x00000008);
       return this;
     }
 
@@ -875,50 +864,40 @@ public com.google.showcase.v1beta1.User build() {
     @java.lang.Override
     public com.google.showcase.v1beta1.User buildPartial() {
       com.google.showcase.v1beta1.User result = new com.google.showcase.v1beta1.User(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.User result) {
       int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.displayName_ = displayName_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.email_ = email_;
-      }
       int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
-        to_bitField0_ |= 0x00000001;
+      result.name_ = name_;
+      result.displayName_ = displayName_;
+      result.email_ = email_;
+      if (createTimeBuilder_ == null) {
+        result.createTime_ = createTime_;
+      } else {
+        result.createTime_ = createTimeBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
-        to_bitField0_ |= 0x00000002;
+      if (updateTimeBuilder_ == null) {
+        result.updateTime_ = updateTime_;
+      } else {
+        result.updateTime_ = updateTimeBuilder_.build();
       }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
+      if (((from_bitField0_ & 0x00000001) != 0)) {
         result.age_ = age_;
-        to_bitField0_ |= 0x00000004;
+        to_bitField0_ |= 0x00000001;
       }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
+      if (((from_bitField0_ & 0x00000002) != 0)) {
         result.heightFeet_ = heightFeet_;
-        to_bitField0_ |= 0x00000008;
+        to_bitField0_ |= 0x00000002;
       }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.nickname_ = nickname_;
-        to_bitField0_ |= 0x00000010;
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        to_bitField0_ |= 0x00000004;
       }
-      if (((from_bitField0_ & 0x00000100) != 0)) {
+      result.nickname_ = nickname_;
+      if (((from_bitField0_ & 0x00000008) != 0)) {
         result.enableNotifications_ = enableNotifications_;
-        to_bitField0_ |= 0x00000020;
+        to_bitField0_ |= 0x00000008;
       }
-      result.bitField0_ |= to_bitField0_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -968,17 +947,14 @@ public Builder mergeFrom(com.google.showcase.v1beta1.User other) {
       if (other == com.google.showcase.v1beta1.User.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (!other.getDisplayName().isEmpty()) {
         displayName_ = other.displayName_;
-        bitField0_ |= 0x00000002;
         onChanged();
       }
       if (!other.getEmail().isEmpty()) {
         email_ = other.email_;
-        bitField0_ |= 0x00000004;
         onChanged();
       }
       if (other.hasCreateTime()) {
@@ -994,8 +970,8 @@ public Builder mergeFrom(com.google.showcase.v1beta1.User other) {
         setHeightFeet(other.getHeightFeet());
       }
       if (other.hasNickname()) {
+        bitField0_ |= 0x00000004;
         nickname_ = other.nickname_;
-        bitField0_ |= 0x00000080;
         onChanged();
       }
       if (other.hasEnableNotifications()) {
@@ -1030,55 +1006,55 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 displayName_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
               {
                 email_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
+
                 break;
               } // case 26
             case 34:
               {
                 input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000008;
+
                 break;
               } // case 34
             case 42:
               {
                 input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000010;
+
                 break;
               } // case 42
             case 48:
               {
                 age_ = input.readInt32();
-                bitField0_ |= 0x00000020;
+                bitField0_ |= 0x00000001;
                 break;
               } // case 48
             case 57:
               {
                 heightFeet_ = input.readDouble();
-                bitField0_ |= 0x00000040;
+                bitField0_ |= 0x00000002;
                 break;
               } // case 57
             case 66:
               {
                 nickname_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000080;
+                bitField0_ |= 0x00000004;
                 break;
               } // case 66
             case 72:
               {
                 enableNotifications_ = input.readBool();
-                bitField0_ |= 0x00000100;
+                bitField0_ |= 0x00000008;
                 break;
               } // case 72
             default:
@@ -1164,8 +1140,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1182,8 +1158,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -1205,8 +1181,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -1275,8 +1251,8 @@ public Builder setDisplayName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       displayName_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1293,8 +1269,8 @@ public Builder setDisplayName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearDisplayName() {
+
       displayName_ = getDefaultInstance().getDisplayName();
-      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -1316,8 +1292,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       displayName_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -1386,8 +1362,8 @@ public Builder setEmail(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       email_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1404,8 +1380,8 @@ public Builder setEmail(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearEmail() {
+
       email_ = getDefaultInstance().getEmail();
-      bitField0_ = (bitField0_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -1427,8 +1403,8 @@ public Builder setEmailBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       email_ = value;
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -1454,7 +1430,7 @@ public Builder setEmailBytes(com.google.protobuf.ByteString value) {
      * @return Whether the createTime field is set.
      */
     public boolean hasCreateTime() {
-      return ((bitField0_ & 0x00000008) != 0);
+      return createTimeBuilder_ != null || createTime_ != null;
     }
 
     /**
@@ -1497,11 +1473,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         createTime_ = value;
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -1519,11 +1495,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
     public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (createTimeBuilder_ == null) {
         createTime_ = builderForValue.build();
+        onChanged();
       } else {
         createTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000008;
-      onChanged();
+
       return this;
     }
 
@@ -1540,20 +1516,17 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
       if (createTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) != 0)
-            && createTime_ != null
-            && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getCreateTimeBuilder().mergeFrom(value);
+        if (createTime_ != null) {
+          createTime_ =
+              com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
         } else {
           createTime_ = value;
         }
+        onChanged();
       } else {
         createTimeBuilder_.mergeFrom(value);
       }
-      if (createTime_ != null) {
-        bitField0_ |= 0x00000008;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1569,13 +1542,14 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearCreateTime() {
-      bitField0_ = (bitField0_ & ~0x00000008);
-      createTime_ = null;
-      if (createTimeBuilder_ != null) {
-        createTimeBuilder_.dispose();
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+        onChanged();
+      } else {
+        createTime_ = null;
         createTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1591,7 +1565,7 @@ public Builder clearCreateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-      bitField0_ |= 0x00000008;
+
       onChanged();
       return getCreateTimeFieldBuilder().getBuilder();
     }
@@ -1666,7 +1640,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      * @return Whether the updateTime field is set.
      */
     public boolean hasUpdateTime() {
-      return ((bitField0_ & 0x00000010) != 0);
+      return updateTimeBuilder_ != null || updateTime_ != null;
     }
 
     /**
@@ -1709,11 +1683,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         updateTime_ = value;
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -1731,11 +1705,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
     public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (updateTimeBuilder_ == null) {
         updateTime_ = builderForValue.build();
+        onChanged();
       } else {
         updateTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000010;
-      onChanged();
+
       return this;
     }
 
@@ -1752,20 +1726,17 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
      */
     public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
       if (updateTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000010) != 0)
-            && updateTime_ != null
-            && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getUpdateTimeBuilder().mergeFrom(value);
+        if (updateTime_ != null) {
+          updateTime_ =
+              com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
         } else {
           updateTime_ = value;
         }
+        onChanged();
       } else {
         updateTimeBuilder_.mergeFrom(value);
       }
-      if (updateTime_ != null) {
-        bitField0_ |= 0x00000010;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -1781,13 +1752,14 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
      * 
      */
     public Builder clearUpdateTime() {
-      bitField0_ = (bitField0_ & ~0x00000010);
-      updateTime_ = null;
-      if (updateTimeBuilder_ != null) {
-        updateTimeBuilder_.dispose();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+        onChanged();
+      } else {
+        updateTime_ = null;
         updateTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -1803,7 +1775,7 @@ public Builder clearUpdateTime() {
      * 
      */
     public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-      bitField0_ |= 0x00000010;
+
       onChanged();
       return getUpdateTimeFieldBuilder().getBuilder();
     }
@@ -1872,7 +1844,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
      */
     @java.lang.Override
     public boolean hasAge() {
-      return ((bitField0_ & 0x00000020) != 0);
+      return ((bitField0_ & 0x00000001) != 0);
     }
 
     /**
@@ -1904,9 +1876,8 @@ public int getAge() {
      * @return This builder for chaining.
      */
     public Builder setAge(int value) {
-
+      bitField0_ |= 0x00000001;
       age_ = value;
-      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -1923,7 +1894,7 @@ public Builder setAge(int value) {
      * @return This builder for chaining.
      */
     public Builder clearAge() {
-      bitField0_ = (bitField0_ & ~0x00000020);
+      bitField0_ = (bitField0_ & ~0x00000001);
       age_ = 0;
       onChanged();
       return this;
@@ -1944,7 +1915,7 @@ public Builder clearAge() {
      */
     @java.lang.Override
     public boolean hasHeightFeet() {
-      return ((bitField0_ & 0x00000040) != 0);
+      return ((bitField0_ & 0x00000002) != 0);
     }
 
     /**
@@ -1976,9 +1947,8 @@ public double getHeightFeet() {
      * @return This builder for chaining.
      */
     public Builder setHeightFeet(double value) {
-
+      bitField0_ |= 0x00000002;
       heightFeet_ = value;
-      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -1995,7 +1965,7 @@ public Builder setHeightFeet(double value) {
      * @return This builder for chaining.
      */
     public Builder clearHeightFeet() {
-      bitField0_ = (bitField0_ & ~0x00000040);
+      bitField0_ = (bitField0_ & ~0x00000002);
       heightFeet_ = 0D;
       onChanged();
       return this;
@@ -2008,7 +1978,6 @@ public Builder clearHeightFeet() {
      *
      * 
      * The nickname of the user.
-     *
      * (-- aip.dev/not-precedent: An empty string is a valid nickname.
      *     Ordinarily, proto3_optional should not be used on a `string` field. --)
      * 

@@ -2018,7 +1987,7 @@ public Builder clearHeightFeet() {
      * @return Whether the nickname field is set.
      */
     public boolean hasNickname() {
-      return ((bitField0_ & 0x00000080) != 0);
+      return ((bitField0_ & 0x00000004) != 0);
     }
 
     /**
@@ -2026,7 +1995,6 @@ public boolean hasNickname() {
      *
      * 
      * The nickname of the user.
-     *
      * (-- aip.dev/not-precedent: An empty string is a valid nickname.
      *     Ordinarily, proto3_optional should not be used on a `string` field. --)
      * 

@@ -2052,7 +2020,6 @@ public java.lang.String getNickname() {
      *
      * 
      * The nickname of the user.
-     *
      * (-- aip.dev/not-precedent: An empty string is a valid nickname.
      *     Ordinarily, proto3_optional should not be used on a `string` field. --)
      * 

@@ -2078,7 +2045,6 @@ public com.google.protobuf.ByteString getNicknameBytes() {
      *
      * 
      * The nickname of the user.
-     *
      * (-- aip.dev/not-precedent: An empty string is a valid nickname.
      *     Ordinarily, proto3_optional should not be used on a `string` field. --)
      * 

@@ -2092,8 +2058,8 @@ public Builder setNickname(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+      bitField0_ |= 0x00000004;
       nickname_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2103,7 +2069,6 @@ public Builder setNickname(java.lang.String value) {
      *
      * 
      * The nickname of the user.
-     *
      * (-- aip.dev/not-precedent: An empty string is a valid nickname.
      *     Ordinarily, proto3_optional should not be used on a `string` field. --)
      * 

@@ -2113,8 +2078,8 @@ public Builder setNickname(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearNickname() {
+      bitField0_ = (bitField0_ & ~0x00000004);
       nickname_ = getDefaultInstance().getNickname();
-      bitField0_ = (bitField0_ & ~0x00000080);
       onChanged();
       return this;
     }
@@ -2124,7 +2089,6 @@ public Builder clearNickname() {
      *
      * 
      * The nickname of the user.
-     *
      * (-- aip.dev/not-precedent: An empty string is a valid nickname.
      *     Ordinarily, proto3_optional should not be used on a `string` field. --)
      * 

@@ -2139,8 +2103,8 @@ public Builder setNicknameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+      bitField0_ |= 0x00000004;
       nickname_ = value;
-      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -2152,7 +2116,6 @@ public Builder setNicknameBytes(com.google.protobuf.ByteString value) {
      *
      * 
      * Enables the receiving of notifications. The default is true if unset.
-     *
      * (-- aip.dev/not-precedent: The default for the feature is true.
      *     Ordinarily, the default for a `bool` field should be false. --)
      * 

@@ -2163,7 +2126,7 @@ public Builder setNicknameBytes(com.google.protobuf.ByteString value) {
      */
     @java.lang.Override
     public boolean hasEnableNotifications() {
-      return ((bitField0_ & 0x00000100) != 0);
+      return ((bitField0_ & 0x00000008) != 0);
     }
 
     /**
@@ -2171,7 +2134,6 @@ public boolean hasEnableNotifications() {
      *
      * 
      * Enables the receiving of notifications. The default is true if unset.
-     *
      * (-- aip.dev/not-precedent: The default for the feature is true.
      *     Ordinarily, the default for a `bool` field should be false. --)
      * 

@@ -2190,7 +2152,6 @@ public boolean getEnableNotifications() {
      *
      * 
      * Enables the receiving of notifications. The default is true if unset.
-     *
      * (-- aip.dev/not-precedent: The default for the feature is true.
      *     Ordinarily, the default for a `bool` field should be false. --)
      * 

@@ -2201,9 +2162,8 @@ public boolean getEnableNotifications() {
      * @return This builder for chaining.
      */
     public Builder setEnableNotifications(boolean value) {
-
+      bitField0_ |= 0x00000008;
       enableNotifications_ = value;
-      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -2213,7 +2173,6 @@ public Builder setEnableNotifications(boolean value) {
      *
      * 
      * Enables the receiving of notifications. The default is true if unset.
-     *
      * (-- aip.dev/not-precedent: The default for the feature is true.
      *     Ordinarily, the default for a `bool` field should be false. --)
      * 

@@ -2223,7 +2182,7 @@ public Builder setEnableNotifications(boolean value) {
      * @return This builder for chaining.
      */
     public Builder clearEnableNotifications() {
-      bitField0_ = (bitField0_ & ~0x00000100);
+      bitField0_ = (bitField0_ & ~0x00000008);
       enableNotifications_ = false;
       onChanged();
       return this;
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UserOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UserOrBuilder.java
index bd49258e71..b3efd40700 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UserOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UserOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/identity.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface UserOrBuilder
@@ -239,7 +238,6 @@ public interface UserOrBuilder
    *
    * 
    * The nickname of the user.
-   *
    * (-- aip.dev/not-precedent: An empty string is a valid nickname.
    *     Ordinarily, proto3_optional should not be used on a `string` field. --)
    * 

@@ -255,7 +253,6 @@ public interface UserOrBuilder
    *
    * 
    * The nickname of the user.
-   *
    * (-- aip.dev/not-precedent: An empty string is a valid nickname.
    *     Ordinarily, proto3_optional should not be used on a `string` field. --)
    * 

@@ -271,7 +268,6 @@ public interface UserOrBuilder
    *
    * 
    * The nickname of the user.
-   *
    * (-- aip.dev/not-precedent: An empty string is a valid nickname.
    *     Ordinarily, proto3_optional should not be used on a `string` field. --)
    * 

@@ -287,7 +283,6 @@ public interface UserOrBuilder
    *
    * 
    * Enables the receiving of notifications. The default is true if unset.
-   *
    * (-- aip.dev/not-precedent: The default for the feature is true.
    *     Ordinarily, the default for a `bool` field should be false. --)
    * 

@@ -303,7 +298,6 @@ public interface UserOrBuilder
    *
    * 
    * Enables the receiving of notifications. The default is true if unset.
-   *
    * (-- aip.dev/not-precedent: The default for the feature is true.
    *     Ordinarily, the default for a `bool` field should be false. --)
    * 

diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestRequest.java
index 6b0013da9f..a1939159e4 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.VerifyTestRequest} */
@@ -34,7 +33,7 @@ private VerifyTestRequest(com.google.protobuf.GeneratedMessageV3.Builder buil
   private VerifyTestRequest() {
     name_ = "";
     answer_ = com.google.protobuf.ByteString.EMPTY;
-    answers_ = emptyList(com.google.protobuf.ByteString.class);
+    answers_ = java.util.Collections.emptyList();
   }
 
   @java.lang.Override
@@ -43,6 +42,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new VerifyTestRequest();
   }
 
+  @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.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_VerifyTestRequest_descriptor;
@@ -59,9 +63,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object name_ = "";
+  private volatile java.lang.Object name_;
 
   /**
    *
@@ -112,7 +114,7 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   public static final int ANSWER_FIELD_NUMBER = 2;
-  private com.google.protobuf.ByteString answer_ = com.google.protobuf.ByteString.EMPTY;
+  private com.google.protobuf.ByteString answer_;
 
   /**
    *
@@ -131,10 +133,7 @@ public com.google.protobuf.ByteString getAnswer() {
   }
 
   public static final int ANSWERS_FIELD_NUMBER = 3;
-
-  @SuppressWarnings("serial")
-  private com.google.protobuf.Internal.ProtobufList answers_ =
-      emptyList(com.google.protobuf.ByteString.class);
+  private java.util.List answers_;
 
   /**
    *
@@ -398,10 +397,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       name_ = "";
+
       answer_ = com.google.protobuf.ByteString.EMPTY;
-      answers_ = emptyList(com.google.protobuf.ByteString.class);
+
+      answers_ = java.util.Collections.emptyList();
+      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -429,27 +430,18 @@ public com.google.showcase.v1beta1.VerifyTestRequest build() {
     public com.google.showcase.v1beta1.VerifyTestRequest buildPartial() {
       com.google.showcase.v1beta1.VerifyTestRequest result =
           new com.google.showcase.v1beta1.VerifyTestRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      int from_bitField0_ = bitField0_;
+      result.name_ = name_;
+      result.answer_ = answer_;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        answers_ = java.util.Collections.unmodifiableList(answers_);
+        bitField0_ = (bitField0_ & ~0x00000001);
       }
+      result.answers_ = answers_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.VerifyTestRequest result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.name_ = name_;
-      }
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.answer_ = answer_;
-      }
-      if (((from_bitField0_ & 0x00000004) != 0)) {
-        answers_.makeImmutable();
-        result.answers_ = answers_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -497,7 +489,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.VerifyTestRequest other) {
       if (other == com.google.showcase.v1beta1.VerifyTestRequest.getDefaultInstance()) return this;
       if (!other.getName().isEmpty()) {
         name_ = other.name_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.getAnswer() != com.google.protobuf.ByteString.EMPTY) {
@@ -506,8 +497,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.VerifyTestRequest other) {
       if (!other.answers_.isEmpty()) {
         if (answers_.isEmpty()) {
           answers_ = other.answers_;
-          answers_.makeImmutable();
-          bitField0_ |= 0x00000004;
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           ensureAnswersIsMutable();
           answers_.addAll(other.answers_);
@@ -543,13 +533,13 @@ public Builder mergeFrom(
             case 10:
               {
                 name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             case 18:
               {
                 answer_ = input.readBytes();
-                bitField0_ |= 0x00000002;
+
                 break;
               } // case 18
             case 26:
@@ -642,8 +632,8 @@ public Builder setName(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -660,8 +650,8 @@ public Builder setName(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearName() {
+
       name_ = getDefaultInstance().getName();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -683,8 +673,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       name_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -723,8 +713,8 @@ public Builder setAnswer(com.google.protobuf.ByteString value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       answer_ = value;
-      bitField0_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -741,20 +731,20 @@ public Builder setAnswer(com.google.protobuf.ByteString value) {
      * @return This builder for chaining.
      */
     public Builder clearAnswer() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+
       answer_ = getDefaultInstance().getAnswer();
       onChanged();
       return this;
     }
 
-    private com.google.protobuf.Internal.ProtobufList answers_ =
-        emptyList(com.google.protobuf.ByteString.class);
+    private java.util.List answers_ =
+        java.util.Collections.emptyList();
 
     private void ensureAnswersIsMutable() {
-      if (!answers_.isModifiable()) {
-        answers_ = makeMutableCopy(answers_);
+      if (!((bitField0_ & 0x00000001) != 0)) {
+        answers_ = new java.util.ArrayList(answers_);
+        bitField0_ |= 0x00000001;
       }
-      bitField0_ |= 0x00000004;
     }
 
     /**
@@ -769,8 +759,9 @@ private void ensureAnswersIsMutable() {
      * @return A list containing the answers.
      */
     public java.util.List getAnswersList() {
-      answers_.makeImmutable();
-      return answers_;
+      return ((bitField0_ & 0x00000001) != 0)
+          ? java.util.Collections.unmodifiableList(answers_)
+          : answers_;
     }
 
     /**
@@ -823,7 +814,6 @@ public Builder setAnswers(int index, com.google.protobuf.ByteString value) {
       }
       ensureAnswersIsMutable();
       answers_.set(index, value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -846,7 +836,6 @@ public Builder addAnswers(com.google.protobuf.ByteString value) {
       }
       ensureAnswersIsMutable();
       answers_.add(value);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -867,7 +856,6 @@ public Builder addAllAnswers(
         java.lang.Iterable values) {
       ensureAnswersIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(values, answers_);
-      bitField0_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -884,8 +872,8 @@ public Builder addAllAnswers(
      * @return This builder for chaining.
      */
     public Builder clearAnswers() {
-      answers_ = emptyList(com.google.protobuf.ByteString.class);
-      bitField0_ = (bitField0_ & ~0x00000004);
+      answers_ = java.util.Collections.emptyList();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestRequestOrBuilder.java
index f9746d2647..12a4c76ca0 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface VerifyTestRequestOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestResponse.java
index e6107907d9..69d2a8681d 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /** Protobuf type {@code google.showcase.v1beta1.VerifyTestResponse} */
@@ -39,6 +38,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new VerifyTestResponse();
   }
 
+  @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.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_VerifyTestResponse_descriptor;
@@ -54,7 +58,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.VerifyTestResponse.Builder.class);
   }
 
-  private int bitField0_;
   public static final int ISSUE_FIELD_NUMBER = 1;
   private com.google.showcase.v1beta1.Issue issue_;
 
@@ -71,7 +74,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasIssue() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return issue_ != null;
   }
 
   /**
@@ -101,7 +104,7 @@ public com.google.showcase.v1beta1.Issue getIssue() {
    */
   @java.lang.Override
   public com.google.showcase.v1beta1.IssueOrBuilder getIssueOrBuilder() {
-    return issue_ == null ? com.google.showcase.v1beta1.Issue.getDefaultInstance() : issue_;
+    return getIssue();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -118,7 +121,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (issue_ != null) {
       output.writeMessage(1, getIssue());
     }
     getUnknownFields().writeTo(output);
@@ -130,7 +133,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (issue_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getIssue());
     }
     size += getUnknownFields().getSerializedSize();
@@ -290,28 +293,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.VerifyTestResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getIssueFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      issue_ = null;
-      if (issueBuilder_ != null) {
-        issueBuilder_.dispose();
+      if (issueBuilder_ == null) {
+        issue_ = null;
+      } else {
+        issue_ = null;
         issueBuilder_ = null;
       }
       return this;
@@ -341,23 +335,15 @@ public com.google.showcase.v1beta1.VerifyTestResponse build() {
     public com.google.showcase.v1beta1.VerifyTestResponse buildPartial() {
       com.google.showcase.v1beta1.VerifyTestResponse result =
           new com.google.showcase.v1beta1.VerifyTestResponse(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (issueBuilder_ == null) {
+        result.issue_ = issue_;
+      } else {
+        result.issue_ = issueBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.VerifyTestResponse result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.issue_ = issueBuilder_ == null ? issue_ : issueBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -435,7 +421,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getIssueFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -455,8 +441,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.showcase.v1beta1.Issue issue_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.showcase.v1beta1.Issue,
@@ -476,7 +460,7 @@ public Builder mergeFrom(
      * @return Whether the issue field is set.
      */
     public boolean hasIssue() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return issueBuilder_ != null || issue_ != null;
     }
 
     /**
@@ -513,11 +497,11 @@ public Builder setIssue(com.google.showcase.v1beta1.Issue value) {
           throw new NullPointerException();
         }
         issue_ = value;
+        onChanged();
       } else {
         issueBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -533,11 +517,11 @@ public Builder setIssue(com.google.showcase.v1beta1.Issue value) {
     public Builder setIssue(com.google.showcase.v1beta1.Issue.Builder builderForValue) {
       if (issueBuilder_ == null) {
         issue_ = builderForValue.build();
+        onChanged();
       } else {
         issueBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -552,20 +536,17 @@ public Builder setIssue(com.google.showcase.v1beta1.Issue.Builder builderForValu
      */
     public Builder mergeIssue(com.google.showcase.v1beta1.Issue value) {
       if (issueBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && issue_ != null
-            && issue_ != com.google.showcase.v1beta1.Issue.getDefaultInstance()) {
-          getIssueBuilder().mergeFrom(value);
+        if (issue_ != null) {
+          issue_ =
+              com.google.showcase.v1beta1.Issue.newBuilder(issue_).mergeFrom(value).buildPartial();
         } else {
           issue_ = value;
         }
+        onChanged();
       } else {
         issueBuilder_.mergeFrom(value);
       }
-      if (issue_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -579,13 +560,14 @@ public Builder mergeIssue(com.google.showcase.v1beta1.Issue value) {
      * .google.showcase.v1beta1.Issue issue = 1;
      */
     public Builder clearIssue() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      issue_ = null;
-      if (issueBuilder_ != null) {
-        issueBuilder_.dispose();
+      if (issueBuilder_ == null) {
+        issue_ = null;
+        onChanged();
+      } else {
+        issue_ = null;
         issueBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -599,7 +581,7 @@ public Builder clearIssue() {
      * .google.showcase.v1beta1.Issue issue = 1;
      */
     public com.google.showcase.v1beta1.Issue.Builder getIssueBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getIssueFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestResponseOrBuilder.java
index 8edce42f1e..669a7abcbd 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/testing.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface VerifyTestResponseOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitMetadata.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitMetadata.java
index 8332ec8cf9..d201043452 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitMetadata.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitMetadata.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -47,6 +46,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new WaitMetadata();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_WaitMetadata_descriptor;
@@ -62,7 +66,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             com.google.showcase.v1beta1.WaitMetadata.Builder.class);
   }
 
-  private int bitField0_;
   public static final int END_TIME_FIELD_NUMBER = 1;
   private com.google.protobuf.Timestamp endTime_;
 
@@ -79,7 +82,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    */
   @java.lang.Override
   public boolean hasEndTime() {
-    return ((bitField0_ & 0x00000001) != 0);
+    return endTime_ != null;
   }
 
   /**
@@ -109,7 +112,7 @@ public com.google.protobuf.Timestamp getEndTime() {
    */
   @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
-    return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_;
+    return getEndTime();
   }
 
   private byte memoizedIsInitialized = -1;
@@ -126,7 +129,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (endTime_ != null) {
       output.writeMessage(1, getEndTime());
     }
     getUnknownFields().writeTo(output);
@@ -138,7 +141,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) != 0)) {
+    if (endTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getEndTime());
     }
     size += getUnknownFields().getSerializedSize();
@@ -305,28 +308,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.WaitMetadata.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
+    private Builder() {}
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
-        getEndTimeFieldBuilder();
-      }
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
-      endTime_ = null;
-      if (endTimeBuilder_ != null) {
-        endTimeBuilder_.dispose();
+      if (endTimeBuilder_ == null) {
+        endTime_ = null;
+      } else {
+        endTime_ = null;
         endTimeBuilder_ = null;
       }
       return this;
@@ -356,23 +350,15 @@ public com.google.showcase.v1beta1.WaitMetadata build() {
     public com.google.showcase.v1beta1.WaitMetadata buildPartial() {
       com.google.showcase.v1beta1.WaitMetadata result =
           new com.google.showcase.v1beta1.WaitMetadata(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
+      if (endTimeBuilder_ == null) {
+        result.endTime_ = endTime_;
+      } else {
+        result.endTime_ = endTimeBuilder_.build();
       }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.WaitMetadata result) {
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build();
-        to_bitField0_ |= 0x00000001;
-      }
-      result.bitField0_ |= to_bitField0_;
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -450,7 +436,7 @@ public Builder mergeFrom(
             case 10:
               {
                 input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -470,8 +456,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.protobuf.Timestamp endTime_;
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.protobuf.Timestamp,
@@ -491,7 +475,7 @@ public Builder mergeFrom(
      * @return Whether the endTime field is set.
      */
     public boolean hasEndTime() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return endTimeBuilder_ != null || endTime_ != null;
     }
 
     /**
@@ -528,11 +512,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
           throw new NullPointerException();
         }
         endTime_ = value;
+        onChanged();
       } else {
         endTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -548,11 +532,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
     public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) {
       if (endTimeBuilder_ == null) {
         endTime_ = builderForValue.build();
+        onChanged();
       } else {
         endTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000001;
-      onChanged();
+
       return this;
     }
 
@@ -567,20 +551,17 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue)
      */
     public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
       if (endTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) != 0)
-            && endTime_ != null
-            && endTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          getEndTimeBuilder().mergeFrom(value);
+        if (endTime_ != null) {
+          endTime_ =
+              com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial();
         } else {
           endTime_ = value;
         }
+        onChanged();
       } else {
         endTimeBuilder_.mergeFrom(value);
       }
-      if (endTime_ != null) {
-        bitField0_ |= 0x00000001;
-        onChanged();
-      }
+
       return this;
     }
 
@@ -594,13 +575,14 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
      * .google.protobuf.Timestamp end_time = 1;
      */
     public Builder clearEndTime() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      endTime_ = null;
-      if (endTimeBuilder_ != null) {
-        endTimeBuilder_.dispose();
+      if (endTimeBuilder_ == null) {
+        endTime_ = null;
+        onChanged();
+      } else {
+        endTime_ = null;
         endTimeBuilder_ = null;
       }
-      onChanged();
+
       return this;
     }
 
@@ -614,7 +596,7 @@ public Builder clearEndTime() {
      * .google.protobuf.Timestamp end_time = 1;
      */
     public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() {
-      bitField0_ |= 0x00000001;
+
       onChanged();
       return getEndTimeFieldBuilder().getBuilder();
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitMetadataOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitMetadataOrBuilder.java
index 8540677867..7c4cbb844c 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitMetadataOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitMetadataOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface WaitMetadataOrBuilder
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitRequest.java
index 440382bff3..4e8466a056 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitRequest.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -47,6 +46,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new WaitRequest();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_WaitRequest_descriptor;
@@ -63,8 +67,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   private int endCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object end_;
 
   public enum EndCase
@@ -113,8 +115,6 @@ public EndCase getEndCase() {
   }
 
   private int responseCase_ = 0;
-
-  @SuppressWarnings("serial")
   private java.lang.Object response_;
 
   public enum ResponseCase
@@ -647,7 +647,6 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       if (endTimeBuilder_ != null) {
         endTimeBuilder_.clear();
       }
@@ -691,35 +690,38 @@ public com.google.showcase.v1beta1.WaitRequest build() {
     public com.google.showcase.v1beta1.WaitRequest buildPartial() {
       com.google.showcase.v1beta1.WaitRequest result =
           new com.google.showcase.v1beta1.WaitRequest(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
-      buildPartialOneofs(result);
-      onBuilt();
-      return result;
-    }
-
-    private void buildPartial0(com.google.showcase.v1beta1.WaitRequest result) {
-      int from_bitField0_ = bitField0_;
-    }
-
-    private void buildPartialOneofs(com.google.showcase.v1beta1.WaitRequest result) {
-      result.endCase_ = endCase_;
-      result.end_ = this.end_;
-      if (endCase_ == 1 && endTimeBuilder_ != null) {
-        result.end_ = endTimeBuilder_.build();
+      if (endCase_ == 1) {
+        if (endTimeBuilder_ == null) {
+          result.end_ = end_;
+        } else {
+          result.end_ = endTimeBuilder_.build();
+        }
       }
-      if (endCase_ == 4 && ttlBuilder_ != null) {
-        result.end_ = ttlBuilder_.build();
+      if (endCase_ == 4) {
+        if (ttlBuilder_ == null) {
+          result.end_ = end_;
+        } else {
+          result.end_ = ttlBuilder_.build();
+        }
       }
-      result.responseCase_ = responseCase_;
-      result.response_ = this.response_;
-      if (responseCase_ == 2 && errorBuilder_ != null) {
-        result.response_ = errorBuilder_.build();
+      if (responseCase_ == 2) {
+        if (errorBuilder_ == null) {
+          result.response_ = response_;
+        } else {
+          result.response_ = errorBuilder_.build();
+        }
       }
-      if (responseCase_ == 3 && successBuilder_ != null) {
-        result.response_ = successBuilder_.build();
+      if (responseCase_ == 3) {
+        if (successBuilder_ == null) {
+          result.response_ = response_;
+        } else {
+          result.response_ = successBuilder_.build();
+        }
       }
+      result.endCase_ = endCase_;
+      result.responseCase_ = responseCase_;
+      onBuilt();
+      return result;
     }
 
     @java.lang.Override
@@ -894,8 +896,6 @@ public Builder clearResponse() {
       return this;
     }
 
-    private int bitField0_;
-
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.protobuf.Timestamp,
             com.google.protobuf.Timestamp.Builder,
@@ -1106,6 +1106,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
       }
       endCase_ = 1;
       onChanged();
+      ;
       return endTimeBuilder_;
     }
 
@@ -1319,6 +1320,7 @@ public com.google.protobuf.DurationOrBuilder getTtlOrBuilder() {
       }
       endCase_ = 4;
       onChanged();
+      ;
       return ttlBuilder_;
     }
 
@@ -1537,6 +1539,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
       }
       responseCase_ = 2;
       onChanged();
+      ;
       return errorBuilder_;
     }
 
@@ -1754,6 +1757,7 @@ public com.google.showcase.v1beta1.WaitResponseOrBuilder getSuccessOrBuilder() {
       }
       responseCase_ = 3;
       onChanged();
+      ;
       return successBuilder_;
     }
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitRequestOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitRequestOrBuilder.java
index 49092a708f..73e72c4ebb 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitRequestOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitRequestOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface WaitRequestOrBuilder
@@ -175,7 +174,7 @@ public interface WaitRequestOrBuilder
    */
   com.google.showcase.v1beta1.WaitResponseOrBuilder getSuccessOrBuilder();
 
-  com.google.showcase.v1beta1.WaitRequest.EndCase getEndCase();
+  public com.google.showcase.v1beta1.WaitRequest.EndCase getEndCase();
 
-  com.google.showcase.v1beta1.WaitRequest.ResponseCase getResponseCase();
+  public com.google.showcase.v1beta1.WaitRequest.ResponseCase getResponseCase();
 }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitResponse.java
index 17037550b6..c45d3e1c0f 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitResponse.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 /**
@@ -49,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new WaitResponse();
   }
 
+  @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.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_WaitResponse_descriptor;
@@ -65,9 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   }
 
   public static final int CONTENT_FIELD_NUMBER = 1;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object content_ = "";
+  private volatile java.lang.Object content_;
 
   /**
    *
@@ -314,8 +316,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      bitField0_ = 0;
       content_ = "";
+
       return this;
     }
 
@@ -343,20 +345,11 @@ public com.google.showcase.v1beta1.WaitResponse build() {
     public com.google.showcase.v1beta1.WaitResponse buildPartial() {
       com.google.showcase.v1beta1.WaitResponse result =
           new com.google.showcase.v1beta1.WaitResponse(this);
-      if (bitField0_ != 0) {
-        buildPartial0(result);
-      }
+      result.content_ = content_;
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(com.google.showcase.v1beta1.WaitResponse result) {
-      int from_bitField0_ = bitField0_;
-      if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.content_ = content_;
-      }
-    }
-
     @java.lang.Override
     public Builder clone() {
       return super.clone();
@@ -404,7 +397,6 @@ public Builder mergeFrom(com.google.showcase.v1beta1.WaitResponse other) {
       if (other == com.google.showcase.v1beta1.WaitResponse.getDefaultInstance()) return this;
       if (!other.getContent().isEmpty()) {
         content_ = other.content_;
-        bitField0_ |= 0x00000001;
         onChanged();
       }
       this.mergeUnknownFields(other.getUnknownFields());
@@ -436,7 +428,7 @@ public Builder mergeFrom(
             case 10:
               {
                 content_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
+
                 break;
               } // case 10
             default:
@@ -456,8 +448,6 @@ public Builder mergeFrom(
       return this;
     }
 
-    private int bitField0_;
-
     private java.lang.Object content_ = "";
 
     /**
@@ -522,8 +512,8 @@ public Builder setContent(java.lang.String value) {
       if (value == null) {
         throw new NullPointerException();
       }
+
       content_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -540,8 +530,8 @@ public Builder setContent(java.lang.String value) {
      * @return This builder for chaining.
      */
     public Builder clearContent() {
+
       content_ = getDefaultInstance().getContent();
-      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -563,8 +553,8 @@ public Builder setContentBytes(com.google.protobuf.ByteString value) {
         throw new NullPointerException();
       }
       checkByteStringIsUtf8(value);
+
       content_ = value;
-      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitResponseOrBuilder.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitResponseOrBuilder.java
index d2976affe2..afc03cac94 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitResponseOrBuilder.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitResponseOrBuilder.java
@@ -16,7 +16,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: schema/google/showcase/v1beta1/echo.proto
 
-// Protobuf Java Version: 3.25.8
 package com.google.showcase.v1beta1;
 
 public interface WaitResponseOrBuilder

From 599d5c3f03f157621fb13bca0c3ce44b7f242869 Mon Sep 17 00:00:00 2001
From: blakeli 
Date: Wed, 3 Dec 2025 14:53:59 -0500
Subject: [PATCH 4/9] chore: use 3.8.0

---
 .cloudbuild/library_generation/library_generation.Dockerfile    | 2 +-
 .../library_generation/library_generation_airlock.Dockerfile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cloudbuild/library_generation/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile
index 3690d39b63..1726aba869 100644
--- a/.cloudbuild/library_generation/library_generation.Dockerfile
+++ b/.cloudbuild/library_generation/library_generation.Dockerfile
@@ -37,7 +37,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_
 FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad316909c39813dee3ee9395204940500792b740 as final
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
-ARG PROTOC_VERSION=3.0.0
+ARG PROTOC_VERSION=3.8.0
 ARG GRPC_VERSION=1.76.1
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
diff --git a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
index ca2ad663e7..5c838edec2 100644
--- a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
+++ b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
@@ -38,7 +38,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_
 FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc139a0a640942491ec481ad8dda10f2c5b753f5c969393b12480155fe15a63 as final
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
-ARG PROTOC_VERSION=3.0.0
+ARG PROTOC_VERSION=3.8.0
 ARG GRPC_VERSION=1.76.1
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"

From f47226e99d48811d9234444ef12aa04068efefc9 Mon Sep 17 00:00:00 2001
From: blakeli 
Date: Wed, 3 Dec 2025 15:10:05 -0500
Subject: [PATCH 5/9] chore: use 3.15.0

---
 .cloudbuild/library_generation/library_generation.Dockerfile    | 2 +-
 .../library_generation/library_generation_airlock.Dockerfile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cloudbuild/library_generation/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile
index 1726aba869..5618be0d27 100644
--- a/.cloudbuild/library_generation/library_generation.Dockerfile
+++ b/.cloudbuild/library_generation/library_generation.Dockerfile
@@ -37,7 +37,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_
 FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad316909c39813dee3ee9395204940500792b740 as final
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
-ARG PROTOC_VERSION=3.8.0
+ARG PROTOC_VERSION=3.15.0
 ARG GRPC_VERSION=1.76.1
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
diff --git a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
index 5c838edec2..984d369fa9 100644
--- a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
+++ b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
@@ -38,7 +38,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_
 FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc139a0a640942491ec481ad8dda10f2c5b753f5c969393b12480155fe15a63 as final
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
-ARG PROTOC_VERSION=3.8.0
+ARG PROTOC_VERSION=3.15.0
 ARG GRPC_VERSION=1.76.1
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"

From fd080db13f662f79a0ac0f72fecebd06ad7208e5 Mon Sep 17 00:00:00 2001
From: blakeli 
Date: Thu, 4 Dec 2025 15:13:09 -0500
Subject: [PATCH 6/9] chore: Use 21.0

---
 .cloudbuild/library_generation/library_generation.Dockerfile    | 2 +-
 .../library_generation/library_generation_airlock.Dockerfile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cloudbuild/library_generation/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile
index 5618be0d27..93ef100236 100644
--- a/.cloudbuild/library_generation/library_generation.Dockerfile
+++ b/.cloudbuild/library_generation/library_generation.Dockerfile
@@ -37,7 +37,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_
 FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad316909c39813dee3ee9395204940500792b740 as final
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
-ARG PROTOC_VERSION=3.15.0
+ARG PROTOC_VERSION=21.0
 ARG GRPC_VERSION=1.76.1
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
diff --git a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
index 984d369fa9..93711ec7ed 100644
--- a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
+++ b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
@@ -38,7 +38,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_
 FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc139a0a640942491ec481ad8dda10f2c5b753f5c969393b12480155fe15a63 as final
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
-ARG PROTOC_VERSION=3.15.0
+ARG PROTOC_VERSION=21.0
 ARG GRPC_VERSION=1.76.1
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"

From 63647cdc07751616c6f80f4ef869dfeb0fd035f7 Mon Sep 17 00:00:00 2001
From: cloud-java-bot 
Date: Thu, 4 Dec 2025 20:21:30 +0000
Subject: [PATCH 7/9] chore: generate libraries at Thu Dec  4 20:19:29 UTC 2025

---
 .../src/main/java/com/google/api/Advice.java  |  112 +-
 .../java/com/google/api/AuthProvider.java     |  195 +-
 .../java/com/google/api/AuthRequirement.java  |  125 +-
 .../java/com/google/api/Authentication.java   |  160 +-
 .../com/google/api/AuthenticationRule.java    |  175 +-
 .../src/main/java/com/google/api/Backend.java |  129 +-
 .../main/java/com/google/api/BackendRule.java |  247 +--
 .../src/main/java/com/google/api/Billing.java |  267 +--
 .../com/google/api/ClientLibrarySettings.java |  304 ++--
 .../google/api/CommonLanguageSettings.java    |  183 +-
 .../java/com/google/api/ConfigChange.java     |  181 +-
 .../src/main/java/com/google/api/Context.java |  129 +-
 .../main/java/com/google/api/ContextRule.java |  193 +-
 .../src/main/java/com/google/api/Control.java |  143 +-
 .../main/java/com/google/api/CppSettings.java |  121 +-
 .../com/google/api/CustomHttpPattern.java     |  125 +-
 .../java/com/google/api/Distribution.java     | 1140 +++++++-----
 .../java/com/google/api/Documentation.java    |  210 ++-
 .../com/google/api/DocumentationRule.java     |  138 +-
 .../java/com/google/api/DotnetSettings.java   |  239 ++-
 .../main/java/com/google/api/Endpoint.java    |  157 +-
 .../main/java/com/google/api/FieldInfo.java   |  143 +-
 .../main/java/com/google/api/FieldPolicy.java |  138 +-
 .../main/java/com/google/api/GoSettings.java  |  150 +-
 .../src/main/java/com/google/api/Http.java    |  140 +-
 .../main/java/com/google/api/HttpBody.java    |  154 +-
 .../main/java/com/google/api/HttpRule.java    |  263 +--
 .../java/com/google/api/JavaSettings.java     |  164 +-
 .../main/java/com/google/api/JwtLocation.java |  154 +-
 .../java/com/google/api/LabelDescriptor.java  |  138 +-
 .../java/com/google/api/LogDescriptor.java    |  169 +-
 .../src/main/java/com/google/api/Logging.java |  299 ++--
 .../java/com/google/api/MethodPolicy.java     |  143 +-
 .../java/com/google/api/MethodSettings.java   |  331 ++--
 .../src/main/java/com/google/api/Metric.java  |  137 +-
 .../java/com/google/api/MetricDescriptor.java |  483 +++--
 .../main/java/com/google/api/MetricRule.java  |  139 +-
 .../com/google/api/MonitoredResource.java     |  137 +-
 .../api/MonitoredResourceDescriptor.java      |  195 +-
 .../google/api/MonitoredResourceMetadata.java |  147 +-
 .../main/java/com/google/api/Monitoring.java  |  302 ++--
 .../java/com/google/api/NodeSettings.java     |  121 +-
 .../com/google/api/OAuthRequirements.java     |  112 +-
 .../src/main/java/com/google/api/Page.java    |  155 +-
 .../main/java/com/google/api/PhpSettings.java |  121 +-
 .../com/google/api/ProjectProperties.java     |  130 +-
 .../main/java/com/google/api/Property.java    |  138 +-
 .../main/java/com/google/api/Publishing.java  |  285 +--
 .../java/com/google/api/PythonSettings.java   |  279 +--
 .../src/main/java/com/google/api/Quota.java   |  158 +-
 .../main/java/com/google/api/QuotaLimit.java  |  235 +--
 .../com/google/api/ResourceDescriptor.java    |  232 ++-
 .../com/google/api/ResourceReference.java     |  125 +-
 .../java/com/google/api/RoutingParameter.java |  125 +-
 .../main/java/com/google/api/RoutingRule.java |  130 +-
 .../java/com/google/api/RubySettings.java     |  121 +-
 .../google/api/SelectiveGapicGeneration.java  |  131 +-
 .../src/main/java/com/google/api/Service.java |  664 ++++---
 .../main/java/com/google/api/SourceInfo.java  |  130 +-
 .../java/com/google/api/SystemParameter.java  |  138 +-
 .../com/google/api/SystemParameterRule.java   |  143 +-
 .../java/com/google/api/SystemParameters.java |  132 +-
 .../java/com/google/api/TypeReference.java    |  112 +-
 .../src/main/java/com/google/api/Usage.java   |  162 +-
 .../main/java/com/google/api/UsageRule.java   |  134 +-
 .../main/java/com/google/api/Visibility.java  |  130 +-
 .../java/com/google/api/VisibilityRule.java   |  125 +-
 .../java/com/google/apps/card/v1/Action.java  |  340 ++--
 .../com/google/apps/card/v1/BorderStyle.java  |  143 +-
 .../java/com/google/apps/card/v1/Button.java  |  210 ++-
 .../com/google/apps/card/v1/ButtonList.java   |  130 +-
 .../java/com/google/apps/card/v1/Card.java    | 1073 ++++++-----
 .../com/google/apps/card/v1/Carousel.java     |  298 ++--
 .../java/com/google/apps/card/v1/Chip.java    |  188 +-
 .../com/google/apps/card/v1/ChipList.java     |  143 +-
 .../google/apps/card/v1/CollapseControl.java  |  154 +-
 .../java/com/google/apps/card/v1/Columns.java |  612 ++++---
 .../google/apps/card/v1/DateTimePicker.java   |  183 +-
 .../google/apps/card/v1/DecoratedText.java    |  539 +++---
 .../java/com/google/apps/card/v1/Divider.java |   99 +-
 .../java/com/google/apps/card/v1/Grid.java    |  373 ++--
 .../java/com/google/apps/card/v1/Icon.java    |  178 +-
 .../java/com/google/apps/card/v1/Image.java   |  146 +-
 .../google/apps/card/v1/ImageComponent.java   |  169 +-
 .../google/apps/card/v1/ImageCropStyle.java   |  123 +-
 .../com/google/apps/card/v1/MaterialIcon.java |  145 +-
 .../java/com/google/apps/card/v1/OnClick.java |  218 ++-
 .../com/google/apps/card/v1/OpenLink.java     |  138 +-
 .../com/google/apps/card/v1/OverflowMenu.java |  303 ++--
 .../google/apps/card/v1/SelectionInput.java   |  555 +++---
 .../com/google/apps/card/v1/Suggestions.java  |  250 +--
 .../com/google/apps/card/v1/TextInput.java    |  264 +--
 .../google/apps/card/v1/TextParagraph.java    |  136 +-
 .../com/google/apps/card/v1/Validation.java   |  123 +-
 .../java/com/google/apps/card/v1/Widget.java  |  402 +++--
 .../java/com/google/cloud/audit/AuditLog.java |  396 ++--
 .../cloud/audit/AuthenticationInfo.java       |  210 ++-
 .../google/cloud/audit/AuthorizationInfo.java |  172 +-
 .../cloud/audit/OrgPolicyViolationInfo.java   |  191 +-
 .../cloud/audit/PolicyViolationInfo.java      |  122 +-
 .../google/cloud/audit/RequestMetadata.java   |  184 +-
 .../google/cloud/audit/ResourceLocation.java  |  140 +-
 .../audit/ServiceAccountDelegationInfo.java   |  444 +++--
 .../com/google/cloud/audit/ViolationInfo.java |  151 +-
 .../cloud/location/GetLocationRequest.java    |  112 +-
 .../cloud/location/ListLocationsRequest.java  |  149 +-
 .../cloud/location/ListLocationsResponse.java |  145 +-
 .../com/google/cloud/location/Location.java   |  183 +-
 .../java/com/google/geo/type/Viewport.java    |  139 +-
 .../com/google/logging/type/HttpRequest.java  |  288 +--
 .../longrunning/CancelOperationRequest.java   |  112 +-
 .../longrunning/DeleteOperationRequest.java   |  112 +-
 .../longrunning/GetOperationRequest.java      |  112 +-
 .../longrunning/ListOperationsRequest.java    |  160 +-
 .../longrunning/ListOperationsResponse.java   |  163 +-
 .../com/google/longrunning/Operation.java     |  189 +-
 .../com/google/longrunning/OperationInfo.java |  125 +-
 .../longrunning/WaitOperationRequest.java     |  133 +-
 .../main/java/com/google/rpc/BadRequest.java  |  294 +--
 .../main/java/com/google/rpc/DebugInfo.java   |  133 +-
 .../main/java/com/google/rpc/ErrorInfo.java   |  152 +-
 .../src/main/java/com/google/rpc/Help.java    |  255 +--
 .../java/com/google/rpc/LocalizedMessage.java |  125 +-
 .../com/google/rpc/PreconditionFailure.java   |  272 +--
 .../java/com/google/rpc/QuotaFailure.java     |  350 ++--
 .../main/java/com/google/rpc/RequestInfo.java |  125 +-
 .../java/com/google/rpc/ResourceInfo.java     |  151 +-
 .../main/java/com/google/rpc/RetryInfo.java   |  120 +-
 .../src/main/java/com/google/rpc/Status.java  |  153 +-
 .../google/rpc/context/AttributeContext.java  | 1587 ++++++++++-------
 .../com/google/rpc/context/AuditContext.java  |  177 +-
 .../com/google/shopping/type/Channel.java     |   99 +-
 .../google/shopping/type/CustomAttribute.java |  158 +-
 .../com/google/shopping/type/Destination.java |   99 +-
 .../java/com/google/shopping/type/Price.java  |  125 +-
 .../shopping/type/ReportingContext.java       |   99 +-
 .../java/com/google/shopping/type/Weight.java |  125 +-
 .../src/main/java/com/google/type/Color.java  |  153 +-
 .../src/main/java/com/google/type/Date.java   |  132 +-
 .../main/java/com/google/type/DateTime.java   |  223 ++-
 .../main/java/com/google/type/Decimal.java    |  112 +-
 .../src/main/java/com/google/type/Expr.java   |  151 +-
 .../main/java/com/google/type/Fraction.java   |  121 +-
 .../main/java/com/google/type/Interval.java   |  141 +-
 .../src/main/java/com/google/type/LatLng.java |  121 +-
 .../java/com/google/type/LocalizedText.java   |  125 +-
 .../src/main/java/com/google/type/Money.java  |  134 +-
 .../java/com/google/type/PhoneNumber.java     |  277 +--
 .../java/com/google/type/PostalAddress.java   |  255 +--
 .../main/java/com/google/type/Quaternion.java |  143 +-
 .../main/java/com/google/type/TimeOfDay.java  |  143 +-
 .../main/java/com/google/type/TimeZone.java   |  125 +-
 .../java/com/google/iam/v1/AuditConfig.java   |  143 +-
 .../com/google/iam/v1/AuditConfigDelta.java   |  151 +-
 .../com/google/iam/v1/AuditLogConfig.java     |  133 +-
 .../main/java/com/google/iam/v1/Binding.java  |  153 +-
 .../java/com/google/iam/v1/BindingDelta.java  |  158 +-
 .../google/iam/v1/GetIamPolicyRequest.java    |  133 +-
 .../com/google/iam/v1/GetPolicyOptions.java   |  110 +-
 .../main/java/com/google/iam/v1/Policy.java   |  181 +-
 .../java/com/google/iam/v1/PolicyDelta.java   |  161 +-
 .../google/iam/v1/ResourcePolicyMember.java   |  125 +-
 .../google/iam/v1/SetIamPolicyRequest.java    |  153 +-
 .../iam/v1/TestIamPermissionsRequest.java     |  133 +-
 .../iam/v1/TestIamPermissionsResponse.java    |  120 +-
 .../com/google/iam/v1/logging/AuditData.java  |  120 +-
 .../google/iam/v2/CreatePolicyRequest.java    |  145 +-
 .../google/iam/v2/DeletePolicyRequest.java    |  125 +-
 .../main/java/com/google/iam/v2/DenyRule.java |  201 ++-
 .../com/google/iam/v2/GetPolicyRequest.java   |  112 +-
 .../google/iam/v2/ListPoliciesRequest.java    |  136 +-
 .../google/iam/v2/ListPoliciesResponse.java   |  143 +-
 .../main/java/com/google/iam/v2/Policy.java   |  297 +--
 .../iam/v2/PolicyOperationMetadata.java       |  120 +-
 .../java/com/google/iam/v2/PolicyRule.java    |  135 +-
 .../google/iam/v2/UpdatePolicyRequest.java    |  119 +-
 .../iam/v2beta/CreatePolicyRequest.java       |  145 +-
 .../iam/v2beta/DeletePolicyRequest.java       |  125 +-
 .../java/com/google/iam/v2beta/DenyRule.java  |  201 ++-
 .../google/iam/v2beta/GetPolicyRequest.java   |  112 +-
 .../iam/v2beta/ListPoliciesRequest.java       |  136 +-
 .../iam/v2beta/ListPoliciesResponse.java      |  143 +-
 .../java/com/google/iam/v2beta/Policy.java    |  284 +--
 .../iam/v2beta/PolicyOperationMetadata.java   |  120 +-
 .../com/google/iam/v2beta/PolicyRule.java     |  135 +-
 .../iam/v2beta/UpdatePolicyRequest.java       |  119 +-
 .../iam/v3/CreatePolicyBindingRequest.java    |  157 +-
 ...ePrincipalAccessBoundaryPolicyRequest.java |  161 +-
 .../iam/v3/DeletePolicyBindingRequest.java    |  136 +-
 ...ePrincipalAccessBoundaryPolicyRequest.java |  149 +-
 .../iam/v3/GetPolicyBindingRequest.java       |  112 +-
 ...tPrincipalAccessBoundaryPolicyRequest.java |  113 +-
 .../iam/v3/ListPolicyBindingsRequest.java     |  149 +-
 .../iam/v3/ListPolicyBindingsResponse.java    |  143 +-
 ...rincipalAccessBoundaryPoliciesRequest.java |  138 +-
 ...incipalAccessBoundaryPoliciesResponse.java |  151 +-
 .../com/google/iam/v3/OperationMetadata.java  |  204 ++-
 .../java/com/google/iam/v3/PolicyBinding.java |  415 +++--
 .../iam/v3/PrincipalAccessBoundaryPolicy.java |  243 ++-
 .../PrincipalAccessBoundaryPolicyDetails.java |  149 +-
 .../v3/PrincipalAccessBoundaryPolicyRule.java |  147 +-
 ...alAccessBoundaryPolicyBindingsRequest.java |  140 +-
 ...lAccessBoundaryPolicyBindingsResponse.java |  147 +-
 .../v3/SearchTargetPolicyBindingsRequest.java |  150 +-
 .../SearchTargetPolicyBindingsResponse.java   |  144 +-
 .../iam/v3/UpdatePolicyBindingRequest.java    |  152 +-
 ...ePrincipalAccessBoundaryPolicyRequest.java |  156 +-
 .../v3beta/CreatePolicyBindingRequest.java    |  158 +-
 ...ePrincipalAccessBoundaryPolicyRequest.java |  163 +-
 .../v3beta/DeletePolicyBindingRequest.java    |  136 +-
 ...ePrincipalAccessBoundaryPolicyRequest.java |  150 +-
 .../iam/v3beta/GetPolicyBindingRequest.java   |  112 +-
 ...tPrincipalAccessBoundaryPolicyRequest.java |  114 +-
 .../iam/v3beta/ListPolicyBindingsRequest.java |  149 +-
 .../v3beta/ListPolicyBindingsResponse.java    |  145 +-
 ...rincipalAccessBoundaryPoliciesRequest.java |  139 +-
 ...incipalAccessBoundaryPoliciesResponse.java |  152 +-
 .../google/iam/v3beta/OperationMetadata.java  |  204 ++-
 .../com/google/iam/v3beta/PolicyBinding.java  |  415 +++--
 .../v3beta/PrincipalAccessBoundaryPolicy.java |  244 ++-
 .../PrincipalAccessBoundaryPolicyDetails.java |  150 +-
 .../PrincipalAccessBoundaryPolicyRule.java    |  147 +-
 ...alAccessBoundaryPolicyBindingsRequest.java |  140 +-
 ...lAccessBoundaryPolicyBindingsResponse.java |  150 +-
 .../SearchTargetPolicyBindingsRequest.java    |  150 +-
 .../SearchTargetPolicyBindingsResponse.java   |  146 +-
 .../v3beta/UpdatePolicyBindingRequest.java    |  153 +-
 ...ePrincipalAccessBoundaryPolicyRequest.java |  158 +-
 .../v1beta1/AttemptSequenceRequest.java       |  113 +-
 .../AttemptStreamingSequenceRequest.java      |  124 +-
 .../AttemptStreamingSequenceResponse.java     |  113 +-
 .../google/showcase/v1beta1/BlockRequest.java |  168 +-
 .../showcase/v1beta1/BlockResponse.java       |  112 +-
 .../com/google/showcase/v1beta1/Blurb.java    |  221 ++-
 .../showcase/v1beta1/ComplianceData.java      |  377 ++--
 .../showcase/v1beta1/ComplianceDataChild.java |  258 +--
 .../v1beta1/ComplianceDataGrandchild.java     |  135 +-
 .../showcase/v1beta1/ComplianceGroup.java     |  165 +-
 .../showcase/v1beta1/ComplianceSuite.java     |  132 +-
 .../showcase/v1beta1/ConnectRequest.java      |  266 +--
 .../showcase/v1beta1/CreateBlurbRequest.java  |  133 +-
 .../showcase/v1beta1/CreateRoomRequest.java   |  120 +-
 .../v1beta1/CreateSequenceRequest.java        |  122 +-
 .../v1beta1/CreateSessionRequest.java         |  121 +-
 .../CreateStreamingSequenceRequest.java       |  123 +-
 .../showcase/v1beta1/CreateUserRequest.java   |  120 +-
 .../showcase/v1beta1/DeleteBlurbRequest.java  |  112 +-
 .../showcase/v1beta1/DeleteRoomRequest.java   |  112 +-
 .../v1beta1/DeleteSessionRequest.java         |  112 +-
 .../showcase/v1beta1/DeleteTestRequest.java   |  112 +-
 .../showcase/v1beta1/DeleteUserRequest.java   |  112 +-
 .../v1beta1/EchoErrorDetailsRequest.java      |  134 +-
 .../v1beta1/EchoErrorDetailsResponse.java     |  398 +++--
 .../google/showcase/v1beta1/EchoRequest.java  |  202 ++-
 .../google/showcase/v1beta1/EchoResponse.java |  151 +-
 .../google/showcase/v1beta1/EnumRequest.java  |  110 +-
 .../google/showcase/v1beta1/EnumResponse.java |  134 +-
 .../v1beta1/ErrorWithMultipleDetails.java     |  130 +-
 .../v1beta1/ErrorWithSingleDetail.java        |  120 +-
 .../showcase/v1beta1/ExpandRequest.java       |  153 +-
 .../v1beta1/FailEchoWithDetailsRequest.java   |  113 +-
 .../v1beta1/FailEchoWithDetailsResponse.java  |  100 +-
 .../showcase/v1beta1/GetBlurbRequest.java     |  112 +-
 .../showcase/v1beta1/GetRoomRequest.java      |  112 +-
 .../v1beta1/GetSequenceReportRequest.java     |  113 +-
 .../showcase/v1beta1/GetSessionRequest.java   |  112 +-
 .../GetStreamingSequenceReportRequest.java    |  114 +-
 .../showcase/v1beta1/GetUserRequest.java      |  112 +-
 .../com/google/showcase/v1beta1/Issue.java    |  138 +-
 .../showcase/v1beta1/ListBlurbsRequest.java   |  136 +-
 .../showcase/v1beta1/ListBlurbsResponse.java  |  144 +-
 .../showcase/v1beta1/ListRoomsRequest.java    |  123 +-
 .../showcase/v1beta1/ListRoomsResponse.java   |  143 +-
 .../showcase/v1beta1/ListSessionsRequest.java |  123 +-
 .../v1beta1/ListSessionsResponse.java         |  145 +-
 .../showcase/v1beta1/ListTestsRequest.java    |  136 +-
 .../showcase/v1beta1/ListTestsResponse.java   |  143 +-
 .../showcase/v1beta1/ListUsersRequest.java    |  123 +-
 .../showcase/v1beta1/ListUsersResponse.java   |  143 +-
 .../PagedExpandLegacyMappedResponse.java      |  144 +-
 .../v1beta1/PagedExpandLegacyRequest.java     |  137 +-
 .../showcase/v1beta1/PagedExpandRequest.java  |  136 +-
 .../showcase/v1beta1/PagedExpandResponse.java |  145 +-
 .../v1beta1/PagedExpandResponseList.java      |  121 +-
 .../google/showcase/v1beta1/PoetryError.java  |  112 +-
 .../showcase/v1beta1/RepeatRequest.java       |  228 ++-
 .../showcase/v1beta1/RepeatResponse.java      |  134 +-
 .../v1beta1/ReportSessionRequest.java         |  112 +-
 .../v1beta1/ReportSessionResponse.java        |  146 +-
 .../google/showcase/v1beta1/RestError.java    |  289 +--
 .../com/google/showcase/v1beta1/Room.java     |  180 +-
 .../v1beta1/SearchBlurbsMetadata.java         |  119 +-
 .../showcase/v1beta1/SearchBlurbsRequest.java |  149 +-
 .../v1beta1/SearchBlurbsResponse.java         |  144 +-
 .../showcase/v1beta1/SendBlurbsResponse.java  |  120 +-
 .../com/google/showcase/v1beta1/Sequence.java |  287 +--
 .../showcase/v1beta1/SequenceReport.java      |  344 ++--
 .../com/google/showcase/v1beta1/Session.java  |  125 +-
 .../showcase/v1beta1/StreamBlurbsRequest.java |  133 +-
 .../v1beta1/StreamBlurbsResponse.java         |  133 +-
 .../showcase/v1beta1/StreamingSequence.java   |  315 ++--
 .../v1beta1/StreamingSequenceReport.java      |  347 ++--
 .../com/google/showcase/v1beta1/Test.java     |  483 +++--
 .../com/google/showcase/v1beta1/TestRun.java  |  133 +-
 .../showcase/v1beta1/UpdateBlurbRequest.java  |  141 +-
 .../showcase/v1beta1/UpdateRoomRequest.java   |  141 +-
 .../showcase/v1beta1/UpdateUserRequest.java   |  141 +-
 .../com/google/showcase/v1beta1/User.java     |  230 ++-
 .../showcase/v1beta1/VerifyTestRequest.java   |  143 +-
 .../showcase/v1beta1/VerifyTestResponse.java  |  120 +-
 .../google/showcase/v1beta1/WaitMetadata.java |  120 +-
 .../google/showcase/v1beta1/WaitRequest.java  |  193 +-
 .../google/showcase/v1beta1/WaitResponse.java |  112 +-
 313 files changed, 34243 insertions(+), 22961 deletions(-)

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 f34ddc105e..1b3291e416 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
@@ -54,6 +54,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Advice(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              description_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ConfigChangeProto.internal_static_google_api_Advice_descriptor;
   }
@@ -136,7 +182,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, description_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -148,7 +194,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, description_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -164,7 +210,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.api.Advice other = (com.google.api.Advice) obj;
 
     if (!getDescription().equals(other.getDescription())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -177,7 +223,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + DESCRIPTION_FIELD_NUMBER;
     hash = (53 * hash) + getDescription().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -304,10 +350,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Advice.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -394,7 +447,7 @@ public Builder mergeFrom(com.google.api.Advice other) {
         description_ = other.description_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -409,37 +462,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Advice parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 18:
-              {
-                description_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Advice) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -591,18 +624,7 @@ public Advice parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Advice(input, extensionRegistry);
         }
       };
 
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 e81ffe0342..e66c6b3bb6 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
@@ -60,6 +60,94 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private AuthProvider(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              id_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              issuer_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              jwksUri_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              audiences_ = s;
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              authorizationUrl_ = s;
+              break;
+            }
+          case 50:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                jwtLocations_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              jwtLocations_.add(
+                  input.readMessage(com.google.api.JwtLocation.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        jwtLocations_ = java.util.Collections.unmodifiableList(jwtLocations_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.AuthProto.internal_static_google_api_AuthProvider_descriptor;
   }
@@ -565,7 +653,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < jwtLocations_.size(); i++) {
       output.writeMessage(6, jwtLocations_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -592,7 +680,7 @@ public int getSerializedSize() {
     for (int i = 0; i < jwtLocations_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, jwtLocations_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -613,7 +701,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getAudiences().equals(other.getAudiences())) return false;
     if (!getAuthorizationUrl().equals(other.getAuthorizationUrl())) return false;
     if (!getJwtLocationsList().equals(other.getJwtLocationsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -638,7 +726,7 @@ public int hashCode() {
       hash = (37 * hash) + JWT_LOCATIONS_FIELD_NUMBER;
       hash = (53 * hash) + getJwtLocationsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -766,10 +854,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.AuthProvider.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getJwtLocationsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -787,11 +884,10 @@ public Builder clear() {
 
       if (jwtLocationsBuilder_ == null) {
         jwtLocations_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        jwtLocations_ = null;
         jwtLocationsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -928,7 +1024,7 @@ public Builder mergeFrom(com.google.api.AuthProvider other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -943,73 +1039,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.AuthProvider parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                id_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                issuer_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                jwksUri_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                audiences_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            case 42:
-              {
-                authorizationUrl_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 42
-            case 50:
-              {
-                com.google.api.JwtLocation m =
-                    input.readMessage(com.google.api.JwtLocation.parser(), extensionRegistry);
-                if (jwtLocationsBuilder_ == null) {
-                  ensureJwtLocationsIsMutable();
-                  jwtLocations_.add(m);
-                } else {
-                  jwtLocationsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 50
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.AuthProvider) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2372,18 +2412,7 @@ public AuthProvider parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new AuthProvider(input, extensionRegistry);
         }
       };
 
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 876b3d20a2..21dac5e078 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
@@ -56,6 +56,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private AuthRequirement(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              providerId_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              audiences_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.AuthProto.internal_static_google_api_AuthRequirement_descriptor;
   }
@@ -218,7 +271,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(audiences_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, audiences_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -233,7 +286,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(audiences_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, audiences_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -250,7 +303,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getProviderId().equals(other.getProviderId())) return false;
     if (!getAudiences().equals(other.getAudiences())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -265,7 +318,7 @@ public int hashCode() {
     hash = (53 * hash) + getProviderId().hashCode();
     hash = (37 * hash) + AUDIENCES_FIELD_NUMBER;
     hash = (53 * hash) + getAudiences().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -393,10 +446,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.AuthRequirement.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -490,7 +550,7 @@ public Builder mergeFrom(com.google.api.AuthRequirement other) {
         audiences_ = other.audiences_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -505,43 +565,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.AuthRequirement parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                providerId_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                audiences_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.AuthRequirement) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -869,18 +903,7 @@ public AuthRequirement parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new AuthRequirement(input, extensionRegistry);
         }
       };
 
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 bbed0fc947..b222c9436b 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
@@ -69,6 +69,72 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Authentication(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                rules_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              rules_.add(
+                  input.readMessage(com.google.api.AuthenticationRule.parser(), extensionRegistry));
+              break;
+            }
+          case 34:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                providers_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              providers_.add(
+                  input.readMessage(com.google.api.AuthProvider.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        rules_ = java.util.Collections.unmodifiableList(rules_);
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        providers_ = java.util.Collections.unmodifiableList(providers_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.AuthProto.internal_static_google_api_Authentication_descriptor;
   }
@@ -254,7 +320,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < providers_.size(); i++) {
       output.writeMessage(4, providers_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -269,7 +335,7 @@ public int getSerializedSize() {
     for (int i = 0; i < providers_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, providers_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -286,7 +352,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getRulesList().equals(other.getRulesList())) return false;
     if (!getProvidersList().equals(other.getProvidersList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -305,7 +371,7 @@ public int hashCode() {
       hash = (37 * hash) + PROVIDERS_FIELD_NUMBER;
       hash = (53 * hash) + getProvidersList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -446,10 +512,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Authentication.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getRulesFieldBuilder();
+        getProvidersFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -457,18 +533,16 @@ public Builder clear() {
       super.clear();
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        rules_ = null;
         rulesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       if (providersBuilder_ == null) {
         providers_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
-        providers_ = null;
         providersBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -616,7 +690,7 @@ public Builder mergeFrom(com.google.api.Authentication other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -631,56 +705,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Authentication parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 26:
-              {
-                com.google.api.AuthenticationRule m =
-                    input.readMessage(
-                        com.google.api.AuthenticationRule.parser(), extensionRegistry);
-                if (rulesBuilder_ == null) {
-                  ensureRulesIsMutable();
-                  rules_.add(m);
-                } else {
-                  rulesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 26
-            case 34:
-              {
-                com.google.api.AuthProvider m =
-                    input.readMessage(com.google.api.AuthProvider.parser(), extensionRegistry);
-                if (providersBuilder_ == null) {
-                  ensureProvidersIsMutable();
-                  providers_.add(m);
-                } else {
-                  providersBuilder_.addMessage(m);
-                }
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Authentication) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1462,18 +1497,7 @@ public Authentication parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Authentication(input, extensionRegistry);
         }
       };
 
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 f9aa1e3bcd..9dcbe8d97c 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
@@ -60,6 +60,86 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private AuthenticationRule(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              selector_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.api.OAuthRequirements.Builder subBuilder = null;
+              if (oauth_ != null) {
+                subBuilder = oauth_.toBuilder();
+              }
+              oauth_ =
+                  input.readMessage(com.google.api.OAuthRequirements.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(oauth_);
+                oauth_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 40:
+            {
+              allowWithoutCredential_ = input.readBool();
+              break;
+            }
+          case 58:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                requirements_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              requirements_.add(
+                  input.readMessage(com.google.api.AuthRequirement.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        requirements_ = java.util.Collections.unmodifiableList(requirements_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.AuthProto.internal_static_google_api_AuthenticationRule_descriptor;
   }
@@ -297,7 +377,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < requirements_.size(); i++) {
       output.writeMessage(7, requirements_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -318,7 +398,7 @@ public int getSerializedSize() {
     for (int i = 0; i < requirements_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, requirements_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -340,7 +420,7 @@ public boolean equals(final java.lang.Object obj) {
     }
     if (getAllowWithoutCredential() != other.getAllowWithoutCredential()) return false;
     if (!getRequirementsList().equals(other.getRequirementsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -363,7 +443,7 @@ public int hashCode() {
       hash = (37 * hash) + REQUIREMENTS_FIELD_NUMBER;
       hash = (53 * hash) + getRequirementsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -497,10 +577,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.AuthenticationRule.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getRequirementsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -518,11 +607,10 @@ public Builder clear() {
 
       if (requirementsBuilder_ == null) {
         requirements_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        requirements_ = null;
         requirementsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -651,7 +739,7 @@ public Builder mergeFrom(com.google.api.AuthenticationRule other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -666,61 +754,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.AuthenticationRule parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                selector_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getOauthFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            case 40:
-              {
-                allowWithoutCredential_ = input.readBool();
-
-                break;
-              } // case 40
-            case 58:
-              {
-                com.google.api.AuthRequirement m =
-                    input.readMessage(com.google.api.AuthRequirement.parser(), extensionRegistry);
-                if (requirementsBuilder_ == null) {
-                  ensureRequirementsIsMutable();
-                  requirements_.add(m);
-                } else {
-                  requirementsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 58
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.AuthenticationRule) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1490,18 +1534,7 @@ public AuthenticationRule parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new AuthenticationRule(input, extensionRegistry);
         }
       };
 
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 ebd3c2a9f6..50a4f6c374 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
@@ -53,6 +53,58 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Backend(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                rules_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              rules_.add(input.readMessage(com.google.api.BackendRule.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        rules_ = java.util.Collections.unmodifiableList(rules_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.BackendProto.internal_static_google_api_Backend_descriptor;
   }
@@ -160,7 +212,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < rules_.size(); i++) {
       output.writeMessage(1, rules_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -172,7 +224,7 @@ public int getSerializedSize() {
     for (int i = 0; i < rules_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, rules_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -188,7 +240,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.api.Backend other = (com.google.api.Backend) obj;
 
     if (!getRulesList().equals(other.getRulesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -203,7 +255,7 @@ public int hashCode() {
       hash = (37 * hash) + RULES_FIELD_NUMBER;
       hash = (53 * hash) + getRulesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -329,10 +381,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Backend.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getRulesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -340,11 +401,10 @@ public Builder clear() {
       super.clear();
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        rules_ = null;
         rulesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -456,7 +516,7 @@ public Builder mergeFrom(com.google.api.Backend other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -471,43 +531,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Backend parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.api.BackendRule m =
-                    input.readMessage(com.google.api.BackendRule.parser(), extensionRegistry);
-                if (rulesBuilder_ == null) {
-                  ensureRulesIsMutable();
-                  rules_.add(m);
-                } else {
-                  rulesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Backend) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -922,18 +956,7 @@ public Backend parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Backend(input, extensionRegistry);
         }
       };
 
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 11f95fed8a..19c0abfba0 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
@@ -56,6 +56,123 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private BackendRule(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              selector_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              address_ = s;
+              break;
+            }
+          case 25:
+            {
+              deadline_ = input.readDouble();
+              break;
+            }
+          case 33:
+            {
+              minDeadline_ = input.readDouble();
+              break;
+            }
+          case 41:
+            {
+              operationDeadline_ = input.readDouble();
+              break;
+            }
+          case 48:
+            {
+              int rawValue = input.readEnum();
+
+              pathTranslation_ = rawValue;
+              break;
+            }
+          case 58:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              authenticationCase_ = 7;
+              authentication_ = s;
+              break;
+            }
+          case 64:
+            {
+              authentication_ = input.readBool();
+              authenticationCase_ = 8;
+              break;
+            }
+          case 74:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              protocol_ = s;
+              break;
+            }
+          case 82:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                overridesByRequestProtocol_ =
+                    com.google.protobuf.MapField.newMapField(
+                        OverridesByRequestProtocolDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry
+                  overridesByRequestProtocol__ =
+                      input.readMessage(
+                          OverridesByRequestProtocolDefaultEntryHolder.defaultEntry
+                              .getParserForType(),
+                          extensionRegistry);
+              overridesByRequestProtocol_
+                  .getMutableMap()
+                  .put(
+                      overridesByRequestProtocol__.getKey(),
+                      overridesByRequestProtocol__.getValue());
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.BackendProto.internal_static_google_api_BackendRule_descriptor;
   }
@@ -918,7 +1035,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         internalGetOverridesByRequestProtocol(),
         OverridesByRequestProtocolDefaultEntryHolder.defaultEntry,
         10);
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -970,7 +1087,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               10, overridesByRequestProtocol__);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1008,7 +1125,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1058,7 +1175,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1204,10 +1321,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.api.BackendRule.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1365,7 +1489,7 @@ public Builder mergeFrom(com.google.api.BackendRule other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1380,101 +1504,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.BackendRule parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                selector_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                address_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 25:
-              {
-                deadline_ = input.readDouble();
-
-                break;
-              } // case 25
-            case 33:
-              {
-                minDeadline_ = input.readDouble();
-
-                break;
-              } // case 33
-            case 41:
-              {
-                operationDeadline_ = input.readDouble();
-
-                break;
-              } // case 41
-            case 48:
-              {
-                pathTranslation_ = input.readEnum();
-
-                break;
-              } // case 48
-            case 58:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                authenticationCase_ = 7;
-                authentication_ = s;
-                break;
-              } // case 58
-            case 64:
-              {
-                authentication_ = input.readBool();
-                authenticationCase_ = 8;
-                break;
-              } // case 64
-            case 74:
-              {
-                protocol_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 74
-            case 82:
-              {
-                com.google.protobuf.MapEntry
-                    overridesByRequestProtocol__ =
-                        input.readMessage(
-                            OverridesByRequestProtocolDefaultEntryHolder.defaultEntry
-                                .getParserForType(),
-                            extensionRegistry);
-                internalGetMutableOverridesByRequestProtocol()
-                    .getMutableMap()
-                    .put(
-                        overridesByRequestProtocol__.getKey(),
-                        overridesByRequestProtocol__.getValue());
-                break;
-              } // case 82
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.BackendRule) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2674,18 +2714,7 @@ public BackendRule parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new BackendRule(input, extensionRegistry);
         }
       };
 
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 8fcf26f837..6b9d7c64ea 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
@@ -81,6 +81,61 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Billing(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 66:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                consumerDestinations_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              consumerDestinations_.add(
+                  input.readMessage(
+                      com.google.api.Billing.BillingDestination.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        consumerDestinations_ = java.util.Collections.unmodifiableList(consumerDestinations_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.BillingProto.internal_static_google_api_Billing_descriptor;
   }
@@ -228,6 +283,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private BillingDestination(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                monitoredResource_ = s;
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  metrics_ = new com.google.protobuf.LazyStringArrayList();
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                metrics_.add(s);
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          metrics_ = metrics_.getUnmodifiableView();
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.api.BillingProto
           .internal_static_google_api_Billing_BillingDestination_descriptor;
@@ -391,7 +506,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       for (int i = 0; i < metrics_.size(); i++) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, metrics_.getRaw(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -411,7 +526,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getMetricsList().size();
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -429,7 +544,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getMonitoredResource().equals(other.getMonitoredResource())) return false;
       if (!getMetricsList().equals(other.getMetricsList())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -446,7 +561,7 @@ public int hashCode() {
         hash = (37 * hash) + METRICS_FIELD_NUMBER;
         hash = (53 * hash) + getMetricsList().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -579,10 +694,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.api.Billing.BillingDestination.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -691,7 +813,7 @@ public Builder mergeFrom(com.google.api.Billing.BillingDestination other) {
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -706,44 +828,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.api.Billing.BillingDestination parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  monitoredResource_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  java.lang.String s = input.readStringRequireUtf8();
-                  ensureMetricsIsMutable();
-                  metrics_.add(s);
-                  break;
-                } // case 18
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.api.Billing.BillingDestination) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1098,19 +1193,7 @@ public BillingDestination parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new BillingDestination(input, extensionRegistry);
           }
         };
 
@@ -1236,7 +1319,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < consumerDestinations_.size(); i++) {
       output.writeMessage(8, consumerDestinations_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1249,7 +1332,7 @@ public int getSerializedSize() {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(8, consumerDestinations_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1265,7 +1348,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.api.Billing other = (com.google.api.Billing) obj;
 
     if (!getConsumerDestinationsList().equals(other.getConsumerDestinationsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1280,7 +1363,7 @@ public int hashCode() {
       hash = (37 * hash) + CONSUMER_DESTINATIONS_FIELD_NUMBER;
       hash = (53 * hash) + getConsumerDestinationsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1434,10 +1517,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Billing.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getConsumerDestinationsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -1445,11 +1537,10 @@ public Builder clear() {
       super.clear();
       if (consumerDestinationsBuilder_ == null) {
         consumerDestinations_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        consumerDestinations_ = null;
         consumerDestinationsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -1561,7 +1652,7 @@ public Builder mergeFrom(com.google.api.Billing other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1576,44 +1667,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Billing parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 66:
-              {
-                com.google.api.Billing.BillingDestination m =
-                    input.readMessage(
-                        com.google.api.Billing.BillingDestination.parser(), extensionRegistry);
-                if (consumerDestinationsBuilder_ == null) {
-                  ensureConsumerDestinationsIsMutable();
-                  consumerDestinations_.add(m);
-                } else {
-                  consumerDestinationsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 66
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Billing) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2082,18 +2146,7 @@ public Billing parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Billing(input, extensionRegistry);
         }
       };
 
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 05fc6bffe1..da520224d7 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
@@ -54,6 +54,184 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ClientLibrarySettings(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              version_ = s;
+              break;
+            }
+          case 16:
+            {
+              int rawValue = input.readEnum();
+
+              launchStage_ = rawValue;
+              break;
+            }
+          case 24:
+            {
+              restNumericEnums_ = input.readBool();
+              break;
+            }
+          case 170:
+            {
+              com.google.api.JavaSettings.Builder subBuilder = null;
+              if (javaSettings_ != null) {
+                subBuilder = javaSettings_.toBuilder();
+              }
+              javaSettings_ =
+                  input.readMessage(com.google.api.JavaSettings.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(javaSettings_);
+                javaSettings_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 178:
+            {
+              com.google.api.CppSettings.Builder subBuilder = null;
+              if (cppSettings_ != null) {
+                subBuilder = cppSettings_.toBuilder();
+              }
+              cppSettings_ =
+                  input.readMessage(com.google.api.CppSettings.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(cppSettings_);
+                cppSettings_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 186:
+            {
+              com.google.api.PhpSettings.Builder subBuilder = null;
+              if (phpSettings_ != null) {
+                subBuilder = phpSettings_.toBuilder();
+              }
+              phpSettings_ =
+                  input.readMessage(com.google.api.PhpSettings.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(phpSettings_);
+                phpSettings_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 194:
+            {
+              com.google.api.PythonSettings.Builder subBuilder = null;
+              if (pythonSettings_ != null) {
+                subBuilder = pythonSettings_.toBuilder();
+              }
+              pythonSettings_ =
+                  input.readMessage(com.google.api.PythonSettings.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(pythonSettings_);
+                pythonSettings_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 202:
+            {
+              com.google.api.NodeSettings.Builder subBuilder = null;
+              if (nodeSettings_ != null) {
+                subBuilder = nodeSettings_.toBuilder();
+              }
+              nodeSettings_ =
+                  input.readMessage(com.google.api.NodeSettings.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(nodeSettings_);
+                nodeSettings_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 210:
+            {
+              com.google.api.DotnetSettings.Builder subBuilder = null;
+              if (dotnetSettings_ != null) {
+                subBuilder = dotnetSettings_.toBuilder();
+              }
+              dotnetSettings_ =
+                  input.readMessage(com.google.api.DotnetSettings.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(dotnetSettings_);
+                dotnetSettings_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 218:
+            {
+              com.google.api.RubySettings.Builder subBuilder = null;
+              if (rubySettings_ != null) {
+                subBuilder = rubySettings_.toBuilder();
+              }
+              rubySettings_ =
+                  input.readMessage(com.google.api.RubySettings.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(rubySettings_);
+                rubySettings_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 226:
+            {
+              com.google.api.GoSettings.Builder subBuilder = null;
+              if (goSettings_ != null) {
+                subBuilder = goSettings_.toBuilder();
+              }
+              goSettings_ =
+                  input.readMessage(com.google.api.GoSettings.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(goSettings_);
+                goSettings_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_ClientLibrarySettings_descriptor;
   }
@@ -623,7 +801,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (goSettings_ != null) {
       output.writeMessage(28, getGoSettings());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -665,7 +843,7 @@ public int getSerializedSize() {
     if (goSettings_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(28, getGoSettings());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -715,7 +893,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasGoSettings()) {
       if (!getGoSettings().equals(other.getGoSettings())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -764,7 +942,7 @@ public int hashCode() {
       hash = (37 * hash) + GO_SETTINGS_FIELD_NUMBER;
       hash = (53 * hash) + getGoSettings().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -892,10 +1070,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.ClientLibrarySettings.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1106,7 +1291,7 @@ public Builder mergeFrom(com.google.api.ClientLibrarySettings other) {
       if (other.hasGoSettings()) {
         mergeGoSettings(other.getGoSettings());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1121,97 +1306,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.ClientLibrarySettings parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                version_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                launchStage_ = input.readEnum();
-
-                break;
-              } // case 16
-            case 24:
-              {
-                restNumericEnums_ = input.readBool();
-
-                break;
-              } // case 24
-            case 170:
-              {
-                input.readMessage(getJavaSettingsFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 170
-            case 178:
-              {
-                input.readMessage(getCppSettingsFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 178
-            case 186:
-              {
-                input.readMessage(getPhpSettingsFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 186
-            case 194:
-              {
-                input.readMessage(getPythonSettingsFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 194
-            case 202:
-              {
-                input.readMessage(getNodeSettingsFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 202
-            case 210:
-              {
-                input.readMessage(getDotnetSettingsFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 210
-            case 218:
-              {
-                input.readMessage(getRubySettingsFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 218
-            case 226:
-              {
-                input.readMessage(getGoSettingsFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 226
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.ClientLibrarySettings) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -3057,18 +3162,7 @@ public ClientLibrarySettings parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ClientLibrarySettings(input, extensionRegistry);
         }
       };
 
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 a35c332f3d..8c4dd92f8e 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
@@ -54,6 +54,97 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CommonLanguageSettings(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              referenceDocsUri_ = s;
+              break;
+            }
+          case 16:
+            {
+              int rawValue = input.readEnum();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                destinations_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              destinations_.add(rawValue);
+              break;
+            }
+          case 18:
+            {
+              int length = input.readRawVarint32();
+              int oldLimit = input.pushLimit(length);
+              while (input.getBytesUntilLimit() > 0) {
+                int rawValue = input.readEnum();
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  destinations_ = new java.util.ArrayList();
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                destinations_.add(rawValue);
+              }
+              input.popLimit(oldLimit);
+              break;
+            }
+          case 26:
+            {
+              com.google.api.SelectiveGapicGeneration.Builder subBuilder = null;
+              if (selectiveGapicGeneration_ != null) {
+                subBuilder = selectiveGapicGeneration_.toBuilder();
+              }
+              selectiveGapicGeneration_ =
+                  input.readMessage(
+                      com.google.api.SelectiveGapicGeneration.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(selectiveGapicGeneration_);
+                selectiveGapicGeneration_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        destinations_ = java.util.Collections.unmodifiableList(destinations_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_CommonLanguageSettings_descriptor;
   }
@@ -307,7 +398,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (selectiveGapicGeneration_ != null) {
       output.writeMessage(3, getSelectiveGapicGeneration());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -337,7 +428,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               3, getSelectiveGapicGeneration());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -358,7 +449,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasSelectiveGapicGeneration()) {
       if (!getSelectiveGapicGeneration().equals(other.getSelectiveGapicGeneration())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -379,7 +470,7 @@ public int hashCode() {
       hash = (37 * hash) + SELECTIVE_GAPIC_GENERATION_FIELD_NUMBER;
       hash = (53 * hash) + getSelectiveGapicGeneration().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -508,10 +599,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.CommonLanguageSettings.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -632,7 +730,7 @@ public Builder mergeFrom(com.google.api.CommonLanguageSettings other) {
       if (other.hasSelectiveGapicGeneration()) {
         mergeSelectiveGapicGeneration(other.getSelectiveGapicGeneration());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -647,63 +745,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.CommonLanguageSettings parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                referenceDocsUri_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                int tmpRaw = input.readEnum();
-                ensureDestinationsIsMutable();
-                destinations_.add(tmpRaw);
-                break;
-              } // case 16
-            case 18:
-              {
-                int length = input.readRawVarint32();
-                int oldLimit = input.pushLimit(length);
-                while (input.getBytesUntilLimit() > 0) {
-                  int tmpRaw = input.readEnum();
-                  ensureDestinationsIsMutable();
-                  destinations_.add(tmpRaw);
-                }
-                input.popLimit(oldLimit);
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(
-                    getSelectiveGapicGenerationFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.CommonLanguageSettings) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1300,18 +1352,7 @@ public CommonLanguageSettings parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new CommonLanguageSettings(input, extensionRegistry);
         }
       };
 
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 7b30efd1ae..9b2970740a 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
@@ -61,6 +61,86 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ConfigChange(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              element_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              oldValue_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              newValue_ = s;
+              break;
+            }
+          case 32:
+            {
+              int rawValue = input.readEnum();
+
+              changeType_ = rawValue;
+              break;
+            }
+          case 42:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                advices_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              advices_.add(input.readMessage(com.google.api.Advice.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        advices_ = java.util.Collections.unmodifiableList(advices_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ConfigChangeProto.internal_static_google_api_ConfigChange_descriptor;
   }
@@ -391,7 +471,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < advices_.size(); i++) {
       output.writeMessage(5, advices_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -415,7 +495,7 @@ public int getSerializedSize() {
     for (int i = 0; i < advices_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, advices_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -435,7 +515,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getNewValue().equals(other.getNewValue())) return false;
     if (changeType_ != other.changeType_) return false;
     if (!getAdvicesList().equals(other.getAdvicesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -458,7 +538,7 @@ public int hashCode() {
       hash = (37 * hash) + ADVICES_FIELD_NUMBER;
       hash = (53 * hash) + getAdvicesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -589,10 +669,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.ConfigChange.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getAdvicesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -608,11 +697,10 @@ public Builder clear() {
 
       if (advicesBuilder_ == null) {
         advices_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        advices_ = null;
         advicesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -743,7 +831,7 @@ public Builder mergeFrom(com.google.api.ConfigChange other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -758,67 +846,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.ConfigChange parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                element_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                oldValue_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                newValue_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 32:
-              {
-                changeType_ = input.readEnum();
-
-                break;
-              } // case 32
-            case 42:
-              {
-                com.google.api.Advice m =
-                    input.readMessage(com.google.api.Advice.parser(), extensionRegistry);
-                if (advicesBuilder_ == null) {
-                  ensureAdvicesIsMutable();
-                  advices_.add(m);
-                } else {
-                  advicesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 42
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.ConfigChange) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1706,18 +1744,7 @@ public ConfigChange parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ConfigChange(input, extensionRegistry);
         }
       };
 
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 36638679ea..2c8d138dc4 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
@@ -80,6 +80,58 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Context(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                rules_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              rules_.add(input.readMessage(com.google.api.ContextRule.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        rules_ = java.util.Collections.unmodifiableList(rules_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ContextProto.internal_static_google_api_Context_descriptor;
   }
@@ -187,7 +239,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < rules_.size(); i++) {
       output.writeMessage(1, rules_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -199,7 +251,7 @@ public int getSerializedSize() {
     for (int i = 0; i < rules_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, rules_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -215,7 +267,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.api.Context other = (com.google.api.Context) obj;
 
     if (!getRulesList().equals(other.getRulesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -230,7 +282,7 @@ public int hashCode() {
       hash = (37 * hash) + RULES_FIELD_NUMBER;
       hash = (53 * hash) + getRulesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -383,10 +435,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Context.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getRulesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -394,11 +455,10 @@ public Builder clear() {
       super.clear();
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        rules_ = null;
         rulesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -510,7 +570,7 @@ public Builder mergeFrom(com.google.api.Context other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -525,43 +585,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Context parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.api.ContextRule m =
-                    input.readMessage(com.google.api.ContextRule.parser(), extensionRegistry);
-                if (rulesBuilder_ == null) {
-                  ensureRulesIsMutable();
-                  rules_.add(m);
-                } else {
-                  rulesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Context) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -976,18 +1010,7 @@ public Context parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Context(input, extensionRegistry);
         }
       };
 
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 aa6c0f25a9..17be6eb0ef 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
@@ -58,6 +58,105 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ContextRule(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              selector_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                requested_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              requested_.add(s);
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                provided_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              provided_.add(s);
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                allowedRequestExtensions_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              allowedRequestExtensions_.add(s);
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                allowedResponseExtensions_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              allowedResponseExtensions_.add(s);
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        requested_ = requested_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        provided_ = provided_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000004) != 0)) {
+        allowedRequestExtensions_ = allowedRequestExtensions_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000008) != 0)) {
+        allowedResponseExtensions_ = allowedResponseExtensions_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ContextProto.internal_static_google_api_ContextRule_descriptor;
   }
@@ -432,7 +531,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       com.google.protobuf.GeneratedMessageV3.writeString(
           output, 5, allowedResponseExtensions_.getRaw(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -476,7 +575,7 @@ public int getSerializedSize() {
       size += dataSize;
       size += 1 * getAllowedResponseExtensionsList().size();
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -498,7 +597,7 @@ public boolean equals(final java.lang.Object obj) {
       return false;
     if (!getAllowedResponseExtensionsList().equals(other.getAllowedResponseExtensionsList()))
       return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -527,7 +626,7 @@ public int hashCode() {
       hash = (37 * hash) + ALLOWED_RESPONSE_EXTENSIONS_FIELD_NUMBER;
       hash = (53 * hash) + getAllowedResponseExtensionsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -654,10 +753,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.ContextRule.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -813,7 +919,7 @@ public Builder mergeFrom(com.google.api.ContextRule other) {
         }
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -828,65 +934,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.ContextRule parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                selector_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureRequestedIsMutable();
-                requested_.add(s);
-                break;
-              } // case 18
-            case 26:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureProvidedIsMutable();
-                provided_.add(s);
-                break;
-              } // case 26
-            case 34:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureAllowedRequestExtensionsIsMutable();
-                allowedRequestExtensions_.add(s);
-                break;
-              } // case 34
-            case 42:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureAllowedResponseExtensionsIsMutable();
-                allowedResponseExtensions_.add(s);
-                break;
-              } // case 42
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.ContextRule) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1791,18 +1849,7 @@ public ContextRule parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ContextRule(input, extensionRegistry);
         }
       };
 
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 e2533a7a88..e874b81ada 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
@@ -57,6 +57,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Control(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              environment_ = s;
+              break;
+            }
+          case 34:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                methodPolicies_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              methodPolicies_.add(
+                  input.readMessage(com.google.api.MethodPolicy.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        methodPolicies_ = java.util.Collections.unmodifiableList(methodPolicies_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ControlProto.internal_static_google_api_Control_descriptor;
   }
@@ -218,7 +278,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < methodPolicies_.size(); i++) {
       output.writeMessage(4, methodPolicies_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -233,7 +293,7 @@ public int getSerializedSize() {
     for (int i = 0; i < methodPolicies_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, methodPolicies_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -250,7 +310,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getEnvironment().equals(other.getEnvironment())) return false;
     if (!getMethodPoliciesList().equals(other.getMethodPoliciesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -267,7 +327,7 @@ public int hashCode() {
       hash = (37 * hash) + METHOD_POLICIES_FIELD_NUMBER;
       hash = (53 * hash) + getMethodPoliciesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -396,10 +456,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Control.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getMethodPoliciesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -409,11 +478,10 @@ public Builder clear() {
 
       if (methodPoliciesBuilder_ == null) {
         methodPolicies_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        methodPolicies_ = null;
         methodPoliciesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -530,7 +598,7 @@ public Builder mergeFrom(com.google.api.Control other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -545,49 +613,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Control parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                environment_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 34:
-              {
-                com.google.api.MethodPolicy m =
-                    input.readMessage(com.google.api.MethodPolicy.parser(), extensionRegistry);
-                if (methodPoliciesBuilder_ == null) {
-                  ensureMethodPoliciesIsMutable();
-                  methodPolicies_.add(m);
-                } else {
-                  methodPoliciesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Control) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1114,18 +1150,7 @@ public Control parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Control(input, extensionRegistry);
         }
       };
 
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 76a83b6bc0..ccd8b95863 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
@@ -51,6 +51,61 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CppSettings(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.api.CommonLanguageSettings.Builder subBuilder = null;
+              if (common_ != null) {
+                subBuilder = common_.toBuilder();
+              }
+              common_ =
+                  input.readMessage(
+                      com.google.api.CommonLanguageSettings.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(common_);
+                common_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_CppSettings_descriptor;
   }
@@ -129,7 +184,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (common_ != null) {
       output.writeMessage(1, getCommon());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -141,7 +196,7 @@ public int getSerializedSize() {
     if (common_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCommon());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -160,7 +215,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasCommon()) {
       if (!getCommon().equals(other.getCommon())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -175,7 +230,7 @@ public int hashCode() {
       hash = (37 * hash) + COMMON_FIELD_NUMBER;
       hash = (53 * hash) + getCommon().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -301,10 +356,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.CppSettings.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -398,7 +460,7 @@ public Builder mergeFrom(com.google.api.CppSettings other) {
       if (other.hasCommon()) {
         mergeCommon(other.getCommon());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -413,37 +475,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.CppSettings parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.CppSettings) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -673,18 +715,7 @@ public CppSettings parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new CppSettings(input, extensionRegistry);
         }
       };
 
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 9cd8f43666..9bc7294a51 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
@@ -54,6 +54,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CustomHttpPattern(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              kind_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              path_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.HttpProto.internal_static_google_api_CustomHttpPattern_descriptor;
   }
@@ -188,7 +241,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(path_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, path_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -203,7 +256,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(path_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, path_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -220,7 +273,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getKind().equals(other.getKind())) return false;
     if (!getPath().equals(other.getPath())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -235,7 +288,7 @@ public int hashCode() {
     hash = (53 * hash) + getKind().hashCode();
     hash = (37 * hash) + PATH_FIELD_NUMBER;
     hash = (53 * hash) + getPath().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -363,10 +416,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.CustomHttpPattern.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -460,7 +520,7 @@ public Builder mergeFrom(com.google.api.CustomHttpPattern other) {
         path_ = other.path_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -475,43 +535,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.CustomHttpPattern parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                kind_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                path_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.CustomHttpPattern) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -769,18 +803,7 @@ public CustomHttpPattern parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new CustomHttpPattern(input, extensionRegistry);
         }
       };
 
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 9b249a9586..ae762a1d95 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
@@ -65,6 +65,132 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Distribution(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              count_ = input.readInt64();
+              break;
+            }
+          case 17:
+            {
+              mean_ = input.readDouble();
+              break;
+            }
+          case 25:
+            {
+              sumOfSquaredDeviation_ = input.readDouble();
+              break;
+            }
+          case 34:
+            {
+              com.google.api.Distribution.Range.Builder subBuilder = null;
+              if (range_ != null) {
+                subBuilder = range_.toBuilder();
+              }
+              range_ =
+                  input.readMessage(com.google.api.Distribution.Range.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(range_);
+                range_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 50:
+            {
+              com.google.api.Distribution.BucketOptions.Builder subBuilder = null;
+              if (bucketOptions_ != null) {
+                subBuilder = bucketOptions_.toBuilder();
+              }
+              bucketOptions_ =
+                  input.readMessage(
+                      com.google.api.Distribution.BucketOptions.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(bucketOptions_);
+                bucketOptions_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 56:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                bucketCounts_ = newLongList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              bucketCounts_.addLong(input.readInt64());
+              break;
+            }
+          case 58:
+            {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                bucketCounts_ = newLongList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                bucketCounts_.addLong(input.readInt64());
+              }
+              input.popLimit(limit);
+              break;
+            }
+          case 82:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                exemplars_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              exemplars_.add(
+                  input.readMessage(
+                      com.google.api.Distribution.Exemplar.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        bucketCounts_.makeImmutable(); // C
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        exemplars_ = java.util.Collections.unmodifiableList(exemplars_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.DistributionProto.internal_static_google_api_Distribution_descriptor;
   }
@@ -143,6 +269,55 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Range(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 9:
+              {
+                min_ = input.readDouble();
+                break;
+              }
+            case 17:
+              {
+                max_ = input.readDouble();
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.api.DistributionProto
           .internal_static_google_api_Distribution_Range_descriptor;
@@ -216,7 +391,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (java.lang.Double.doubleToRawLongBits(max_) != 0) {
         output.writeDouble(2, max_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -231,7 +406,7 @@ public int getSerializedSize() {
       if (java.lang.Double.doubleToRawLongBits(max_) != 0) {
         size += com.google.protobuf.CodedOutputStream.computeDoubleSize(2, max_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -250,7 +425,7 @@ public boolean equals(final java.lang.Object obj) {
           != java.lang.Double.doubleToLongBits(other.getMin())) return false;
       if (java.lang.Double.doubleToLongBits(getMax())
           != java.lang.Double.doubleToLongBits(other.getMax())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -269,7 +444,7 @@ public int hashCode() {
       hash =
           (53 * hash)
               + com.google.protobuf.Internal.hashLong(java.lang.Double.doubleToLongBits(getMax()));
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -400,10 +575,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.api.Distribution.Range.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -498,7 +680,7 @@ public Builder mergeFrom(com.google.api.Distribution.Range other) {
         if (other.getMax() != 0D) {
           setMax(other.getMax());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -513,43 +695,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.api.Distribution.Range parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 9:
-                {
-                  min_ = input.readDouble();
-
-                  break;
-                } // case 9
-              case 17:
-                {
-                  max_ = input.readDouble();
-
-                  break;
-                } // case 17
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.api.Distribution.Range) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -696,19 +852,7 @@ public Range parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Range(input, extensionRegistry);
           }
         };
 
@@ -892,6 +1036,102 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private BucketOptions(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.api.Distribution.BucketOptions.Linear.Builder subBuilder = null;
+                if (optionsCase_ == 1) {
+                  subBuilder =
+                      ((com.google.api.Distribution.BucketOptions.Linear) options_).toBuilder();
+                }
+                options_ =
+                    input.readMessage(
+                        com.google.api.Distribution.BucketOptions.Linear.parser(),
+                        extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom((com.google.api.Distribution.BucketOptions.Linear) options_);
+                  options_ = subBuilder.buildPartial();
+                }
+                optionsCase_ = 1;
+                break;
+              }
+            case 18:
+              {
+                com.google.api.Distribution.BucketOptions.Exponential.Builder subBuilder = null;
+                if (optionsCase_ == 2) {
+                  subBuilder =
+                      ((com.google.api.Distribution.BucketOptions.Exponential) options_)
+                          .toBuilder();
+                }
+                options_ =
+                    input.readMessage(
+                        com.google.api.Distribution.BucketOptions.Exponential.parser(),
+                        extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(
+                      (com.google.api.Distribution.BucketOptions.Exponential) options_);
+                  options_ = subBuilder.buildPartial();
+                }
+                optionsCase_ = 2;
+                break;
+              }
+            case 26:
+              {
+                com.google.api.Distribution.BucketOptions.Explicit.Builder subBuilder = null;
+                if (optionsCase_ == 3) {
+                  subBuilder =
+                      ((com.google.api.Distribution.BucketOptions.Explicit) options_).toBuilder();
+                }
+                options_ =
+                    input.readMessage(
+                        com.google.api.Distribution.BucketOptions.Explicit.parser(),
+                        extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(
+                      (com.google.api.Distribution.BucketOptions.Explicit) options_);
+                  options_ = subBuilder.buildPartial();
+                }
+                optionsCase_ = 3;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.api.DistributionProto
           .internal_static_google_api_Distribution_BucketOptions_descriptor;
@@ -991,6 +1231,61 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
         return this.unknownFields;
       }
 
+      private Linear(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        this();
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+            com.google.protobuf.UnknownFieldSet.newBuilder();
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8:
+                {
+                  numFiniteBuckets_ = input.readInt32();
+                  break;
+                }
+              case 17:
+                {
+                  width_ = input.readDouble();
+                  break;
+                }
+              case 25:
+                {
+                  offset_ = input.readDouble();
+                  break;
+                }
+              default:
+                {
+                  if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                    done = true;
+                  }
+                  break;
+                }
+            }
+          }
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(this);
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(this);
+        } finally {
+          this.unknownFields = unknownFields.build();
+          makeExtensionsImmutable();
+        }
+      }
+
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return com.google.api.DistributionProto
             .internal_static_google_api_Distribution_BucketOptions_Linear_descriptor;
@@ -1086,7 +1381,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         if (java.lang.Double.doubleToRawLongBits(offset_) != 0) {
           output.writeDouble(3, offset_);
         }
-        getUnknownFields().writeTo(output);
+        unknownFields.writeTo(output);
       }
 
       @java.lang.Override
@@ -1104,7 +1399,7 @@ public int getSerializedSize() {
         if (java.lang.Double.doubleToRawLongBits(offset_) != 0) {
           size += com.google.protobuf.CodedOutputStream.computeDoubleSize(3, offset_);
         }
-        size += getUnknownFields().getSerializedSize();
+        size += unknownFields.getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -1125,7 +1420,7 @@ public boolean equals(final java.lang.Object obj) {
             != java.lang.Double.doubleToLongBits(other.getWidth())) return false;
         if (java.lang.Double.doubleToLongBits(getOffset())
             != java.lang.Double.doubleToLongBits(other.getOffset())) return false;
-        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+        if (!unknownFields.equals(other.unknownFields)) return false;
         return true;
       }
 
@@ -1148,7 +1443,7 @@ public int hashCode() {
             (53 * hash)
                 + com.google.protobuf.Internal.hashLong(
                     java.lang.Double.doubleToLongBits(getOffset()));
-        hash = (29 * hash) + getUnknownFields().hashCode();
+        hash = (29 * hash) + unknownFields.hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -1286,10 +1581,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         }
 
         // Construct using com.google.api.Distribution.BucketOptions.Linear.newBuilder()
-        private Builder() {}
+        private Builder() {
+          maybeForceBuilderInitialization();
+        }
 
         private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
+          maybeForceBuilderInitialization();
+        }
+
+        private void maybeForceBuilderInitialization() {
+          if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
         }
 
         @java.lang.Override
@@ -1392,7 +1694,7 @@ public Builder mergeFrom(com.google.api.Distribution.BucketOptions.Linear other)
           if (other.getOffset() != 0D) {
             setOffset(other.getOffset());
           }
-          this.mergeUnknownFields(other.getUnknownFields());
+          this.mergeUnknownFields(other.unknownFields);
           onChanged();
           return this;
         }
@@ -1407,49 +1709,18 @@ public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
+          com.google.api.Distribution.BucketOptions.Linear parsedMessage = null;
           try {
-            boolean done = false;
-            while (!done) {
-              int tag = input.readTag();
-              switch (tag) {
-                case 0:
-                  done = true;
-                  break;
-                case 8:
-                  {
-                    numFiniteBuckets_ = input.readInt32();
-
-                    break;
-                  } // case 8
-                case 17:
-                  {
-                    width_ = input.readDouble();
-
-                    break;
-                  } // case 17
-                case 25:
-                  {
-                    offset_ = input.readDouble();
-
-                    break;
-                  } // case 25
-                default:
-                  {
-                    if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                      done = true; // was an endgroup tag
-                    }
-                    break;
-                  } // default:
-              } // switch (tag)
-            } // while (!done)
+            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            parsedMessage =
+                (com.google.api.Distribution.BucketOptions.Linear) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            onChanged();
-          } // finally
+            if (parsedMessage != null) {
+              mergeFrom(parsedMessage);
+            }
+          }
           return this;
         }
 
@@ -1651,19 +1922,7 @@ public Linear parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new Linear(input, extensionRegistry);
             }
           };
 
@@ -1766,6 +2025,61 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
         return this.unknownFields;
       }
 
+      private Exponential(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        this();
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+            com.google.protobuf.UnknownFieldSet.newBuilder();
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8:
+                {
+                  numFiniteBuckets_ = input.readInt32();
+                  break;
+                }
+              case 17:
+                {
+                  growthFactor_ = input.readDouble();
+                  break;
+                }
+              case 25:
+                {
+                  scale_ = input.readDouble();
+                  break;
+                }
+              default:
+                {
+                  if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                    done = true;
+                  }
+                  break;
+                }
+            }
+          }
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(this);
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(this);
+        } finally {
+          this.unknownFields = unknownFields.build();
+          makeExtensionsImmutable();
+        }
+      }
+
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return com.google.api.DistributionProto
             .internal_static_google_api_Distribution_BucketOptions_Exponential_descriptor;
@@ -1861,7 +2175,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         if (java.lang.Double.doubleToRawLongBits(scale_) != 0) {
           output.writeDouble(3, scale_);
         }
-        getUnknownFields().writeTo(output);
+        unknownFields.writeTo(output);
       }
 
       @java.lang.Override
@@ -1879,7 +2193,7 @@ public int getSerializedSize() {
         if (java.lang.Double.doubleToRawLongBits(scale_) != 0) {
           size += com.google.protobuf.CodedOutputStream.computeDoubleSize(3, scale_);
         }
-        size += getUnknownFields().getSerializedSize();
+        size += unknownFields.getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -1900,7 +2214,7 @@ public boolean equals(final java.lang.Object obj) {
             != java.lang.Double.doubleToLongBits(other.getGrowthFactor())) return false;
         if (java.lang.Double.doubleToLongBits(getScale())
             != java.lang.Double.doubleToLongBits(other.getScale())) return false;
-        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+        if (!unknownFields.equals(other.unknownFields)) return false;
         return true;
       }
 
@@ -1923,7 +2237,7 @@ public int hashCode() {
             (53 * hash)
                 + com.google.protobuf.Internal.hashLong(
                     java.lang.Double.doubleToLongBits(getScale()));
-        hash = (29 * hash) + getUnknownFields().hashCode();
+        hash = (29 * hash) + unknownFields.hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -2062,10 +2376,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         }
 
         // Construct using com.google.api.Distribution.BucketOptions.Exponential.newBuilder()
-        private Builder() {}
+        private Builder() {
+          maybeForceBuilderInitialization();
+        }
 
         private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
+          maybeForceBuilderInitialization();
+        }
+
+        private void maybeForceBuilderInitialization() {
+          if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
         }
 
         @java.lang.Override
@@ -2168,7 +2489,7 @@ public Builder mergeFrom(com.google.api.Distribution.BucketOptions.Exponential o
           if (other.getScale() != 0D) {
             setScale(other.getScale());
           }
-          this.mergeUnknownFields(other.getUnknownFields());
+          this.mergeUnknownFields(other.unknownFields);
           onChanged();
           return this;
         }
@@ -2183,49 +2504,18 @@ public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
+          com.google.api.Distribution.BucketOptions.Exponential parsedMessage = null;
           try {
-            boolean done = false;
-            while (!done) {
-              int tag = input.readTag();
-              switch (tag) {
-                case 0:
-                  done = true;
-                  break;
-                case 8:
-                  {
-                    numFiniteBuckets_ = input.readInt32();
-
-                    break;
-                  } // case 8
-                case 17:
-                  {
-                    growthFactor_ = input.readDouble();
-
-                    break;
-                  } // case 17
-                case 25:
-                  {
-                    scale_ = input.readDouble();
-
-                    break;
-                  } // case 25
-                default:
-                  {
-                    if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                      done = true; // was an endgroup tag
-                    }
-                    break;
-                  } // default:
-              } // switch (tag)
-            } // while (!done)
+            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            parsedMessage =
+                (com.google.api.Distribution.BucketOptions.Exponential) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            onChanged();
-          } // finally
+            if (parsedMessage != null) {
+              mergeFrom(parsedMessage);
+            }
+          }
           return this;
         }
 
@@ -2427,19 +2717,7 @@ public Exponential parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new Exponential(input, extensionRegistry);
             }
           };
 
@@ -2546,6 +2824,73 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
         return this.unknownFields;
       }
 
+      private Explicit(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        this();
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        int mutable_bitField0_ = 0;
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+            com.google.protobuf.UnknownFieldSet.newBuilder();
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 9:
+                {
+                  if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                    bounds_ = newDoubleList();
+                    mutable_bitField0_ |= 0x00000001;
+                  }
+                  bounds_.addDouble(input.readDouble());
+                  break;
+                }
+              case 10:
+                {
+                  int length = input.readRawVarint32();
+                  int limit = input.pushLimit(length);
+                  if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                    bounds_ = newDoubleList();
+                    mutable_bitField0_ |= 0x00000001;
+                  }
+                  while (input.getBytesUntilLimit() > 0) {
+                    bounds_.addDouble(input.readDouble());
+                  }
+                  input.popLimit(limit);
+                  break;
+                }
+              default:
+                {
+                  if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                    done = true;
+                  }
+                  break;
+                }
+            }
+          }
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(this);
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(this);
+        } finally {
+          if (((mutable_bitField0_ & 0x00000001) != 0)) {
+            bounds_.makeImmutable(); // C
+          }
+          this.unknownFields = unknownFields.build();
+          makeExtensionsImmutable();
+        }
+      }
+
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return com.google.api.DistributionProto
             .internal_static_google_api_Distribution_BucketOptions_Explicit_descriptor;
@@ -2635,7 +2980,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         for (int i = 0; i < bounds_.size(); i++) {
           output.writeDoubleNoTag(bounds_.getDouble(i));
         }
-        getUnknownFields().writeTo(output);
+        unknownFields.writeTo(output);
       }
 
       @java.lang.Override
@@ -2654,7 +2999,7 @@ public int getSerializedSize() {
           }
           boundsMemoizedSerializedSize = dataSize;
         }
-        size += getUnknownFields().getSerializedSize();
+        size += unknownFields.getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -2671,7 +3016,7 @@ public boolean equals(final java.lang.Object obj) {
             (com.google.api.Distribution.BucketOptions.Explicit) obj;
 
         if (!getBoundsList().equals(other.getBoundsList())) return false;
-        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+        if (!unknownFields.equals(other.unknownFields)) return false;
         return true;
       }
 
@@ -2686,7 +3031,7 @@ public int hashCode() {
           hash = (37 * hash) + BOUNDS_FIELD_NUMBER;
           hash = (53 * hash) + getBoundsList().hashCode();
         }
-        hash = (29 * hash) + getUnknownFields().hashCode();
+        hash = (29 * hash) + unknownFields.hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -2826,10 +3171,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         }
 
         // Construct using com.google.api.Distribution.BucketOptions.Explicit.newBuilder()
-        private Builder() {}
+        private Builder() {
+          maybeForceBuilderInitialization();
+        }
 
         private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
+          maybeForceBuilderInitialization();
+        }
+
+        private void maybeForceBuilderInitialization() {
+          if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
         }
 
         @java.lang.Override
@@ -2932,7 +3284,7 @@ public Builder mergeFrom(com.google.api.Distribution.BucketOptions.Explicit othe
             }
             onChanged();
           }
-          this.mergeUnknownFields(other.getUnknownFields());
+          this.mergeUnknownFields(other.unknownFields);
           onChanged();
           return this;
         }
@@ -2947,49 +3299,18 @@ public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
+          com.google.api.Distribution.BucketOptions.Explicit parsedMessage = null;
           try {
-            boolean done = false;
-            while (!done) {
-              int tag = input.readTag();
-              switch (tag) {
-                case 0:
-                  done = true;
-                  break;
-                case 9:
-                  {
-                    double v = input.readDouble();
-                    ensureBoundsIsMutable();
-                    bounds_.addDouble(v);
-                    break;
-                  } // case 9
-                case 10:
-                  {
-                    int length = input.readRawVarint32();
-                    int limit = input.pushLimit(length);
-                    ensureBoundsIsMutable();
-                    while (input.getBytesUntilLimit() > 0) {
-                      bounds_.addDouble(input.readDouble());
-                    }
-                    input.popLimit(limit);
-                    break;
-                  } // case 10
-                default:
-                  {
-                    if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                      done = true; // was an endgroup tag
-                    }
-                    break;
-                  } // default:
-              } // switch (tag)
-            } // while (!done)
+            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            parsedMessage =
+                (com.google.api.Distribution.BucketOptions.Explicit) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            onChanged();
-          } // finally
+            if (parsedMessage != null) {
+              mergeFrom(parsedMessage);
+            }
+          }
           return this;
         }
 
@@ -3161,19 +3482,7 @@ public Explicit parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new Explicit(input, extensionRegistry);
             }
           };
 
@@ -3430,7 +3739,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (optionsCase_ == 3) {
         output.writeMessage(3, (com.google.api.Distribution.BucketOptions.Explicit) options_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -3454,7 +3763,7 @@ public int getSerializedSize() {
             com.google.protobuf.CodedOutputStream.computeMessageSize(
                 3, (com.google.api.Distribution.BucketOptions.Explicit) options_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3484,7 +3793,7 @@ public boolean equals(final java.lang.Object obj) {
         case 0:
         default:
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -3511,7 +3820,7 @@ public int hashCode() {
         case 0:
         default:
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3656,24 +3965,22 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.api.Distribution.BucketOptions.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (linearBucketsBuilder_ != null) {
-          linearBucketsBuilder_.clear();
-        }
-        if (exponentialBucketsBuilder_ != null) {
-          exponentialBucketsBuilder_.clear();
-        }
-        if (explicitBucketsBuilder_ != null) {
-          explicitBucketsBuilder_.clear();
-        }
         optionsCase_ = 0;
         options_ = null;
         return this;
@@ -3797,7 +4104,7 @@ public Builder mergeFrom(com.google.api.Distribution.BucketOptions other) {
               break;
             }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -3812,51 +4119,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.api.Distribution.BucketOptions parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  input.readMessage(getLinearBucketsFieldBuilder().getBuilder(), extensionRegistry);
-                  optionsCase_ = 1;
-                  break;
-                } // case 10
-              case 18:
-                {
-                  input.readMessage(
-                      getExponentialBucketsFieldBuilder().getBuilder(), extensionRegistry);
-                  optionsCase_ = 2;
-                  break;
-                } // case 18
-              case 26:
-                {
-                  input.readMessage(
-                      getExplicitBucketsFieldBuilder().getBuilder(), extensionRegistry);
-                  optionsCase_ = 3;
-                  break;
-                } // case 26
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.api.Distribution.BucketOptions) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -4574,19 +4847,7 @@ public BucketOptions parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new BucketOptions(input, extensionRegistry);
           }
         };
 
@@ -4786,6 +5047,79 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Exemplar(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 9:
+              {
+                value_ = input.readDouble();
+                break;
+              }
+            case 18:
+              {
+                com.google.protobuf.Timestamp.Builder subBuilder = null;
+                if (timestamp_ != null) {
+                  subBuilder = timestamp_.toBuilder();
+                }
+                timestamp_ =
+                    input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(timestamp_);
+                  timestamp_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 26:
+              {
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  attachments_ = new java.util.ArrayList();
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                attachments_.add(
+                    input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry));
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          attachments_ = java.util.Collections.unmodifiableList(attachments_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.api.DistributionProto
           .internal_static_google_api_Distribution_Exemplar_descriptor;
@@ -4997,7 +5331,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       for (int i = 0; i < attachments_.size(); i++) {
         output.writeMessage(3, attachments_.get(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -5015,7 +5349,7 @@ public int getSerializedSize() {
       for (int i = 0; i < attachments_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, attachments_.get(i));
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5037,7 +5371,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getTimestamp().equals(other.getTimestamp())) return false;
       }
       if (!getAttachmentsList().equals(other.getAttachmentsList())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -5061,7 +5395,7 @@ public int hashCode() {
         hash = (37 * hash) + ATTACHMENTS_FIELD_NUMBER;
         hash = (53 * hash) + getAttachmentsList().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5197,10 +5531,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.api.Distribution.Exemplar.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+          getAttachmentsFieldBuilder();
+        }
       }
 
       @java.lang.Override
@@ -5216,11 +5559,10 @@ public Builder clear() {
         }
         if (attachmentsBuilder_ == null) {
           attachments_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
-          attachments_ = null;
           attachmentsBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -5348,7 +5690,7 @@ public Builder mergeFrom(com.google.api.Distribution.Exemplar other) {
             }
           }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -5363,55 +5705,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.api.Distribution.Exemplar parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 9:
-                {
-                  value_ = input.readDouble();
-
-                  break;
-                } // case 9
-              case 18:
-                {
-                  input.readMessage(getTimestampFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 18
-              case 26:
-                {
-                  com.google.protobuf.Any m =
-                      input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry);
-                  if (attachmentsBuilder_ == null) {
-                    ensureAttachmentsIsMutable();
-                    attachments_.add(m);
-                  } else {
-                    attachmentsBuilder_.addMessage(m);
-                  }
-                  break;
-                } // case 26
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.api.Distribution.Exemplar) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -6176,19 +6480,7 @@ public Exemplar parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Exemplar(input, extensionRegistry);
           }
         };
 
@@ -6580,7 +6872,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < exemplars_.size(); i++) {
       output.writeMessage(10, exemplars_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -6620,7 +6912,7 @@ public int getSerializedSize() {
     for (int i = 0; i < exemplars_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, exemplars_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -6650,7 +6942,7 @@ public boolean equals(final java.lang.Object obj) {
     }
     if (!getBucketCountsList().equals(other.getBucketCountsList())) return false;
     if (!getExemplarsList().equals(other.getExemplarsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -6688,7 +6980,7 @@ public int hashCode() {
       hash = (37 * hash) + EXEMPLARS_FIELD_NUMBER;
       hash = (53 * hash) + getExemplarsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -6826,10 +7118,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Distribution.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getExemplarsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -6857,11 +7158,10 @@ public Builder clear() {
       bitField0_ = (bitField0_ & ~0x00000001);
       if (exemplarsBuilder_ == null) {
         exemplars_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
-        exemplars_ = null;
         exemplarsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -7016,7 +7316,7 @@ public Builder mergeFrom(com.google.api.Distribution other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -7031,92 +7331,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Distribution parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                count_ = input.readInt64();
-
-                break;
-              } // case 8
-            case 17:
-              {
-                mean_ = input.readDouble();
-
-                break;
-              } // case 17
-            case 25:
-              {
-                sumOfSquaredDeviation_ = input.readDouble();
-
-                break;
-              } // case 25
-            case 34:
-              {
-                input.readMessage(getRangeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 34
-            case 50:
-              {
-                input.readMessage(getBucketOptionsFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 50
-            case 56:
-              {
-                long v = input.readInt64();
-                ensureBucketCountsIsMutable();
-                bucketCounts_.addLong(v);
-                break;
-              } // case 56
-            case 58:
-              {
-                int length = input.readRawVarint32();
-                int limit = input.pushLimit(length);
-                ensureBucketCountsIsMutable();
-                while (input.getBytesUntilLimit() > 0) {
-                  bucketCounts_.addLong(input.readInt64());
-                }
-                input.popLimit(limit);
-                break;
-              } // case 58
-            case 82:
-              {
-                com.google.api.Distribution.Exemplar m =
-                    input.readMessage(
-                        com.google.api.Distribution.Exemplar.parser(), extensionRegistry);
-                if (exemplarsBuilder_ == null) {
-                  ensureExemplarsIsMutable();
-                  exemplars_.add(m);
-                } else {
-                  exemplarsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 82
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Distribution) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -8326,18 +8551,7 @@ public Distribution parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Distribution(input, extensionRegistry);
         }
       };
 
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 ef8724cecb..f7903af8cb 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
@@ -107,6 +107,99 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Documentation(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              summary_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              overview_ = s;
+              break;
+            }
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                rules_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              rules_.add(
+                  input.readMessage(com.google.api.DocumentationRule.parser(), extensionRegistry));
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              documentationRootUrl_ = s;
+              break;
+            }
+          case 42:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                pages_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              pages_.add(input.readMessage(com.google.api.Page.parser(), extensionRegistry));
+              break;
+            }
+          case 50:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              serviceRootUrl_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        rules_ = java.util.Collections.unmodifiableList(rules_);
+      }
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        pages_ = java.util.Collections.unmodifiableList(pages_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.DocumentationProto.internal_static_google_api_Documentation_descriptor;
   }
@@ -544,7 +637,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceRootUrl_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 6, serviceRootUrl_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -571,7 +664,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceRootUrl_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, serviceRootUrl_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -592,7 +685,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getDocumentationRootUrl().equals(other.getDocumentationRootUrl())) return false;
     if (!getServiceRootUrl().equals(other.getServiceRootUrl())) return false;
     if (!getOverview().equals(other.getOverview())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -619,7 +712,7 @@ public int hashCode() {
     hash = (53 * hash) + getServiceRootUrl().hashCode();
     hash = (37 * hash) + OVERVIEW_FIELD_NUMBER;
     hash = (53 * hash) + getOverview().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -795,10 +888,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Documentation.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPagesFieldBuilder();
+        getRulesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -808,18 +911,16 @@ public Builder clear() {
 
       if (pagesBuilder_ == null) {
         pages_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        pages_ = null;
         pagesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
-        rules_ = null;
         rulesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
       documentationRootUrl_ = "";
 
       serviceRootUrl_ = "";
@@ -993,7 +1094,7 @@ public Builder mergeFrom(com.google.api.Documentation other) {
         overview_ = other.overview_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1008,79 +1109,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Documentation parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                summary_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                overview_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                com.google.api.DocumentationRule m =
-                    input.readMessage(com.google.api.DocumentationRule.parser(), extensionRegistry);
-                if (rulesBuilder_ == null) {
-                  ensureRulesIsMutable();
-                  rules_.add(m);
-                } else {
-                  rulesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 26
-            case 34:
-              {
-                documentationRootUrl_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            case 42:
-              {
-                com.google.api.Page m =
-                    input.readMessage(com.google.api.Page.parser(), extensionRegistry);
-                if (pagesBuilder_ == null) {
-                  ensurePagesIsMutable();
-                  pages_.add(m);
-                } else {
-                  pagesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 42
-            case 50:
-              {
-                serviceRootUrl_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 50
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Documentation) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2385,18 +2424,7 @@ public Documentation parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Documentation(input, extensionRegistry);
         }
       };
 
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 0201fa3bfb..67514c7927 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
@@ -55,6 +55,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DocumentationRule(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              selector_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              description_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              deprecationDescription_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.DocumentationProto
         .internal_static_google_api_DocumentationRule_descriptor;
@@ -263,7 +323,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(deprecationDescription_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, deprecationDescription_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -281,7 +341,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(deprecationDescription_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, deprecationDescription_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -299,7 +359,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getSelector().equals(other.getSelector())) return false;
     if (!getDescription().equals(other.getDescription())) return false;
     if (!getDeprecationDescription().equals(other.getDeprecationDescription())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -316,7 +376,7 @@ public int hashCode() {
     hash = (53 * hash) + getDescription().hashCode();
     hash = (37 * hash) + DEPRECATION_DESCRIPTION_FIELD_NUMBER;
     hash = (53 * hash) + getDeprecationDescription().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -445,10 +505,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.DocumentationRule.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -550,7 +617,7 @@ public Builder mergeFrom(com.google.api.DocumentationRule other) {
         deprecationDescription_ = other.deprecationDescription_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -565,49 +632,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.DocumentationRule parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                selector_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                description_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                deprecationDescription_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.DocumentationRule) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1021,18 +1056,7 @@ public DocumentationRule parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DocumentationRule(input, extensionRegistry);
         }
       };
 
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 e5c685794d..036ce01fb8 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
@@ -55,6 +55,135 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DotnetSettings(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.api.CommonLanguageSettings.Builder subBuilder = null;
+              if (common_ != null) {
+                subBuilder = common_.toBuilder();
+              }
+              common_ =
+                  input.readMessage(
+                      com.google.api.CommonLanguageSettings.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(common_);
+                common_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                renamedServices_ =
+                    com.google.protobuf.MapField.newMapField(
+                        RenamedServicesDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry renamedServices__ =
+                  input.readMessage(
+                      RenamedServicesDefaultEntryHolder.defaultEntry.getParserForType(),
+                      extensionRegistry);
+              renamedServices_
+                  .getMutableMap()
+                  .put(renamedServices__.getKey(), renamedServices__.getValue());
+              break;
+            }
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                renamedResources_ =
+                    com.google.protobuf.MapField.newMapField(
+                        RenamedResourcesDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000002;
+              }
+              com.google.protobuf.MapEntry renamedResources__ =
+                  input.readMessage(
+                      RenamedResourcesDefaultEntryHolder.defaultEntry.getParserForType(),
+                      extensionRegistry);
+              renamedResources_
+                  .getMutableMap()
+                  .put(renamedResources__.getKey(), renamedResources__.getValue());
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                ignoredResources_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              ignoredResources_.add(s);
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                forcedNamespaceAliases_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              forcedNamespaceAliases_.add(s);
+              break;
+            }
+          case 50:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
+                handwrittenSignatures_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000010;
+              }
+              handwrittenSignatures_.add(s);
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000004) != 0)) {
+        ignoredResources_ = ignoredResources_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000008) != 0)) {
+        forcedNamespaceAliases_ = forcedNamespaceAliases_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000010) != 0)) {
+        handwrittenSignatures_ = handwrittenSignatures_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_DotnetSettings_descriptor;
   }
@@ -628,7 +757,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       com.google.protobuf.GeneratedMessageV3.writeString(
           output, 6, handwrittenSignatures_.getRaw(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -684,7 +813,7 @@ public int getSerializedSize() {
       size += dataSize;
       size += 1 * getHandwrittenSignaturesList().size();
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -709,7 +838,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getForcedNamespaceAliasesList().equals(other.getForcedNamespaceAliasesList()))
       return false;
     if (!getHandwrittenSignaturesList().equals(other.getHandwrittenSignaturesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -744,7 +873,7 @@ public int hashCode() {
       hash = (37 * hash) + HANDWRITTEN_SIGNATURES_FIELD_NUMBER;
       hash = (53 * hash) + getHandwrittenSignaturesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -894,10 +1023,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.api.DotnetSettings.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1051,7 +1187,7 @@ public Builder mergeFrom(com.google.api.DotnetSettings other) {
         }
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1066,81 +1202,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.DotnetSettings parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.protobuf.MapEntry renamedServices__ =
-                    input.readMessage(
-                        RenamedServicesDefaultEntryHolder.defaultEntry.getParserForType(),
-                        extensionRegistry);
-                internalGetMutableRenamedServices()
-                    .getMutableMap()
-                    .put(renamedServices__.getKey(), renamedServices__.getValue());
-                break;
-              } // case 18
-            case 26:
-              {
-                com.google.protobuf.MapEntry
-                    renamedResources__ =
-                        input.readMessage(
-                            RenamedResourcesDefaultEntryHolder.defaultEntry.getParserForType(),
-                            extensionRegistry);
-                internalGetMutableRenamedResources()
-                    .getMutableMap()
-                    .put(renamedResources__.getKey(), renamedResources__.getValue());
-                break;
-              } // case 26
-            case 34:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureIgnoredResourcesIsMutable();
-                ignoredResources_.add(s);
-                break;
-              } // case 34
-            case 42:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureForcedNamespaceAliasesIsMutable();
-                forcedNamespaceAliases_.add(s);
-                break;
-              } // case 42
-            case 50:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureHandwrittenSignaturesIsMutable();
-                handwrittenSignatures_.add(s);
-                break;
-              } // case 50
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.DotnetSettings) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2369,18 +2441,7 @@ public DotnetSettings parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DotnetSettings(input, extensionRegistry);
         }
       };
 
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 84bb418381..f00019f14a 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
@@ -73,6 +73,78 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Endpoint(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                aliases_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              aliases_.add(s);
+              break;
+            }
+          case 40:
+            {
+              allowCors_ = input.readBool();
+              break;
+            }
+          case 810:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              target_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        aliases_ = aliases_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.EndpointProto.internal_static_google_api_Endpoint_descriptor;
   }
@@ -318,7 +390,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(target_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 101, target_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -344,7 +416,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(target_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(101, target_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -363,7 +435,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getAliasesList().equals(other.getAliasesList())) return false;
     if (!getTarget().equals(other.getTarget())) return false;
     if (getAllowCors() != other.getAllowCors()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -384,7 +456,7 @@ public int hashCode() {
     hash = (53 * hash) + getTarget().hashCode();
     hash = (37 * hash) + ALLOW_CORS_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getAllowCors());
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -528,10 +600,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Endpoint.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -649,7 +728,7 @@ public Builder mergeFrom(com.google.api.Endpoint other) {
       if (other.getAllowCors() != false) {
         setAllowCors(other.getAllowCors());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -664,56 +743,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Endpoint parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureAliasesIsMutable();
-                aliases_.add(s);
-                break;
-              } // case 18
-            case 40:
-              {
-                allowCors_ = input.readBool();
-
-                break;
-              } // case 40
-            case 810:
-              {
-                target_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 810
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Endpoint) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1258,18 +1298,7 @@ public Endpoint parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Endpoint(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfo.java
index ead04cf29b..b3ea4b72aa 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfo.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfo.java
@@ -54,6 +54,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private FieldInfo(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              int rawValue = input.readEnum();
+
+              format_ = rawValue;
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                referencedTypes_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              referencedTypes_.add(
+                  input.readMessage(com.google.api.TypeReference.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        referencedTypes_ = java.util.Collections.unmodifiableList(referencedTypes_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.FieldInfoProto.internal_static_google_api_FieldInfo_descriptor;
   }
@@ -443,7 +503,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < referencedTypes_.size(); i++) {
       output.writeMessage(2, referencedTypes_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -458,7 +518,7 @@ public int getSerializedSize() {
     for (int i = 0; i < referencedTypes_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, referencedTypes_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -475,7 +535,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (format_ != other.format_) return false;
     if (!getReferencedTypesList().equals(other.getReferencedTypesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -492,7 +552,7 @@ public int hashCode() {
       hash = (37 * hash) + REFERENCED_TYPES_FIELD_NUMBER;
       hash = (53 * hash) + getReferencedTypesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -618,10 +678,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.FieldInfo.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getReferencedTypesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -631,11 +700,10 @@ public Builder clear() {
 
       if (referencedTypesBuilder_ == null) {
         referencedTypes_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        referencedTypes_ = null;
         referencedTypesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -751,7 +819,7 @@ public Builder mergeFrom(com.google.api.FieldInfo other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -766,49 +834,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.FieldInfo parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                format_ = input.readEnum();
-
-                break;
-              } // case 8
-            case 18:
-              {
-                com.google.api.TypeReference m =
-                    input.readMessage(com.google.api.TypeReference.parser(), extensionRegistry);
-                if (referencedTypesBuilder_ == null) {
-                  ensureReferencedTypesIsMutable();
-                  referencedTypes_.add(m);
-                } else {
-                  referencedTypesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.FieldInfo) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1355,18 +1391,7 @@ public FieldInfo parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new FieldInfo(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldPolicy.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldPolicy.java
index 89de84c4ff..ddf004728a 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldPolicy.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldPolicy.java
@@ -61,6 +61,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private FieldPolicy(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              selector_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              resourcePermission_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              resourceType_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.PolicyProto.internal_static_google_api_FieldPolicy_descriptor;
   }
@@ -269,7 +329,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(resourceType_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, resourceType_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -287,7 +347,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(resourceType_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, resourceType_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -305,7 +365,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getSelector().equals(other.getSelector())) return false;
     if (!getResourcePermission().equals(other.getResourcePermission())) return false;
     if (!getResourceType().equals(other.getResourceType())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -322,7 +382,7 @@ public int hashCode() {
     hash = (53 * hash) + getResourcePermission().hashCode();
     hash = (37 * hash) + RESOURCE_TYPE_FIELD_NUMBER;
     hash = (53 * hash) + getResourceType().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -454,10 +514,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.FieldPolicy.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -558,7 +625,7 @@ public Builder mergeFrom(com.google.api.FieldPolicy other) {
         resourceType_ = other.resourceType_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -573,49 +640,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.FieldPolicy parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                selector_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                resourcePermission_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                resourceType_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.FieldPolicy) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1034,18 +1069,7 @@ public FieldPolicy parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new FieldPolicy(input, extensionRegistry);
         }
       };
 
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 6a8b41cd03..081ab75b04 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
@@ -51,6 +51,79 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private GoSettings(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.api.CommonLanguageSettings.Builder subBuilder = null;
+              if (common_ != null) {
+                subBuilder = common_.toBuilder();
+              }
+              common_ =
+                  input.readMessage(
+                      com.google.api.CommonLanguageSettings.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(common_);
+                common_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                renamedServices_ =
+                    com.google.protobuf.MapField.newMapField(
+                        RenamedServicesDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry renamedServices__ =
+                  input.readMessage(
+                      RenamedServicesDefaultEntryHolder.defaultEntry.getParserForType(),
+                      extensionRegistry);
+              renamedServices_
+                  .getMutableMap()
+                  .put(renamedServices__.getKey(), renamedServices__.getValue());
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_GoSettings_descriptor;
   }
@@ -272,7 +345,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
         output, internalGetRenamedServices(), RenamedServicesDefaultEntryHolder.defaultEntry, 2);
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -294,7 +367,7 @@ public int getSerializedSize() {
               .build();
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, renamedServices__);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -314,7 +387,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getCommon().equals(other.getCommon())) return false;
     }
     if (!internalGetRenamedServices().equals(other.internalGetRenamedServices())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -333,7 +406,7 @@ public int hashCode() {
       hash = (37 * hash) + RENAMED_SERVICES_FIELD_NUMBER;
       hash = (53 * hash) + internalGetRenamedServices().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -479,10 +552,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.api.GoSettings.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -581,7 +661,7 @@ public Builder mergeFrom(com.google.api.GoSettings other) {
         mergeCommon(other.getCommon());
       }
       internalGetMutableRenamedServices().mergeFrom(other.internalGetRenamedServices());
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -596,48 +676,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.GoSettings parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.protobuf.MapEntry renamedServices__ =
-                    input.readMessage(
-                        RenamedServicesDefaultEntryHolder.defaultEntry.getParserForType(),
-                        extensionRegistry);
-                internalGetMutableRenamedServices()
-                    .getMutableMap()
-                    .put(renamedServices__.getKey(), renamedServices__.getValue());
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.GoSettings) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1082,18 +1131,7 @@ public GoSettings parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new GoSettings(input, extensionRegistry);
         }
       };
 
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 ec4934a4b9..8313af01bb 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
@@ -55,6 +55,63 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Http(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                rules_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              rules_.add(input.readMessage(com.google.api.HttpRule.parser(), extensionRegistry));
+              break;
+            }
+          case 16:
+            {
+              fullyDecodeReservedExpansion_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        rules_ = java.util.Collections.unmodifiableList(rules_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.HttpProto.internal_static_google_api_Http_descriptor;
   }
@@ -188,7 +245,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (fullyDecodeReservedExpansion_ != false) {
       output.writeBool(2, fullyDecodeReservedExpansion_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -204,7 +261,7 @@ public int getSerializedSize() {
       size +=
           com.google.protobuf.CodedOutputStream.computeBoolSize(2, fullyDecodeReservedExpansion_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -221,7 +278,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getRulesList().equals(other.getRulesList())) return false;
     if (getFullyDecodeReservedExpansion() != other.getFullyDecodeReservedExpansion()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -239,7 +296,7 @@ public int hashCode() {
     hash = (37 * hash) + FULLY_DECODE_RESERVED_EXPANSION_FIELD_NUMBER;
     hash =
         (53 * hash) + com.google.protobuf.Internal.hashBoolean(getFullyDecodeReservedExpansion());
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -367,10 +424,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Http.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getRulesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -378,11 +444,10 @@ public Builder clear() {
       super.clear();
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        rules_ = null;
         rulesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       fullyDecodeReservedExpansion_ = false;
 
       return this;
@@ -500,7 +565,7 @@ public Builder mergeFrom(com.google.api.Http other) {
       if (other.getFullyDecodeReservedExpansion() != false) {
         setFullyDecodeReservedExpansion(other.getFullyDecodeReservedExpansion());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -515,49 +580,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Http parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.api.HttpRule m =
-                    input.readMessage(com.google.api.HttpRule.parser(), extensionRegistry);
-                if (rulesBuilder_ == null) {
-                  ensureRulesIsMutable();
-                  rules_.add(m);
-                } else {
-                  rulesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 16:
-              {
-                fullyDecodeReservedExpansion_ = input.readBool();
-
-                break;
-              } // case 16
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Http) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1038,18 +1071,7 @@ public Http parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Http(input, extensionRegistry);
         }
       };
 
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 d7539b5296..e530a5797c 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
@@ -84,6 +84,71 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private HttpBody(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              contentType_ = s;
+              break;
+            }
+          case 18:
+            {
+              data_ = input.readBytes();
+              break;
+            }
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                extensions_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              extensions_.add(
+                  input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        extensions_ = java.util.Collections.unmodifiableList(extensions_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.HttpBodyProto.internal_static_google_api_HttpBody_descriptor;
   }
@@ -267,7 +332,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < extensions_.size(); i++) {
       output.writeMessage(3, extensions_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -285,7 +350,7 @@ public int getSerializedSize() {
     for (int i = 0; i < extensions_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, extensions_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -303,7 +368,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getContentType().equals(other.getContentType())) return false;
     if (!getData().equals(other.getData())) return false;
     if (!getExtensionsList().equals(other.getExtensionsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -322,7 +387,7 @@ public int hashCode() {
       hash = (37 * hash) + EXTENSIONS_FIELD_NUMBER;
       hash = (53 * hash) + getExtensionsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -477,10 +542,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.HttpBody.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getExtensionsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -492,11 +566,10 @@ public Builder clear() {
 
       if (extensionsBuilder_ == null) {
         extensions_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        extensions_ = null;
         extensionsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -617,7 +690,7 @@ public Builder mergeFrom(com.google.api.HttpBody other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -632,55 +705,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.HttpBody parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                contentType_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                data_ = input.readBytes();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                com.google.protobuf.Any m =
-                    input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry);
-                if (extensionsBuilder_ == null) {
-                  ensureExtensionsIsMutable();
-                  extensions_.add(m);
-                } else {
-                  extensionsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.HttpBody) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1264,18 +1299,7 @@ public HttpBody parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new HttpBody(input, extensionRegistry);
         }
       };
 
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 3c061cdb0d..da906a59b4 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
@@ -271,6 +271,130 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private HttpRule(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              selector_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              patternCase_ = 2;
+              pattern_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              patternCase_ = 3;
+              pattern_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              patternCase_ = 4;
+              pattern_ = s;
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              patternCase_ = 5;
+              pattern_ = s;
+              break;
+            }
+          case 50:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              patternCase_ = 6;
+              pattern_ = s;
+              break;
+            }
+          case 58:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              body_ = s;
+              break;
+            }
+          case 66:
+            {
+              com.google.api.CustomHttpPattern.Builder subBuilder = null;
+              if (patternCase_ == 8) {
+                subBuilder = ((com.google.api.CustomHttpPattern) pattern_).toBuilder();
+              }
+              pattern_ =
+                  input.readMessage(com.google.api.CustomHttpPattern.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.api.CustomHttpPattern) pattern_);
+                pattern_ = subBuilder.buildPartial();
+              }
+              patternCase_ = 8;
+              break;
+            }
+          case 90:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                additionalBindings_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              additionalBindings_.add(
+                  input.readMessage(com.google.api.HttpRule.parser(), extensionRegistry));
+              break;
+            }
+          case 98:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              responseBody_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        additionalBindings_ = java.util.Collections.unmodifiableList(additionalBindings_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.HttpProto.internal_static_google_api_HttpRule_descriptor;
   }
@@ -1075,7 +1199,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(responseBody_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 12, responseBody_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1117,7 +1241,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(responseBody_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, responseBody_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1159,7 +1283,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1208,7 +1332,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1549,10 +1673,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.HttpRule.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getAdditionalBindingsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -1560,20 +1693,16 @@ public Builder clear() {
       super.clear();
       selector_ = "";
 
-      if (customBuilder_ != null) {
-        customBuilder_.clear();
-      }
       body_ = "";
 
       responseBody_ = "";
 
       if (additionalBindingsBuilder_ == null) {
         additionalBindings_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        additionalBindings_ = null;
         additionalBindingsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       patternCase_ = 0;
       pattern_ = null;
       return this;
@@ -1771,7 +1900,7 @@ public Builder mergeFrom(com.google.api.HttpRule other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1786,102 +1915,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.HttpRule parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                selector_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                patternCase_ = 2;
-                pattern_ = s;
-                break;
-              } // case 18
-            case 26:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                patternCase_ = 3;
-                pattern_ = s;
-                break;
-              } // case 26
-            case 34:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                patternCase_ = 4;
-                pattern_ = s;
-                break;
-              } // case 34
-            case 42:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                patternCase_ = 5;
-                pattern_ = s;
-                break;
-              } // case 42
-            case 50:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                patternCase_ = 6;
-                pattern_ = s;
-                break;
-              } // case 50
-            case 58:
-              {
-                body_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 58
-            case 66:
-              {
-                input.readMessage(getCustomFieldBuilder().getBuilder(), extensionRegistry);
-                patternCase_ = 8;
-                break;
-              } // case 66
-            case 90:
-              {
-                com.google.api.HttpRule m =
-                    input.readMessage(com.google.api.HttpRule.parser(), extensionRegistry);
-                if (additionalBindingsBuilder_ == null) {
-                  ensureAdditionalBindingsIsMutable();
-                  additionalBindings_.add(m);
-                } else {
-                  additionalBindingsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 90
-            case 98:
-              {
-                responseBody_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 98
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.HttpRule) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -3664,18 +3708,7 @@ public HttpRule parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new HttpRule(input, extensionRegistry);
         }
       };
 
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 9c2764c0b0..732c90d555 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
@@ -53,6 +53,86 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private JavaSettings(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              libraryPackage_ = s;
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                serviceClassNames_ =
+                    com.google.protobuf.MapField.newMapField(
+                        ServiceClassNamesDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry serviceClassNames__ =
+                  input.readMessage(
+                      ServiceClassNamesDefaultEntryHolder.defaultEntry.getParserForType(),
+                      extensionRegistry);
+              serviceClassNames_
+                  .getMutableMap()
+                  .put(serviceClassNames__.getKey(), serviceClassNames__.getValue());
+              break;
+            }
+          case 26:
+            {
+              com.google.api.CommonLanguageSettings.Builder subBuilder = null;
+              if (common_ != null) {
+                subBuilder = common_.toBuilder();
+              }
+              common_ =
+                  input.readMessage(
+                      com.google.api.CommonLanguageSettings.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(common_);
+                common_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_JavaSettings_descriptor;
   }
@@ -367,7 +447,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (common_ != null) {
       output.writeMessage(3, getCommon());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -392,7 +472,7 @@ public int getSerializedSize() {
     if (common_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getCommon());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -413,7 +493,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasCommon()) {
       if (!getCommon().equals(other.getCommon())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -434,7 +514,7 @@ public int hashCode() {
       hash = (37 * hash) + COMMON_FIELD_NUMBER;
       hash = (53 * hash) + getCommon().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -580,10 +660,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.api.JavaSettings.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -689,7 +776,7 @@ public Builder mergeFrom(com.google.api.JavaSettings other) {
       if (other.hasCommon()) {
         mergeCommon(other.getCommon());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -704,55 +791,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.JavaSettings parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                libraryPackage_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.protobuf.MapEntry
-                    serviceClassNames__ =
-                        input.readMessage(
-                            ServiceClassNamesDefaultEntryHolder.defaultEntry.getParserForType(),
-                            extensionRegistry);
-                internalGetMutableServiceClassNames()
-                    .getMutableMap()
-                    .put(serviceClassNames__.getKey(), serviceClassNames__.getValue());
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.JavaSettings) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1386,18 +1435,7 @@ public JavaSettings parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new JavaSettings(input, extensionRegistry);
         }
       };
 
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 2caa282261..609a26af7c 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
@@ -53,6 +53,73 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private JwtLocation(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              inCase_ = 1;
+              in_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              inCase_ = 2;
+              in_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              valuePrefix_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              inCase_ = 4;
+              in_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.AuthProto.internal_static_google_api_JwtLocation_descriptor;
   }
@@ -424,7 +491,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (inCase_ == 4) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, in_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -445,7 +512,7 @@ public int getSerializedSize() {
     if (inCase_ == 4) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, in_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -475,7 +542,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -504,7 +571,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -630,10 +697,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.JwtLocation.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -759,7 +833,7 @@ public Builder mergeFrom(com.google.api.JwtLocation other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -774,58 +848,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.JwtLocation parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                inCase_ = 1;
-                in_ = s;
-                break;
-              } // case 10
-            case 18:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                inCase_ = 2;
-                in_ = s;
-                break;
-              } // case 18
-            case 26:
-              {
-                valuePrefix_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                inCase_ = 4;
-                in_ = s;
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.JwtLocation) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1433,18 +1466,7 @@ public JwtLocation parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new JwtLocation(input, extensionRegistry);
         }
       };
 
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 573c0d69be..6349e354d2 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
@@ -55,6 +55,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private LabelDescriptor(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              key_ = s;
+              break;
+            }
+          case 16:
+            {
+              int rawValue = input.readEnum();
+
+              valueType_ = rawValue;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              description_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.LabelProto.internal_static_google_api_LabelDescriptor_descriptor;
   }
@@ -389,7 +449,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, description_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -407,7 +467,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, description_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -425,7 +485,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getKey().equals(other.getKey())) return false;
     if (valueType_ != other.valueType_) return false;
     if (!getDescription().equals(other.getDescription())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -442,7 +502,7 @@ public int hashCode() {
     hash = (53 * hash) + valueType_;
     hash = (37 * hash) + DESCRIPTION_FIELD_NUMBER;
     hash = (53 * hash) + getDescription().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -568,10 +628,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.LabelDescriptor.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -671,7 +738,7 @@ public Builder mergeFrom(com.google.api.LabelDescriptor other) {
         description_ = other.description_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -686,49 +753,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.LabelDescriptor parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                key_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                valueType_ = input.readEnum();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                description_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.LabelDescriptor) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1082,18 +1117,7 @@ public LabelDescriptor parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new LabelDescriptor(input, extensionRegistry);
         }
       };
 
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 b8dd4d4c20..06db14f0b3 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
@@ -62,6 +62,80 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private LogDescriptor(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                labels_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              labels_.add(
+                  input.readMessage(com.google.api.LabelDescriptor.parser(), extensionRegistry));
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              description_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              displayName_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        labels_ = java.util.Collections.unmodifiableList(labels_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.LogProto.internal_static_google_api_LogDescriptor_descriptor;
   }
@@ -347,7 +421,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, displayName_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -368,7 +442,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, displayName_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -387,7 +461,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getLabelsList().equals(other.getLabelsList())) return false;
     if (!getDescription().equals(other.getDescription())) return false;
     if (!getDisplayName().equals(other.getDisplayName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -408,7 +482,7 @@ public int hashCode() {
     hash = (53 * hash) + getDescription().hashCode();
     hash = (37 * hash) + DISPLAY_NAME_FIELD_NUMBER;
     hash = (53 * hash) + getDisplayName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -540,10 +614,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.LogDescriptor.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getLabelsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -553,11 +636,10 @@ public Builder clear() {
 
       if (labelsBuilder_ == null) {
         labels_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        labels_ = null;
         labelsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       description_ = "";
 
       displayName_ = "";
@@ -688,7 +770,7 @@ public Builder mergeFrom(com.google.api.LogDescriptor other) {
         displayName_ = other.displayName_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -703,61 +785,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.LogDescriptor parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.api.LabelDescriptor m =
-                    input.readMessage(com.google.api.LabelDescriptor.parser(), extensionRegistry);
-                if (labelsBuilder_ == null) {
-                  ensureLabelsIsMutable();
-                  labels_.add(m);
-                } else {
-                  labelsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            case 26:
-              {
-                description_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                displayName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.LogDescriptor) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1552,18 +1590,7 @@ public LogDescriptor parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new LogDescriptor(input, extensionRegistry);
         }
       };
 
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 74d3c46062..77ec76d4d6 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
@@ -80,6 +80,76 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Logging(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                producerDestinations_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              producerDestinations_.add(
+                  input.readMessage(
+                      com.google.api.Logging.LoggingDestination.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                consumerDestinations_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              consumerDestinations_.add(
+                  input.readMessage(
+                      com.google.api.Logging.LoggingDestination.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        producerDestinations_ = java.util.Collections.unmodifiableList(producerDestinations_);
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        consumerDestinations_ = java.util.Collections.unmodifiableList(consumerDestinations_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.LoggingProto.internal_static_google_api_Logging_descriptor;
   }
@@ -231,6 +301,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private LoggingDestination(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  logs_ = new com.google.protobuf.LazyStringArrayList();
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                logs_.add(s);
+                break;
+              }
+            case 26:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                monitoredResource_ = s;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          logs_ = logs_.getUnmodifiableView();
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.api.LoggingProto
           .internal_static_google_api_Logging_LoggingDestination_descriptor;
@@ -398,7 +528,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(monitoredResource_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 3, monitoredResource_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -418,7 +548,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(monitoredResource_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, monitoredResource_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -436,7 +566,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getMonitoredResource().equals(other.getMonitoredResource())) return false;
       if (!getLogsList().equals(other.getLogsList())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -453,7 +583,7 @@ public int hashCode() {
         hash = (37 * hash) + LOGS_FIELD_NUMBER;
         hash = (53 * hash) + getLogsList().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -586,10 +716,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.api.Logging.LoggingDestination.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -698,7 +835,7 @@ public Builder mergeFrom(com.google.api.Logging.LoggingDestination other) {
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -713,44 +850,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.api.Logging.LoggingDestination parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  java.lang.String s = input.readStringRequireUtf8();
-                  ensureLogsIsMutable();
-                  logs_.add(s);
-                  break;
-                } // case 10
-              case 26:
-                {
-                  monitoredResource_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 26
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.api.Logging.LoggingDestination) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1114,19 +1224,7 @@ public LoggingDestination parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new LoggingDestination(input, extensionRegistry);
           }
         };
 
@@ -1345,7 +1443,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < consumerDestinations_.size(); i++) {
       output.writeMessage(2, consumerDestinations_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1362,7 +1460,7 @@ public int getSerializedSize() {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(2, consumerDestinations_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1379,7 +1477,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getProducerDestinationsList().equals(other.getProducerDestinationsList())) return false;
     if (!getConsumerDestinationsList().equals(other.getConsumerDestinationsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1398,7 +1496,7 @@ public int hashCode() {
       hash = (37 * hash) + CONSUMER_DESTINATIONS_FIELD_NUMBER;
       hash = (53 * hash) + getConsumerDestinationsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1550,10 +1648,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Logging.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getProducerDestinationsFieldBuilder();
+        getConsumerDestinationsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -1561,18 +1669,16 @@ public Builder clear() {
       super.clear();
       if (producerDestinationsBuilder_ == null) {
         producerDestinations_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        producerDestinations_ = null;
         producerDestinationsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       if (consumerDestinationsBuilder_ == null) {
         consumerDestinations_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
-        consumerDestinations_ = null;
         consumerDestinationsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -1720,7 +1826,7 @@ public Builder mergeFrom(com.google.api.Logging other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1735,57 +1841,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Logging parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.api.Logging.LoggingDestination m =
-                    input.readMessage(
-                        com.google.api.Logging.LoggingDestination.parser(), extensionRegistry);
-                if (producerDestinationsBuilder_ == null) {
-                  ensureProducerDestinationsIsMutable();
-                  producerDestinations_.add(m);
-                } else {
-                  producerDestinationsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.api.Logging.LoggingDestination m =
-                    input.readMessage(
-                        com.google.api.Logging.LoggingDestination.parser(), extensionRegistry);
-                if (consumerDestinationsBuilder_ == null) {
-                  ensureConsumerDestinationsIsMutable();
-                  consumerDestinations_.add(m);
-                } else {
-                  consumerDestinationsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Logging) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2685,18 +2751,7 @@ public Logging parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Logging(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodPolicy.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodPolicy.java
index 6dadaf79c7..73d2eeb58b 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodPolicy.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MethodPolicy.java
@@ -54,6 +54,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private MethodPolicy(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                requestPolicies_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              requestPolicies_.add(
+                  input.readMessage(com.google.api.FieldPolicy.parser(), extensionRegistry));
+              break;
+            }
+          case 74:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              selector_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        requestPolicies_ = java.util.Collections.unmodifiableList(requestPolicies_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.PolicyProto.internal_static_google_api_MethodPolicy_descriptor;
   }
@@ -221,7 +281,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(selector_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, selector_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -236,7 +296,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(selector_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, selector_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -253,7 +313,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getSelector().equals(other.getSelector())) return false;
     if (!getRequestPoliciesList().equals(other.getRequestPoliciesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -270,7 +330,7 @@ public int hashCode() {
       hash = (37 * hash) + REQUEST_POLICIES_FIELD_NUMBER;
       hash = (53 * hash) + getRequestPoliciesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -396,10 +456,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.MethodPolicy.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getRequestPoliciesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -409,11 +478,10 @@ public Builder clear() {
 
       if (requestPoliciesBuilder_ == null) {
         requestPolicies_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        requestPolicies_ = null;
         requestPoliciesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -530,7 +598,7 @@ public Builder mergeFrom(com.google.api.MethodPolicy other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -545,49 +613,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.MethodPolicy parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 18:
-              {
-                com.google.api.FieldPolicy m =
-                    input.readMessage(com.google.api.FieldPolicy.parser(), extensionRegistry);
-                if (requestPoliciesBuilder_ == null) {
-                  ensureRequestPoliciesIsMutable();
-                  requestPolicies_.add(m);
-                } else {
-                  requestPoliciesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            case 74:
-              {
-                selector_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 74
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.MethodPolicy) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1129,18 +1165,7 @@ public MethodPolicy parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new MethodPolicy(input, extensionRegistry);
         }
       };
 
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 6d891039b1..763ce88a50 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
@@ -54,6 +54,82 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private MethodSettings(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              selector_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.api.MethodSettings.LongRunning.Builder subBuilder = null;
+              if (longRunning_ != null) {
+                subBuilder = longRunning_.toBuilder();
+              }
+              longRunning_ =
+                  input.readMessage(
+                      com.google.api.MethodSettings.LongRunning.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(longRunning_);
+                longRunning_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                autoPopulatedFields_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              autoPopulatedFields_.add(s);
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        autoPopulatedFields_ = autoPopulatedFields_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_MethodSettings_descriptor;
   }
@@ -244,6 +320,95 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private LongRunning(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.protobuf.Duration.Builder subBuilder = null;
+                if (initialPollDelay_ != null) {
+                  subBuilder = initialPollDelay_.toBuilder();
+                }
+                initialPollDelay_ =
+                    input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(initialPollDelay_);
+                  initialPollDelay_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 21:
+              {
+                pollDelayMultiplier_ = input.readFloat();
+                break;
+              }
+            case 26:
+              {
+                com.google.protobuf.Duration.Builder subBuilder = null;
+                if (maxPollDelay_ != null) {
+                  subBuilder = maxPollDelay_.toBuilder();
+                }
+                maxPollDelay_ =
+                    input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(maxPollDelay_);
+                  maxPollDelay_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 34:
+              {
+                com.google.protobuf.Duration.Builder subBuilder = null;
+                if (totalPollTimeout_ != null) {
+                  subBuilder = totalPollTimeout_.toBuilder();
+                }
+                totalPollTimeout_ =
+                    input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(totalPollTimeout_);
+                  totalPollTimeout_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.api.ClientProto
           .internal_static_google_api_MethodSettings_LongRunning_descriptor;
@@ -468,7 +633,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (totalPollTimeout_ != null) {
         output.writeMessage(4, getTotalPollTimeout());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -489,7 +654,7 @@ public int getSerializedSize() {
       if (totalPollTimeout_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getTotalPollTimeout());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -519,7 +684,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasTotalPollTimeout()) {
         if (!getTotalPollTimeout().equals(other.getTotalPollTimeout())) return false;
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -544,7 +709,7 @@ public int hashCode() {
         hash = (37 * hash) + TOTAL_POLL_TIMEOUT_FIELD_NUMBER;
         hash = (53 * hash) + getTotalPollTimeout().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -680,10 +845,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.api.MethodSettings.LongRunning.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -815,7 +987,7 @@ public Builder mergeFrom(com.google.api.MethodSettings.LongRunning other) {
         if (other.hasTotalPollTimeout()) {
           mergeTotalPollTimeout(other.getTotalPollTimeout());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -830,57 +1002,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.api.MethodSettings.LongRunning parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  input.readMessage(
-                      getInitialPollDelayFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 10
-              case 21:
-                {
-                  pollDelayMultiplier_ = input.readFloat();
-
-                  break;
-                } // case 21
-              case 26:
-                {
-                  input.readMessage(getMaxPollDelayFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 26
-              case 34:
-                {
-                  input.readMessage(
-                      getTotalPollTimeoutFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 34
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.api.MethodSettings.LongRunning) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1587,19 +1719,7 @@ public LongRunning parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new LongRunning(input, extensionRegistry);
           }
         };
 
@@ -1885,7 +2005,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < autoPopulatedFields_.size(); i++) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, autoPopulatedFields_.getRaw(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1908,7 +2028,7 @@ public int getSerializedSize() {
       size += dataSize;
       size += 1 * getAutoPopulatedFieldsList().size();
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1929,7 +2049,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getLongRunning().equals(other.getLongRunning())) return false;
     }
     if (!getAutoPopulatedFieldsList().equals(other.getAutoPopulatedFieldsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1950,7 +2070,7 @@ public int hashCode() {
       hash = (37 * hash) + AUTO_POPULATED_FIELDS_FIELD_NUMBER;
       hash = (53 * hash) + getAutoPopulatedFieldsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -2076,10 +2196,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.MethodSettings.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -2198,7 +2325,7 @@ public Builder mergeFrom(com.google.api.MethodSettings other) {
         }
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2213,50 +2340,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.MethodSettings parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                selector_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getLongRunningFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            case 26:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureAutoPopulatedFieldsIsMutable();
-                autoPopulatedFields_.add(s);
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.MethodSettings) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2978,18 +3072,7 @@ public MethodSettings parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new MethodSettings(input, extensionRegistry);
         }
       };
 
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 1127885db6..97140eee9e 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
@@ -54,6 +54,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Metric(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                labels_ =
+                    com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry labels__ =
+                  input.readMessage(
+                      LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              labels_.getMutableMap().put(labels__.getKey(), labels__.getValue());
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              type_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.MetricProto.internal_static_google_api_Metric_descriptor;
   }
@@ -257,7 +317,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(type_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, type_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -279,7 +339,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(type_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, type_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -296,7 +356,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getType().equals(other.getType())) return false;
     if (!internalGetLabels().equals(other.internalGetLabels())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -313,7 +373,7 @@ public int hashCode() {
       hash = (37 * hash) + LABELS_FIELD_NUMBER;
       hash = (53 * hash) + internalGetLabels().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -460,10 +520,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.api.Metric.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -555,7 +622,7 @@ public Builder mergeFrom(com.google.api.Metric other) {
         onChanged();
       }
       internalGetMutableLabels().mergeFrom(other.internalGetLabels());
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -570,48 +637,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Metric parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 18:
-              {
-                com.google.protobuf.MapEntry labels__ =
-                    input.readMessage(
-                        LabelsDefaultEntryHolder.defaultEntry.getParserForType(),
-                        extensionRegistry);
-                internalGetMutableLabels()
-                    .getMutableMap()
-                    .put(labels__.getKey(), labels__.getValue());
-                break;
-              } // case 18
-            case 26:
-              {
-                type_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Metric) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -944,18 +980,7 @@ public Metric parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Metric(input, extensionRegistry);
         }
       };
 
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 61773f5617..51e1462295 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
@@ -64,6 +64,145 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private MetricDescriptor(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                labels_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              labels_.add(
+                  input.readMessage(com.google.api.LabelDescriptor.parser(), extensionRegistry));
+              break;
+            }
+          case 24:
+            {
+              int rawValue = input.readEnum();
+
+              metricKind_ = rawValue;
+              break;
+            }
+          case 32:
+            {
+              int rawValue = input.readEnum();
+
+              valueType_ = rawValue;
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              unit_ = s;
+              break;
+            }
+          case 50:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              description_ = s;
+              break;
+            }
+          case 58:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              displayName_ = s;
+              break;
+            }
+          case 66:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              type_ = s;
+              break;
+            }
+          case 82:
+            {
+              com.google.api.MetricDescriptor.MetricDescriptorMetadata.Builder subBuilder = null;
+              if (metadata_ != null) {
+                subBuilder = metadata_.toBuilder();
+              }
+              metadata_ =
+                  input.readMessage(
+                      com.google.api.MetricDescriptor.MetricDescriptorMetadata.parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(metadata_);
+                metadata_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 96:
+            {
+              int rawValue = input.readEnum();
+
+              launchStage_ = rawValue;
+              break;
+            }
+          case 106:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                monitoredResourceTypes_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              monitoredResourceTypes_.add(s);
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        labels_ = java.util.Collections.unmodifiableList(labels_);
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        monitoredResourceTypes_ = monitoredResourceTypes_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.MetricProto.internal_static_google_api_MetricDescriptor_descriptor;
   }
@@ -773,6 +912,113 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private MetricDescriptorMetadata(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                int rawValue = input.readEnum();
+
+                launchStage_ = rawValue;
+                break;
+              }
+            case 18:
+              {
+                com.google.protobuf.Duration.Builder subBuilder = null;
+                if (samplePeriod_ != null) {
+                  subBuilder = samplePeriod_.toBuilder();
+                }
+                samplePeriod_ =
+                    input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(samplePeriod_);
+                  samplePeriod_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 26:
+              {
+                com.google.protobuf.Duration.Builder subBuilder = null;
+                if (ingestDelay_ != null) {
+                  subBuilder = ingestDelay_.toBuilder();
+                }
+                ingestDelay_ =
+                    input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(ingestDelay_);
+                  ingestDelay_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 32:
+              {
+                int rawValue = input.readEnum();
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  timeSeriesResourceHierarchyLevel_ = new java.util.ArrayList();
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                timeSeriesResourceHierarchyLevel_.add(rawValue);
+                break;
+              }
+            case 34:
+              {
+                int length = input.readRawVarint32();
+                int oldLimit = input.pushLimit(length);
+                while (input.getBytesUntilLimit() > 0) {
+                  int rawValue = input.readEnum();
+                  if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                    timeSeriesResourceHierarchyLevel_ =
+                        new java.util.ArrayList();
+                    mutable_bitField0_ |= 0x00000001;
+                  }
+                  timeSeriesResourceHierarchyLevel_.add(rawValue);
+                }
+                input.popLimit(oldLimit);
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          timeSeriesResourceHierarchyLevel_ =
+              java.util.Collections.unmodifiableList(timeSeriesResourceHierarchyLevel_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.api.MetricProto
           .internal_static_google_api_MetricDescriptor_MetricDescriptorMetadata_descriptor;
@@ -1305,7 +1551,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       for (int i = 0; i < timeSeriesResourceHierarchyLevel_.size(); i++) {
         output.writeEnumNoTag(timeSeriesResourceHierarchyLevel_.get(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -1337,7 +1583,7 @@ public int getSerializedSize() {
         }
         timeSeriesResourceHierarchyLevelMemoizedSerializedSize = dataSize;
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1364,7 +1610,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!timeSeriesResourceHierarchyLevel_.equals(other.timeSeriesResourceHierarchyLevel_))
         return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -1389,7 +1635,7 @@ public int hashCode() {
         hash = (37 * hash) + TIME_SERIES_RESOURCE_HIERARCHY_LEVEL_FIELD_NUMBER;
         hash = (53 * hash) + timeSeriesResourceHierarchyLevel_.hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1522,10 +1768,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.api.MetricDescriptor.MetricDescriptorMetadata.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -1663,7 +1916,7 @@ public Builder mergeFrom(com.google.api.MetricDescriptor.MetricDescriptorMetadat
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1678,68 +1931,18 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.api.MetricDescriptor.MetricDescriptorMetadata parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 8:
-                {
-                  launchStage_ = input.readEnum();
-
-                  break;
-                } // case 8
-              case 18:
-                {
-                  input.readMessage(getSamplePeriodFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 18
-              case 26:
-                {
-                  input.readMessage(getIngestDelayFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 26
-              case 32:
-                {
-                  int tmpRaw = input.readEnum();
-                  ensureTimeSeriesResourceHierarchyLevelIsMutable();
-                  timeSeriesResourceHierarchyLevel_.add(tmpRaw);
-                  break;
-                } // case 32
-              case 34:
-                {
-                  int length = input.readRawVarint32();
-                  int oldLimit = input.pushLimit(length);
-                  while (input.getBytesUntilLimit() > 0) {
-                    int tmpRaw = input.readEnum();
-                    ensureTimeSeriesResourceHierarchyLevelIsMutable();
-                    timeSeriesResourceHierarchyLevel_.add(tmpRaw);
-                  }
-                  input.popLimit(oldLimit);
-                  break;
-                } // case 34
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.api.MetricDescriptor.MetricDescriptorMetadata) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -2615,19 +2818,7 @@ public MetricDescriptorMetadata parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new MetricDescriptorMetadata(input, extensionRegistry);
           }
         };
 
@@ -3485,7 +3676,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       com.google.protobuf.GeneratedMessageV3.writeString(
           output, 13, monitoredResourceTypes_.getRaw(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -3534,7 +3725,7 @@ public int getSerializedSize() {
       size += dataSize;
       size += 1 * getMonitoredResourceTypesList().size();
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -3564,7 +3755,7 @@ public boolean equals(final java.lang.Object obj) {
     if (launchStage_ != other.launchStage_) return false;
     if (!getMonitoredResourceTypesList().equals(other.getMonitoredResourceTypesList()))
       return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -3603,7 +3794,7 @@ public int hashCode() {
       hash = (37 * hash) + MONITORED_RESOURCE_TYPES_FIELD_NUMBER;
       hash = (53 * hash) + getMonitoredResourceTypesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -3732,10 +3923,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.MetricDescriptor.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getLabelsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -3747,11 +3947,10 @@ public Builder clear() {
 
       if (labelsBuilder_ == null) {
         labels_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        labels_ = null;
         labelsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       metricKind_ = 0;
 
       valueType_ = 0;
@@ -3943,7 +4142,7 @@ public Builder mergeFrom(com.google.api.MetricDescriptor other) {
         }
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -3958,104 +4157,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.MetricDescriptor parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.api.LabelDescriptor m =
-                    input.readMessage(com.google.api.LabelDescriptor.parser(), extensionRegistry);
-                if (labelsBuilder_ == null) {
-                  ensureLabelsIsMutable();
-                  labels_.add(m);
-                } else {
-                  labelsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            case 24:
-              {
-                metricKind_ = input.readEnum();
-
-                break;
-              } // case 24
-            case 32:
-              {
-                valueType_ = input.readEnum();
-
-                break;
-              } // case 32
-            case 42:
-              {
-                unit_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 42
-            case 50:
-              {
-                description_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 50
-            case 58:
-              {
-                displayName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 58
-            case 66:
-              {
-                type_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 66
-            case 82:
-              {
-                input.readMessage(getMetadataFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 82
-            case 96:
-              {
-                launchStage_ = input.readEnum();
-
-                break;
-              } // case 96
-            case 106:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureMonitoredResourceTypesIsMutable();
-                monitoredResourceTypes_.add(s);
-                break;
-              } // case 106
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.MetricDescriptor) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -6272,18 +6384,7 @@ public MetricDescriptor parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new MetricDescriptor(input, extensionRegistry);
         }
       };
 
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 e7aa3625c7..5abd823107 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
@@ -54,6 +54,68 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private MetricRule(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              selector_ = s;
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                metricCosts_ =
+                    com.google.protobuf.MapField.newMapField(
+                        MetricCostsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry metricCosts__ =
+                  input.readMessage(
+                      MetricCostsDefaultEntryHolder.defaultEntry.getParserForType(),
+                      extensionRegistry);
+              metricCosts_.getMutableMap().put(metricCosts__.getKey(), metricCosts__.getValue());
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.QuotaProto.internal_static_google_api_MetricRule_descriptor;
   }
@@ -270,7 +332,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
         output, internalGetMetricCosts(), MetricCostsDefaultEntryHolder.defaultEntry, 2);
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -292,7 +354,7 @@ public int getSerializedSize() {
               .build();
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, metricCosts__);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -309,7 +371,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getSelector().equals(other.getSelector())) return false;
     if (!internalGetMetricCosts().equals(other.internalGetMetricCosts())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -326,7 +388,7 @@ public int hashCode() {
       hash = (37 * hash) + METRIC_COSTS_FIELD_NUMBER;
       hash = (53 * hash) + internalGetMetricCosts().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -473,10 +535,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.api.MetricRule.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -568,7 +637,7 @@ public Builder mergeFrom(com.google.api.MetricRule other) {
         onChanged();
       }
       internalGetMutableMetricCosts().mergeFrom(other.internalGetMetricCosts());
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -583,48 +652,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.MetricRule parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                selector_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.protobuf.MapEntry metricCosts__ =
-                    input.readMessage(
-                        MetricCostsDefaultEntryHolder.defaultEntry.getParserForType(),
-                        extensionRegistry);
-                internalGetMutableMetricCosts()
-                    .getMutableMap()
-                    .put(metricCosts__.getKey(), metricCosts__.getValue());
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.MetricRule) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -977,18 +1015,7 @@ public MetricRule parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new MetricRule(input, extensionRegistry);
         }
       };
 
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 c42ee1ecfe..80dfe27282 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
@@ -67,6 +67,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private MonitoredResource(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              type_ = s;
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                labels_ =
+                    com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry labels__ =
+                  input.readMessage(
+                      LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              labels_.getMutableMap().put(labels__.getKey(), labels__.getValue());
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.MonitoredResourceProto
         .internal_static_google_api_MonitoredResource_descriptor;
@@ -285,7 +345,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
         output, internalGetLabels(), LabelsDefaultEntryHolder.defaultEntry, 2);
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -307,7 +367,7 @@ public int getSerializedSize() {
               .build();
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, labels__);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -324,7 +384,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getType().equals(other.getType())) return false;
     if (!internalGetLabels().equals(other.internalGetLabels())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -341,7 +401,7 @@ public int hashCode() {
       hash = (37 * hash) + LABELS_FIELD_NUMBER;
       hash = (53 * hash) + internalGetLabels().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -504,10 +564,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.api.MonitoredResource.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -600,7 +667,7 @@ public Builder mergeFrom(com.google.api.MonitoredResource other) {
         onChanged();
       }
       internalGetMutableLabels().mergeFrom(other.internalGetLabels());
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -615,48 +682,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.MonitoredResource parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                type_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.protobuf.MapEntry labels__ =
-                    input.readMessage(
-                        LabelsDefaultEntryHolder.defaultEntry.getParserForType(),
-                        extensionRegistry);
-                internalGetMutableLabels()
-                    .getMutableMap()
-                    .put(labels__.getKey(), labels__.getValue());
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.MonitoredResource) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1016,18 +1052,7 @@ public MonitoredResource parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new MonitoredResource(input, extensionRegistry);
         }
       };
 
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 2cd13cb8c8..eadc638ed1 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
@@ -66,6 +66,94 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private MonitoredResourceDescriptor(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              type_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              displayName_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              description_ = s;
+              break;
+            }
+          case 34:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                labels_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              labels_.add(
+                  input.readMessage(com.google.api.LabelDescriptor.parser(), extensionRegistry));
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 56:
+            {
+              int rawValue = input.readEnum();
+
+              launchStage_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        labels_ = java.util.Collections.unmodifiableList(labels_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.MonitoredResourceProto
         .internal_static_google_api_MonitoredResourceDescriptor_descriptor;
@@ -466,7 +554,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (launchStage_ != com.google.api.LaunchStage.LAUNCH_STAGE_UNSPECIFIED.getNumber()) {
       output.writeEnum(7, launchStage_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -493,7 +581,7 @@ public int getSerializedSize() {
     if (launchStage_ != com.google.api.LaunchStage.LAUNCH_STAGE_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(7, launchStage_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -515,7 +603,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getDescription().equals(other.getDescription())) return false;
     if (!getLabelsList().equals(other.getLabelsList())) return false;
     if (launchStage_ != other.launchStage_) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -540,7 +628,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + LAUNCH_STAGE_FIELD_NUMBER;
     hash = (53 * hash) + launchStage_;
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -678,10 +766,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.MonitoredResourceDescriptor.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getLabelsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -697,11 +794,10 @@ public Builder clear() {
 
       if (labelsBuilder_ == null) {
         labels_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        labels_ = null;
         labelsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       launchStage_ = 0;
 
       return this;
@@ -841,7 +937,7 @@ public Builder mergeFrom(com.google.api.MonitoredResourceDescriptor other) {
       if (other.launchStage_ != 0) {
         setLaunchStageValue(other.getLaunchStageValue());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -856,73 +952,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.MonitoredResourceDescriptor parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                type_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                displayName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                description_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                com.google.api.LabelDescriptor m =
-                    input.readMessage(com.google.api.LabelDescriptor.parser(), extensionRegistry);
-                if (labelsBuilder_ == null) {
-                  ensureLabelsIsMutable();
-                  labels_.add(m);
-                } else {
-                  labelsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 34
-            case 42:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 42
-            case 56:
-              {
-                launchStage_ = input.readEnum();
-
-                break;
-              } // case 56
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.MonitoredResourceDescriptor) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1968,18 +2008,7 @@ public MonitoredResourceDescriptor parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new MonitoredResourceDescriptor(input, extensionRegistry);
         }
       };
 
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 1a0614c578..fa25e699a0 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
@@ -56,6 +56,76 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private MonitoredResourceMetadata(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.protobuf.Struct.Builder subBuilder = null;
+              if (systemLabels_ != null) {
+                subBuilder = systemLabels_.toBuilder();
+              }
+              systemLabels_ =
+                  input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(systemLabels_);
+                systemLabels_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                userLabels_ =
+                    com.google.protobuf.MapField.newMapField(
+                        UserLabelsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry userLabels__ =
+                  input.readMessage(
+                      UserLabelsDefaultEntryHolder.defaultEntry.getParserForType(),
+                      extensionRegistry);
+              userLabels_.getMutableMap().put(userLabels__.getKey(), userLabels__.getValue());
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.MonitoredResourceProto
         .internal_static_google_api_MonitoredResourceMetadata_descriptor;
@@ -278,7 +348,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
         output, internalGetUserLabels(), UserLabelsDefaultEntryHolder.defaultEntry, 2);
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -300,7 +370,7 @@ public int getSerializedSize() {
               .build();
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, userLabels__);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -320,7 +390,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getSystemLabels().equals(other.getSystemLabels())) return false;
     }
     if (!internalGetUserLabels().equals(other.internalGetUserLabels())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -339,7 +409,7 @@ public int hashCode() {
       hash = (37 * hash) + USER_LABELS_FIELD_NUMBER;
       hash = (53 * hash) + internalGetUserLabels().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -494,10 +564,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.api.MonitoredResourceMetadata.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -598,7 +675,7 @@ public Builder mergeFrom(com.google.api.MonitoredResourceMetadata other) {
         mergeSystemLabels(other.getSystemLabels());
       }
       internalGetMutableUserLabels().mergeFrom(other.internalGetUserLabels());
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -613,48 +690,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.MonitoredResourceMetadata parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getSystemLabelsFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.protobuf.MapEntry userLabels__ =
-                    input.readMessage(
-                        UserLabelsDefaultEntryHolder.defaultEntry.getParserForType(),
-                        extensionRegistry);
-                internalGetMutableUserLabels()
-                    .getMutableMap()
-                    .put(userLabels__.getKey(), userLabels__.getValue());
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.MonitoredResourceMetadata) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1126,18 +1172,7 @@ public MonitoredResourceMetadata parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new MonitoredResourceMetadata(input, extensionRegistry);
         }
       };
 
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 a9270b71ee..79cc7692af 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
@@ -103,6 +103,76 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Monitoring(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                producerDestinations_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              producerDestinations_.add(
+                  input.readMessage(
+                      com.google.api.Monitoring.MonitoringDestination.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                consumerDestinations_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              consumerDestinations_.add(
+                  input.readMessage(
+                      com.google.api.Monitoring.MonitoringDestination.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        producerDestinations_ = java.util.Collections.unmodifiableList(producerDestinations_);
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        consumerDestinations_ = java.util.Collections.unmodifiableList(consumerDestinations_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.MonitoringProto.internal_static_google_api_Monitoring_descriptor;
   }
@@ -250,6 +320,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private MonitoringDestination(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                monitoredResource_ = s;
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  metrics_ = new com.google.protobuf.LazyStringArrayList();
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                metrics_.add(s);
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          metrics_ = metrics_.getUnmodifiableView();
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.api.MonitoringProto
           .internal_static_google_api_Monitoring_MonitoringDestination_descriptor;
@@ -413,7 +543,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       for (int i = 0; i < metrics_.size(); i++) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, metrics_.getRaw(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -433,7 +563,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getMetricsList().size();
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -451,7 +581,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getMonitoredResource().equals(other.getMonitoredResource())) return false;
       if (!getMetricsList().equals(other.getMetricsList())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -468,7 +598,7 @@ public int hashCode() {
         hash = (37 * hash) + METRICS_FIELD_NUMBER;
         hash = (53 * hash) + getMetricsList().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -601,10 +731,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.api.Monitoring.MonitoringDestination.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -714,7 +851,7 @@ public Builder mergeFrom(com.google.api.Monitoring.MonitoringDestination other)
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -729,44 +866,18 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.api.Monitoring.MonitoringDestination parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  monitoredResource_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  java.lang.String s = input.readStringRequireUtf8();
-                  ensureMetricsIsMutable();
-                  metrics_.add(s);
-                  break;
-                } // case 18
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.api.Monitoring.MonitoringDestination) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1121,19 +1232,7 @@ public MonitoringDestination parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new MonitoringDestination(input, extensionRegistry);
           }
         };
 
@@ -1374,7 +1473,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < consumerDestinations_.size(); i++) {
       output.writeMessage(2, consumerDestinations_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1391,7 +1490,7 @@ public int getSerializedSize() {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(2, consumerDestinations_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1408,7 +1507,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getProducerDestinationsList().equals(other.getProducerDestinationsList())) return false;
     if (!getConsumerDestinationsList().equals(other.getConsumerDestinationsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1427,7 +1526,7 @@ public int hashCode() {
       hash = (37 * hash) + CONSUMER_DESTINATIONS_FIELD_NUMBER;
       hash = (53 * hash) + getConsumerDestinationsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1602,10 +1701,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Monitoring.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getProducerDestinationsFieldBuilder();
+        getConsumerDestinationsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -1613,18 +1722,16 @@ public Builder clear() {
       super.clear();
       if (producerDestinationsBuilder_ == null) {
         producerDestinations_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        producerDestinations_ = null;
         producerDestinationsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       if (consumerDestinationsBuilder_ == null) {
         consumerDestinations_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
-        consumerDestinations_ = null;
         consumerDestinationsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -1772,7 +1879,7 @@ public Builder mergeFrom(com.google.api.Monitoring other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1787,59 +1894,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Monitoring parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.api.Monitoring.MonitoringDestination m =
-                    input.readMessage(
-                        com.google.api.Monitoring.MonitoringDestination.parser(),
-                        extensionRegistry);
-                if (producerDestinationsBuilder_ == null) {
-                  ensureProducerDestinationsIsMutable();
-                  producerDestinations_.add(m);
-                } else {
-                  producerDestinationsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.api.Monitoring.MonitoringDestination m =
-                    input.readMessage(
-                        com.google.api.Monitoring.MonitoringDestination.parser(),
-                        extensionRegistry);
-                if (consumerDestinationsBuilder_ == null) {
-                  ensureConsumerDestinationsIsMutable();
-                  consumerDestinations_.add(m);
-                } else {
-                  consumerDestinationsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Monitoring) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2815,18 +2880,7 @@ public Monitoring parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Monitoring(input, extensionRegistry);
         }
       };
 
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 38a1bbd4d5..d8d4b9482c 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
@@ -51,6 +51,61 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private NodeSettings(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.api.CommonLanguageSettings.Builder subBuilder = null;
+              if (common_ != null) {
+                subBuilder = common_.toBuilder();
+              }
+              common_ =
+                  input.readMessage(
+                      com.google.api.CommonLanguageSettings.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(common_);
+                common_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_NodeSettings_descriptor;
   }
@@ -129,7 +184,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (common_ != null) {
       output.writeMessage(1, getCommon());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -141,7 +196,7 @@ public int getSerializedSize() {
     if (common_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCommon());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -160,7 +215,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasCommon()) {
       if (!getCommon().equals(other.getCommon())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -175,7 +230,7 @@ public int hashCode() {
       hash = (37 * hash) + COMMON_FIELD_NUMBER;
       hash = (53 * hash) + getCommon().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -301,10 +356,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.NodeSettings.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -398,7 +460,7 @@ public Builder mergeFrom(com.google.api.NodeSettings other) {
       if (other.hasCommon()) {
         mergeCommon(other.getCommon());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -413,37 +475,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.NodeSettings parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.NodeSettings) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -673,18 +715,7 @@ public NodeSettings parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new NodeSettings(input, extensionRegistry);
         }
       };
 
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 ffc701606f..211f39445a 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
@@ -66,6 +66,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private OAuthRequirements(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              canonicalScopes_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.AuthProto.internal_static_google_api_OAuthRequirements_descriptor;
   }
@@ -154,7 +200,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(canonicalScopes_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, canonicalScopes_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -166,7 +212,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(canonicalScopes_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, canonicalScopes_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -182,7 +228,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.api.OAuthRequirements other = (com.google.api.OAuthRequirements) obj;
 
     if (!getCanonicalScopes().equals(other.getCanonicalScopes())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -195,7 +241,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + CANONICAL_SCOPES_FIELD_NUMBER;
     hash = (53 * hash) + getCanonicalScopes().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -336,10 +382,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.OAuthRequirements.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -426,7 +479,7 @@ public Builder mergeFrom(com.google.api.OAuthRequirements other) {
         canonicalScopes_ = other.canonicalScopes_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -441,37 +494,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.OAuthRequirements parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                canonicalScopes_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.OAuthRequirements) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -638,18 +671,7 @@ public OAuthRequirements parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new OAuthRequirements(input, extensionRegistry);
         }
       };
 
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 2fe1232896..3020c77e82 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
@@ -56,6 +56,72 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Page(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              content_ = s;
+              break;
+            }
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                subpages_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              subpages_.add(input.readMessage(com.google.api.Page.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        subpages_ = java.util.Collections.unmodifiableList(subpages_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.DocumentationProto.internal_static_google_api_Page_descriptor;
   }
@@ -301,7 +367,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < subpages_.size(); i++) {
       output.writeMessage(3, subpages_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -319,7 +385,7 @@ public int getSerializedSize() {
     for (int i = 0; i < subpages_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, subpages_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -337,7 +403,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getName().equals(other.getName())) return false;
     if (!getContent().equals(other.getContent())) return false;
     if (!getSubpagesList().equals(other.getSubpagesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -356,7 +422,7 @@ public int hashCode() {
       hash = (37 * hash) + SUBPAGES_FIELD_NUMBER;
       hash = (53 * hash) + getSubpagesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -483,10 +549,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Page.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getSubpagesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -498,11 +573,10 @@ public Builder clear() {
 
       if (subpagesBuilder_ == null) {
         subpages_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        subpages_ = null;
         subpagesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -624,7 +698,7 @@ public Builder mergeFrom(com.google.api.Page other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -639,55 +713,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Page parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                content_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                com.google.api.Page m =
-                    input.readMessage(com.google.api.Page.parser(), extensionRegistry);
-                if (subpagesBuilder_ == null) {
-                  ensureSubpagesIsMutable();
-                  subpages_.add(m);
-                } else {
-                  subpagesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Page) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1392,18 +1428,7 @@ public Page parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Page(input, extensionRegistry);
         }
       };
 
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 94904d8280..d877e723ea 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
@@ -51,6 +51,61 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PhpSettings(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.api.CommonLanguageSettings.Builder subBuilder = null;
+              if (common_ != null) {
+                subBuilder = common_.toBuilder();
+              }
+              common_ =
+                  input.readMessage(
+                      com.google.api.CommonLanguageSettings.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(common_);
+                common_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_PhpSettings_descriptor;
   }
@@ -129,7 +184,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (common_ != null) {
       output.writeMessage(1, getCommon());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -141,7 +196,7 @@ public int getSerializedSize() {
     if (common_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCommon());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -160,7 +215,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasCommon()) {
       if (!getCommon().equals(other.getCommon())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -175,7 +230,7 @@ public int hashCode() {
       hash = (37 * hash) + COMMON_FIELD_NUMBER;
       hash = (53 * hash) + getCommon().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -301,10 +356,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.PhpSettings.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -398,7 +460,7 @@ public Builder mergeFrom(com.google.api.PhpSettings other) {
       if (other.hasCommon()) {
         mergeCommon(other.getCommon());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -413,37 +475,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.PhpSettings parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.PhpSettings) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -673,18 +715,7 @@ public PhpSettings parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PhpSettings(input, extensionRegistry);
         }
       };
 
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 5ae43c66b3..fff614cf82 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
@@ -66,6 +66,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ProjectProperties(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                properties_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              properties_.add(
+                  input.readMessage(com.google.api.Property.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        properties_ = java.util.Collections.unmodifiableList(properties_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ConsumerProto.internal_static_google_api_ProjectProperties_descriptor;
   }
@@ -169,7 +222,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < properties_.size(); i++) {
       output.writeMessage(1, properties_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -181,7 +234,7 @@ public int getSerializedSize() {
     for (int i = 0; i < properties_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, properties_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -197,7 +250,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.api.ProjectProperties other = (com.google.api.ProjectProperties) obj;
 
     if (!getPropertiesList().equals(other.getPropertiesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -212,7 +265,7 @@ public int hashCode() {
       hash = (37 * hash) + PROPERTIES_FIELD_NUMBER;
       hash = (53 * hash) + getPropertiesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -353,10 +406,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.ProjectProperties.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPropertiesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -364,11 +426,10 @@ public Builder clear() {
       super.clear();
       if (propertiesBuilder_ == null) {
         properties_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        properties_ = null;
         propertiesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -480,7 +541,7 @@ public Builder mergeFrom(com.google.api.ProjectProperties other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -495,43 +556,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.ProjectProperties parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.api.Property m =
-                    input.readMessage(com.google.api.Property.parser(), extensionRegistry);
-                if (propertiesBuilder_ == null) {
-                  ensurePropertiesIsMutable();
-                  properties_.add(m);
-                } else {
-                  propertiesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.ProjectProperties) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -928,18 +963,7 @@ public ProjectProperties parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ProjectProperties(input, extensionRegistry);
         }
       };
 
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 9617562236..4d890a7a0f 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
@@ -62,6 +62,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Property(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 16:
+            {
+              int rawValue = input.readEnum();
+
+              type_ = rawValue;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              description_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ConsumerProto.internal_static_google_api_Property_descriptor;
   }
@@ -442,7 +502,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, description_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -460,7 +520,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, description_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -478,7 +538,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getName().equals(other.getName())) return false;
     if (type_ != other.type_) return false;
     if (!getDescription().equals(other.getDescription())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -495,7 +555,7 @@ public int hashCode() {
     hash = (53 * hash) + type_;
     hash = (37 * hash) + DESCRIPTION_FIELD_NUMBER;
     hash = (53 * hash) + getDescription().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -628,10 +688,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Property.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -731,7 +798,7 @@ public Builder mergeFrom(com.google.api.Property other) {
         description_ = other.description_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -746,49 +813,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Property parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                type_ = input.readEnum();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                description_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Property) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1142,18 +1177,7 @@ public Property parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Property(input, extensionRegistry);
         }
       };
 
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 524a41b502..e5044a545c 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
@@ -65,6 +65,142 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Publishing(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                methodSettings_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              methodSettings_.add(
+                  input.readMessage(com.google.api.MethodSettings.parser(), extensionRegistry));
+              break;
+            }
+          case 810:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              newIssueUri_ = s;
+              break;
+            }
+          case 818:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              documentationUri_ = s;
+              break;
+            }
+          case 826:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              apiShortName_ = s;
+              break;
+            }
+          case 834:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              githubLabel_ = s;
+              break;
+            }
+          case 842:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                codeownerGithubTeams_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              codeownerGithubTeams_.add(s);
+              break;
+            }
+          case 850:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              docTagPrefix_ = s;
+              break;
+            }
+          case 856:
+            {
+              int rawValue = input.readEnum();
+
+              organization_ = rawValue;
+              break;
+            }
+          case 874:
+            {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                librarySettings_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              librarySettings_.add(
+                  input.readMessage(
+                      com.google.api.ClientLibrarySettings.parser(), extensionRegistry));
+              break;
+            }
+          case 882:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              protoReferenceDocumentationUri_ = s;
+              break;
+            }
+          case 890:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              restReferenceDocumentationUri_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        methodSettings_ = java.util.Collections.unmodifiableList(methodSettings_);
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        codeownerGithubTeams_ = codeownerGithubTeams_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000004) != 0)) {
+        librarySettings_ = java.util.Collections.unmodifiableList(librarySettings_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_Publishing_descriptor;
   }
@@ -770,7 +906,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       com.google.protobuf.GeneratedMessageV3.writeString(
           output, 111, restReferenceDocumentationUri_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -824,7 +960,7 @@ public int getSerializedSize() {
           com.google.protobuf.GeneratedMessageV3.computeStringSize(
               111, restReferenceDocumentationUri_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -852,7 +988,7 @@ public boolean equals(final java.lang.Object obj) {
       return false;
     if (!getRestReferenceDocumentationUri().equals(other.getRestReferenceDocumentationUri()))
       return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -891,7 +1027,7 @@ public int hashCode() {
     hash = (53 * hash) + getProtoReferenceDocumentationUri().hashCode();
     hash = (37 * hash) + REST_REFERENCE_DOCUMENTATION_URI_FIELD_NUMBER;
     hash = (53 * hash) + getRestReferenceDocumentationUri().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1019,10 +1155,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Publishing.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getMethodSettingsFieldBuilder();
+        getLibrarySettingsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -1030,11 +1176,10 @@ public Builder clear() {
       super.clear();
       if (methodSettingsBuilder_ == null) {
         methodSettings_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        methodSettings_ = null;
         methodSettingsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       newIssueUri_ = "";
 
       documentationUri_ = "";
@@ -1051,11 +1196,10 @@ public Builder clear() {
 
       if (librarySettingsBuilder_ == null) {
         librarySettings_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000004);
       } else {
-        librarySettings_ = null;
         librarySettingsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
       protoReferenceDocumentationUri_ = "";
 
       restReferenceDocumentationUri_ = "";
@@ -1261,7 +1405,7 @@ public Builder mergeFrom(com.google.api.Publishing other) {
         restReferenceDocumentationUri_ = other.restReferenceDocumentationUri_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1276,111 +1420,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Publishing parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 18:
-              {
-                com.google.api.MethodSettings m =
-                    input.readMessage(com.google.api.MethodSettings.parser(), extensionRegistry);
-                if (methodSettingsBuilder_ == null) {
-                  ensureMethodSettingsIsMutable();
-                  methodSettings_.add(m);
-                } else {
-                  methodSettingsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            case 810:
-              {
-                newIssueUri_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 810
-            case 818:
-              {
-                documentationUri_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 818
-            case 826:
-              {
-                apiShortName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 826
-            case 834:
-              {
-                githubLabel_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 834
-            case 842:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureCodeownerGithubTeamsIsMutable();
-                codeownerGithubTeams_.add(s);
-                break;
-              } // case 842
-            case 850:
-              {
-                docTagPrefix_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 850
-            case 856:
-              {
-                organization_ = input.readEnum();
-
-                break;
-              } // case 856
-            case 874:
-              {
-                com.google.api.ClientLibrarySettings m =
-                    input.readMessage(
-                        com.google.api.ClientLibrarySettings.parser(), extensionRegistry);
-                if (librarySettingsBuilder_ == null) {
-                  ensureLibrarySettingsIsMutable();
-                  librarySettings_.add(m);
-                } else {
-                  librarySettingsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 874
-            case 882:
-              {
-                protoReferenceDocumentationUri_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 882
-            case 890:
-              {
-                restReferenceDocumentationUri_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 890
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Publishing) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -3305,18 +3355,7 @@ public Publishing parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Publishing(input, extensionRegistry);
         }
       };
 
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 632d75f281..fb591d8fde 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
@@ -51,6 +51,78 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PythonSettings(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.api.CommonLanguageSettings.Builder subBuilder = null;
+              if (common_ != null) {
+                subBuilder = common_.toBuilder();
+              }
+              common_ =
+                  input.readMessage(
+                      com.google.api.CommonLanguageSettings.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(common_);
+                common_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              com.google.api.PythonSettings.ExperimentalFeatures.Builder subBuilder = null;
+              if (experimentalFeatures_ != null) {
+                subBuilder = experimentalFeatures_.toBuilder();
+              }
+              experimentalFeatures_ =
+                  input.readMessage(
+                      com.google.api.PythonSettings.ExperimentalFeatures.parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(experimentalFeatures_);
+                experimentalFeatures_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_PythonSettings_descriptor;
   }
@@ -152,6 +224,60 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private ExperimentalFeatures(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                restAsyncIoEnabled_ = input.readBool();
+                break;
+              }
+            case 16:
+              {
+                protobufPythonicTypesEnabled_ = input.readBool();
+                break;
+              }
+            case 24:
+              {
+                unversionedPackageDisabled_ = input.readBool();
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.api.ClientProto
           .internal_static_google_api_PythonSettings_ExperimentalFeatures_descriptor;
@@ -256,7 +382,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (unversionedPackageDisabled_ != false) {
         output.writeBool(3, unversionedPackageDisabled_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -276,7 +402,7 @@ public int getSerializedSize() {
         size +=
             com.google.protobuf.CodedOutputStream.computeBoolSize(3, unversionedPackageDisabled_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -296,7 +422,7 @@ public boolean equals(final java.lang.Object obj) {
       if (getProtobufPythonicTypesEnabled() != other.getProtobufPythonicTypesEnabled())
         return false;
       if (getUnversionedPackageDisabled() != other.getUnversionedPackageDisabled()) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -315,7 +441,7 @@ public int hashCode() {
       hash = (37 * hash) + UNVERSIONED_PACKAGE_DISABLED_FIELD_NUMBER;
       hash =
           (53 * hash) + com.google.protobuf.Internal.hashBoolean(getUnversionedPackageDisabled());
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -449,10 +575,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.api.PythonSettings.ExperimentalFeatures.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -555,7 +688,7 @@ public Builder mergeFrom(com.google.api.PythonSettings.ExperimentalFeatures othe
         if (other.getUnversionedPackageDisabled() != false) {
           setUnversionedPackageDisabled(other.getUnversionedPackageDisabled());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -570,49 +703,18 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.api.PythonSettings.ExperimentalFeatures parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 8:
-                {
-                  restAsyncIoEnabled_ = input.readBool();
-
-                  break;
-                } // case 8
-              case 16:
-                {
-                  protobufPythonicTypesEnabled_ = input.readBool();
-
-                  break;
-                } // case 16
-              case 24:
-                {
-                  unversionedPackageDisabled_ = input.readBool();
-
-                  break;
-                } // case 24
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.api.PythonSettings.ExperimentalFeatures) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -841,19 +943,7 @@ public ExperimentalFeatures parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new ExperimentalFeatures(input, extensionRegistry);
           }
         };
 
@@ -993,7 +1083,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (experimentalFeatures_ != null) {
       output.writeMessage(2, getExperimentalFeatures());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1009,7 +1099,7 @@ public int getSerializedSize() {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(2, getExperimentalFeatures());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1032,7 +1122,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasExperimentalFeatures()) {
       if (!getExperimentalFeatures().equals(other.getExperimentalFeatures())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1051,7 +1141,7 @@ public int hashCode() {
       hash = (37 * hash) + EXPERIMENTAL_FEATURES_FIELD_NUMBER;
       hash = (53 * hash) + getExperimentalFeatures().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1177,10 +1267,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.PythonSettings.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1288,7 +1385,7 @@ public Builder mergeFrom(com.google.api.PythonSettings other) {
       if (other.hasExperimentalFeatures()) {
         mergeExperimentalFeatures(other.getExperimentalFeatures());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1303,44 +1400,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.PythonSettings parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(
-                    getExperimentalFeaturesFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.PythonSettings) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1769,18 +1839,7 @@ public PythonSettings parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PythonSettings(input, extensionRegistry);
         }
       };
 
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 f118ed6949..e69bca2fd4 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
@@ -93,6 +93,71 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Quota(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                limits_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              limits_.add(input.readMessage(com.google.api.QuotaLimit.parser(), extensionRegistry));
+              break;
+            }
+          case 34:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                metricRules_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              metricRules_.add(
+                  input.readMessage(com.google.api.MetricRule.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        limits_ = java.util.Collections.unmodifiableList(limits_);
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        metricRules_ = java.util.Collections.unmodifiableList(metricRules_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.QuotaProto.internal_static_google_api_Quota_descriptor;
   }
@@ -277,7 +342,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < metricRules_.size(); i++) {
       output.writeMessage(4, metricRules_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -292,7 +357,7 @@ public int getSerializedSize() {
     for (int i = 0; i < metricRules_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, metricRules_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -309,7 +374,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getLimitsList().equals(other.getLimitsList())) return false;
     if (!getMetricRulesList().equals(other.getMetricRulesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -328,7 +393,7 @@ public int hashCode() {
       hash = (37 * hash) + METRIC_RULES_FIELD_NUMBER;
       hash = (53 * hash) + getMetricRulesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -493,10 +558,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Quota.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getLimitsFieldBuilder();
+        getMetricRulesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -504,18 +579,16 @@ public Builder clear() {
       super.clear();
       if (limitsBuilder_ == null) {
         limits_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        limits_ = null;
         limitsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       if (metricRulesBuilder_ == null) {
         metricRules_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
-        metricRules_ = null;
         metricRulesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -663,7 +736,7 @@ public Builder mergeFrom(com.google.api.Quota other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -678,55 +751,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Quota parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 26:
-              {
-                com.google.api.QuotaLimit m =
-                    input.readMessage(com.google.api.QuotaLimit.parser(), extensionRegistry);
-                if (limitsBuilder_ == null) {
-                  ensureLimitsIsMutable();
-                  limits_.add(m);
-                } else {
-                  limitsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 26
-            case 34:
-              {
-                com.google.api.MetricRule m =
-                    input.readMessage(com.google.api.MetricRule.parser(), extensionRegistry);
-                if (metricRulesBuilder_ == null) {
-                  ensureMetricRulesIsMutable();
-                  metricRules_.add(m);
-                } else {
-                  metricRulesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Quota) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1504,18 +1539,7 @@ public Quota parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Quota(input, extensionRegistry);
         }
       };
 
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 ef48ef5dc6..c99965fcd5 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
@@ -60,6 +60,116 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private QuotaLimit(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              description_ = s;
+              break;
+            }
+          case 24:
+            {
+              defaultLimit_ = input.readInt64();
+              break;
+            }
+          case 32:
+            {
+              maxLimit_ = input.readInt64();
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              duration_ = s;
+              break;
+            }
+          case 50:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 56:
+            {
+              freeTier_ = input.readInt64();
+              break;
+            }
+          case 66:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              metric_ = s;
+              break;
+            }
+          case 74:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              unit_ = s;
+              break;
+            }
+          case 82:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                values_ =
+                    com.google.protobuf.MapField.newMapField(ValuesDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry values__ =
+                  input.readMessage(
+                      ValuesDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              values_.getMutableMap().put(values__.getKey(), values__.getValue());
+              break;
+            }
+          case 98:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              displayName_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.QuotaProto.internal_static_google_api_QuotaLimit_descriptor;
   }
@@ -652,7 +762,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 12, displayName_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -698,7 +808,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, displayName_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -723,7 +833,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getUnit().equals(other.getUnit())) return false;
     if (!internalGetValues().equals(other.internalGetValues())) return false;
     if (!getDisplayName().equals(other.getDisplayName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -756,7 +866,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + DISPLAY_NAME_FIELD_NUMBER;
     hash = (53 * hash) + getDisplayName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -904,10 +1014,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.api.QuotaLimit.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1052,7 +1169,7 @@ public Builder mergeFrom(com.google.api.QuotaLimit other) {
         displayName_ = other.displayName_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1067,96 +1184,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.QuotaLimit parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 18:
-              {
-                description_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 24:
-              {
-                defaultLimit_ = input.readInt64();
-
-                break;
-              } // case 24
-            case 32:
-              {
-                maxLimit_ = input.readInt64();
-
-                break;
-              } // case 32
-            case 42:
-              {
-                duration_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 42
-            case 50:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 50
-            case 56:
-              {
-                freeTier_ = input.readInt64();
-
-                break;
-              } // case 56
-            case 66:
-              {
-                metric_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 66
-            case 74:
-              {
-                unit_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 74
-            case 82:
-              {
-                com.google.protobuf.MapEntry values__ =
-                    input.readMessage(
-                        ValuesDefaultEntryHolder.defaultEntry.getParserForType(),
-                        extensionRegistry);
-                internalGetMutableValues()
-                    .getMutableMap()
-                    .put(values__.getKey(), values__.getValue());
-                break;
-              } // case 82
-            case 98:
-              {
-                displayName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 98
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.QuotaLimit) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2344,18 +2382,7 @@ public QuotaLimit parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new QuotaLimit(input, extensionRegistry);
         }
       };
 
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 b611035509..c0d482fe0d 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
@@ -95,6 +95,122 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ResourceDescriptor(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              type_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                pattern_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              pattern_.add(s);
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nameField_ = s;
+              break;
+            }
+          case 32:
+            {
+              int rawValue = input.readEnum();
+
+              history_ = rawValue;
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              plural_ = s;
+              break;
+            }
+          case 50:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              singular_ = s;
+              break;
+            }
+          case 80:
+            {
+              int rawValue = input.readEnum();
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                style_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              style_.add(rawValue);
+              break;
+            }
+          case 82:
+            {
+              int length = input.readRawVarint32();
+              int oldLimit = input.pushLimit(length);
+              while (input.getBytesUntilLimit() > 0) {
+                int rawValue = input.readEnum();
+                if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                  style_ = new java.util.ArrayList();
+                  mutable_bitField0_ |= 0x00000002;
+                }
+                style_.add(rawValue);
+              }
+              input.popLimit(oldLimit);
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        pattern_ = pattern_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        style_ = java.util.Collections.unmodifiableList(style_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ResourceProto.internal_static_google_api_ResourceDescriptor_descriptor;
   }
@@ -994,7 +1110,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < style_.size(); i++) {
       output.writeEnumNoTag(style_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1038,7 +1154,7 @@ public int getSerializedSize() {
       }
       styleMemoizedSerializedSize = dataSize;
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1060,7 +1176,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getPlural().equals(other.getPlural())) return false;
     if (!getSingular().equals(other.getSingular())) return false;
     if (!style_.equals(other.style_)) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1089,7 +1205,7 @@ public int hashCode() {
       hash = (37 * hash) + STYLE_FIELD_NUMBER;
       hash = (53 * hash) + style_.hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1253,10 +1369,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.ResourceDescriptor.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1405,7 +1528,7 @@ public Builder mergeFrom(com.google.api.ResourceDescriptor other) {
         }
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1420,87 +1543,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.ResourceDescriptor parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                type_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensurePatternIsMutable();
-                pattern_.add(s);
-                break;
-              } // case 18
-            case 26:
-              {
-                nameField_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 32:
-              {
-                history_ = input.readEnum();
-
-                break;
-              } // case 32
-            case 42:
-              {
-                plural_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 42
-            case 50:
-              {
-                singular_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 50
-            case 80:
-              {
-                int tmpRaw = input.readEnum();
-                ensureStyleIsMutable();
-                style_.add(tmpRaw);
-                break;
-              } // case 80
-            case 82:
-              {
-                int length = input.readRawVarint32();
-                int oldLimit = input.pushLimit(length);
-                while (input.getBytesUntilLimit() > 0) {
-                  int tmpRaw = input.readEnum();
-                  ensureStyleIsMutable();
-                  style_.add(tmpRaw);
-                }
-                input.popLimit(oldLimit);
-                break;
-              } // case 82
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.ResourceDescriptor) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2788,18 +2841,7 @@ public ResourceDescriptor parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ResourceDescriptor(input, extensionRegistry);
         }
       };
 
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 345d0101b2..9b37482b16 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
@@ -55,6 +55,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ResourceReference(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              type_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              childType_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ResourceProto.internal_static_google_api_ResourceReference_descriptor;
   }
@@ -234,7 +287,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(childType_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, childType_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -249,7 +302,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(childType_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, childType_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -266,7 +319,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getType().equals(other.getType())) return false;
     if (!getChildType().equals(other.getChildType())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -281,7 +334,7 @@ public int hashCode() {
     hash = (53 * hash) + getType().hashCode();
     hash = (37 * hash) + CHILD_TYPE_FIELD_NUMBER;
     hash = (53 * hash) + getChildType().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -410,10 +463,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.ResourceReference.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -507,7 +567,7 @@ public Builder mergeFrom(com.google.api.ResourceReference other) {
         childType_ = other.childType_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -522,43 +582,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.ResourceReference parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                type_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                childType_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.ResourceReference) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -926,18 +960,7 @@ public ResourceReference parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ResourceReference(input, extensionRegistry);
         }
       };
 
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 370e39de94..5fb3e95540 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
@@ -54,6 +54,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private RoutingParameter(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              field_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pathTemplate_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.RoutingProto.internal_static_google_api_RoutingParameter_descriptor;
   }
@@ -279,7 +332,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pathTemplate_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, pathTemplate_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -294,7 +347,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pathTemplate_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, pathTemplate_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -311,7 +364,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getField().equals(other.getField())) return false;
     if (!getPathTemplate().equals(other.getPathTemplate())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -326,7 +379,7 @@ public int hashCode() {
     hash = (53 * hash) + getField().hashCode();
     hash = (37 * hash) + PATH_TEMPLATE_FIELD_NUMBER;
     hash = (53 * hash) + getPathTemplate().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -453,10 +506,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.RoutingParameter.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -550,7 +610,7 @@ public Builder mergeFrom(com.google.api.RoutingParameter other) {
         pathTemplate_ = other.pathTemplate_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -565,43 +625,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.RoutingParameter parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                field_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                pathTemplate_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.RoutingParameter) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1084,18 +1118,7 @@ public RoutingParameter parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new RoutingParameter(input, extensionRegistry);
         }
       };
 
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 6f81ccf659..85b46b6d94 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
@@ -319,6 +319,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private RoutingRule(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                routingParameters_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              routingParameters_.add(
+                  input.readMessage(com.google.api.RoutingParameter.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        routingParameters_ = java.util.Collections.unmodifiableList(routingParameters_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.RoutingProto.internal_static_google_api_RoutingRule_descriptor;
   }
@@ -447,7 +500,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < routingParameters_.size(); i++) {
       output.writeMessage(2, routingParameters_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -460,7 +513,7 @@ public int getSerializedSize() {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(2, routingParameters_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -476,7 +529,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.api.RoutingRule other = (com.google.api.RoutingRule) obj;
 
     if (!getRoutingParametersList().equals(other.getRoutingParametersList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -491,7 +544,7 @@ public int hashCode() {
       hash = (37 * hash) + ROUTING_PARAMETERS_FIELD_NUMBER;
       hash = (53 * hash) + getRoutingParametersList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -883,10 +936,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.RoutingRule.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getRoutingParametersFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -894,11 +956,10 @@ public Builder clear() {
       super.clear();
       if (routingParametersBuilder_ == null) {
         routingParameters_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        routingParameters_ = null;
         routingParametersBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -1010,7 +1071,7 @@ public Builder mergeFrom(com.google.api.RoutingRule other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1025,43 +1086,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.RoutingRule parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 18:
-              {
-                com.google.api.RoutingParameter m =
-                    input.readMessage(com.google.api.RoutingParameter.parser(), extensionRegistry);
-                if (routingParametersBuilder_ == null) {
-                  ensureRoutingParametersIsMutable();
-                  routingParameters_.add(m);
-                } else {
-                  routingParametersBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.RoutingRule) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1559,18 +1594,7 @@ public RoutingRule parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new RoutingRule(input, extensionRegistry);
         }
       };
 
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 efc1a83000..f3841113f6 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
@@ -51,6 +51,61 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private RubySettings(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.api.CommonLanguageSettings.Builder subBuilder = null;
+              if (common_ != null) {
+                subBuilder = common_.toBuilder();
+              }
+              common_ =
+                  input.readMessage(
+                      com.google.api.CommonLanguageSettings.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(common_);
+                common_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto.internal_static_google_api_RubySettings_descriptor;
   }
@@ -129,7 +184,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (common_ != null) {
       output.writeMessage(1, getCommon());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -141,7 +196,7 @@ public int getSerializedSize() {
     if (common_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCommon());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -160,7 +215,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasCommon()) {
       if (!getCommon().equals(other.getCommon())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -175,7 +230,7 @@ public int hashCode() {
       hash = (37 * hash) + COMMON_FIELD_NUMBER;
       hash = (53 * hash) + getCommon().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -301,10 +356,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.RubySettings.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -398,7 +460,7 @@ public Builder mergeFrom(com.google.api.RubySettings other) {
       if (other.hasCommon()) {
         mergeCommon(other.getCommon());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -413,37 +475,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.RubySettings parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.RubySettings) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -673,18 +715,7 @@ public RubySettings parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new RubySettings(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGeneration.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGeneration.java
index 360f86fd43..0d7f934605 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGeneration.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/SelectiveGapicGeneration.java
@@ -54,6 +54,64 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SelectiveGapicGeneration(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                methods_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              methods_.add(s);
+              break;
+            }
+          case 16:
+            {
+              generateOmittedAsInternal_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        methods_ = methods_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ClientProto
         .internal_static_google_api_SelectiveGapicGeneration_descriptor;
@@ -182,7 +240,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (generateOmittedAsInternal_ != false) {
       output.writeBool(2, generateOmittedAsInternal_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -202,7 +260,7 @@ public int getSerializedSize() {
     if (generateOmittedAsInternal_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(2, generateOmittedAsInternal_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -219,7 +277,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getMethodsList().equals(other.getMethodsList())) return false;
     if (getGenerateOmittedAsInternal() != other.getGenerateOmittedAsInternal()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -236,7 +294,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + GENERATE_OMITTED_AS_INTERNAL_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getGenerateOmittedAsInternal());
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -367,10 +425,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.SelectiveGapicGeneration.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -476,7 +541,7 @@ public Builder mergeFrom(com.google.api.SelectiveGapicGeneration other) {
       if (other.getGenerateOmittedAsInternal() != false) {
         setGenerateOmittedAsInternal(other.getGenerateOmittedAsInternal());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -491,44 +556,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.SelectiveGapicGeneration parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureMethodsIsMutable();
-                methods_.add(s);
-                break;
-              } // case 10
-            case 16:
-              {
-                generateOmittedAsInternal_ = input.readBool();
-
-                break;
-              } // case 16
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.SelectiveGapicGeneration) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -822,18 +860,7 @@ public SelectiveGapicGeneration parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new SelectiveGapicGeneration(input, extensionRegistry);
         }
       };
 
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 17f457d867..91cb533fae 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
@@ -91,6 +91,381 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Service(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              title_ = s;
+              break;
+            }
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                apis_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              apis_.add(input.readMessage(com.google.protobuf.Api.parser(), extensionRegistry));
+              break;
+            }
+          case 34:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                types_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              types_.add(input.readMessage(com.google.protobuf.Type.parser(), extensionRegistry));
+              break;
+            }
+          case 42:
+            {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                enums_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              enums_.add(input.readMessage(com.google.protobuf.Enum.parser(), extensionRegistry));
+              break;
+            }
+          case 50:
+            {
+              com.google.api.Documentation.Builder subBuilder = null;
+              if (documentation_ != null) {
+                subBuilder = documentation_.toBuilder();
+              }
+              documentation_ =
+                  input.readMessage(com.google.api.Documentation.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(documentation_);
+                documentation_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 66:
+            {
+              com.google.api.Backend.Builder subBuilder = null;
+              if (backend_ != null) {
+                subBuilder = backend_.toBuilder();
+              }
+              backend_ = input.readMessage(com.google.api.Backend.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(backend_);
+                backend_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 74:
+            {
+              com.google.api.Http.Builder subBuilder = null;
+              if (http_ != null) {
+                subBuilder = http_.toBuilder();
+              }
+              http_ = input.readMessage(com.google.api.Http.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(http_);
+                http_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 82:
+            {
+              com.google.api.Quota.Builder subBuilder = null;
+              if (quota_ != null) {
+                subBuilder = quota_.toBuilder();
+              }
+              quota_ = input.readMessage(com.google.api.Quota.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(quota_);
+                quota_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 90:
+            {
+              com.google.api.Authentication.Builder subBuilder = null;
+              if (authentication_ != null) {
+                subBuilder = authentication_.toBuilder();
+              }
+              authentication_ =
+                  input.readMessage(com.google.api.Authentication.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(authentication_);
+                authentication_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 98:
+            {
+              com.google.api.Context.Builder subBuilder = null;
+              if (context_ != null) {
+                subBuilder = context_.toBuilder();
+              }
+              context_ = input.readMessage(com.google.api.Context.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(context_);
+                context_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 122:
+            {
+              com.google.api.Usage.Builder subBuilder = null;
+              if (usage_ != null) {
+                subBuilder = usage_.toBuilder();
+              }
+              usage_ = input.readMessage(com.google.api.Usage.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(usage_);
+                usage_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 146:
+            {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                endpoints_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              endpoints_.add(
+                  input.readMessage(com.google.api.Endpoint.parser(), extensionRegistry));
+              break;
+            }
+          case 162:
+            {
+              com.google.protobuf.UInt32Value.Builder subBuilder = null;
+              if (configVersion_ != null) {
+                subBuilder = configVersion_.toBuilder();
+              }
+              configVersion_ =
+                  input.readMessage(com.google.protobuf.UInt32Value.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(configVersion_);
+                configVersion_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 170:
+            {
+              com.google.api.Control.Builder subBuilder = null;
+              if (control_ != null) {
+                subBuilder = control_.toBuilder();
+              }
+              control_ = input.readMessage(com.google.api.Control.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(control_);
+                control_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 178:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              producerProjectId_ = s;
+              break;
+            }
+          case 186:
+            {
+              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
+                logs_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000010;
+              }
+              logs_.add(
+                  input.readMessage(com.google.api.LogDescriptor.parser(), extensionRegistry));
+              break;
+            }
+          case 194:
+            {
+              if (!((mutable_bitField0_ & 0x00000020) != 0)) {
+                metrics_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000020;
+              }
+              metrics_.add(
+                  input.readMessage(com.google.api.MetricDescriptor.parser(), extensionRegistry));
+              break;
+            }
+          case 202:
+            {
+              if (!((mutable_bitField0_ & 0x00000040) != 0)) {
+                monitoredResources_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000040;
+              }
+              monitoredResources_.add(
+                  input.readMessage(
+                      com.google.api.MonitoredResourceDescriptor.parser(), extensionRegistry));
+              break;
+            }
+          case 210:
+            {
+              com.google.api.Billing.Builder subBuilder = null;
+              if (billing_ != null) {
+                subBuilder = billing_.toBuilder();
+              }
+              billing_ = input.readMessage(com.google.api.Billing.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(billing_);
+                billing_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 218:
+            {
+              com.google.api.Logging.Builder subBuilder = null;
+              if (logging_ != null) {
+                subBuilder = logging_.toBuilder();
+              }
+              logging_ = input.readMessage(com.google.api.Logging.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(logging_);
+                logging_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 226:
+            {
+              com.google.api.Monitoring.Builder subBuilder = null;
+              if (monitoring_ != null) {
+                subBuilder = monitoring_.toBuilder();
+              }
+              monitoring_ =
+                  input.readMessage(com.google.api.Monitoring.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(monitoring_);
+                monitoring_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 234:
+            {
+              com.google.api.SystemParameters.Builder subBuilder = null;
+              if (systemParameters_ != null) {
+                subBuilder = systemParameters_.toBuilder();
+              }
+              systemParameters_ =
+                  input.readMessage(com.google.api.SystemParameters.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(systemParameters_);
+                systemParameters_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 266:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              id_ = s;
+              break;
+            }
+          case 298:
+            {
+              com.google.api.SourceInfo.Builder subBuilder = null;
+              if (sourceInfo_ != null) {
+                subBuilder = sourceInfo_.toBuilder();
+              }
+              sourceInfo_ =
+                  input.readMessage(com.google.api.SourceInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(sourceInfo_);
+                sourceInfo_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 362:
+            {
+              com.google.api.Publishing.Builder subBuilder = null;
+              if (publishing_ != null) {
+                subBuilder = publishing_.toBuilder();
+              }
+              publishing_ =
+                  input.readMessage(com.google.api.Publishing.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(publishing_);
+                publishing_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        apis_ = java.util.Collections.unmodifiableList(apis_);
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        types_ = java.util.Collections.unmodifiableList(types_);
+      }
+      if (((mutable_bitField0_ & 0x00000004) != 0)) {
+        enums_ = java.util.Collections.unmodifiableList(enums_);
+      }
+      if (((mutable_bitField0_ & 0x00000008) != 0)) {
+        endpoints_ = java.util.Collections.unmodifiableList(endpoints_);
+      }
+      if (((mutable_bitField0_ & 0x00000010) != 0)) {
+        logs_ = java.util.Collections.unmodifiableList(logs_);
+      }
+      if (((mutable_bitField0_ & 0x00000020) != 0)) {
+        metrics_ = java.util.Collections.unmodifiableList(metrics_);
+      }
+      if (((mutable_bitField0_ & 0x00000040) != 0)) {
+        monitoredResources_ = java.util.Collections.unmodifiableList(monitoredResources_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ServiceProto.internal_static_google_api_Service_descriptor;
   }
@@ -1777,7 +2152,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (publishing_ != null) {
       output.writeMessage(45, getPublishing());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1865,7 +2240,7 @@ public int getSerializedSize() {
     if (publishing_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(45, getPublishing());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1951,7 +2326,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasConfigVersion()) {
       if (!getConfigVersion().equals(other.getConfigVersion())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -2058,7 +2433,7 @@ public int hashCode() {
       hash = (37 * hash) + CONFIG_VERSION_FIELD_NUMBER;
       hash = (53 * hash) + getConfigVersion().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -2212,10 +2587,25 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Service.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getApisFieldBuilder();
+        getTypesFieldBuilder();
+        getEnumsFieldBuilder();
+        getEndpointsFieldBuilder();
+        getLogsFieldBuilder();
+        getMetricsFieldBuilder();
+        getMonitoredResourcesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -2231,25 +2621,22 @@ public Builder clear() {
 
       if (apisBuilder_ == null) {
         apis_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        apis_ = null;
         apisBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       if (typesBuilder_ == null) {
         types_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
-        types_ = null;
         typesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
       if (enumsBuilder_ == null) {
         enums_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000004);
       } else {
-        enums_ = null;
         enumsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
       if (documentationBuilder_ == null) {
         documentation_ = null;
       } else {
@@ -2294,11 +2681,10 @@ public Builder clear() {
       }
       if (endpointsBuilder_ == null) {
         endpoints_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000008);
       } else {
-        endpoints_ = null;
         endpointsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000008);
       if (controlBuilder_ == null) {
         control_ = null;
       } else {
@@ -2307,25 +2693,22 @@ public Builder clear() {
       }
       if (logsBuilder_ == null) {
         logs_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000010);
       } else {
-        logs_ = null;
         logsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000010);
       if (metricsBuilder_ == null) {
         metrics_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000020);
       } else {
-        metrics_ = null;
         metricsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000020);
       if (monitoredResourcesBuilder_ == null) {
         monitoredResources_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000040);
       } else {
-        monitoredResources_ = null;
         monitoredResourcesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000040);
       if (billingBuilder_ == null) {
         billing_ = null;
       } else {
@@ -2835,7 +3218,7 @@ public Builder mergeFrom(com.google.api.Service other) {
       if (other.hasConfigVersion()) {
         mergeConfigVersion(other.getConfigVersion());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2850,231 +3233,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Service parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                title_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                com.google.protobuf.Api m =
-                    input.readMessage(com.google.protobuf.Api.parser(), extensionRegistry);
-                if (apisBuilder_ == null) {
-                  ensureApisIsMutable();
-                  apis_.add(m);
-                } else {
-                  apisBuilder_.addMessage(m);
-                }
-                break;
-              } // case 26
-            case 34:
-              {
-                com.google.protobuf.Type m =
-                    input.readMessage(com.google.protobuf.Type.parser(), extensionRegistry);
-                if (typesBuilder_ == null) {
-                  ensureTypesIsMutable();
-                  types_.add(m);
-                } else {
-                  typesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 34
-            case 42:
-              {
-                com.google.protobuf.Enum m =
-                    input.readMessage(com.google.protobuf.Enum.parser(), extensionRegistry);
-                if (enumsBuilder_ == null) {
-                  ensureEnumsIsMutable();
-                  enums_.add(m);
-                } else {
-                  enumsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 42
-            case 50:
-              {
-                input.readMessage(getDocumentationFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 50
-            case 66:
-              {
-                input.readMessage(getBackendFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 66
-            case 74:
-              {
-                input.readMessage(getHttpFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 74
-            case 82:
-              {
-                input.readMessage(getQuotaFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 82
-            case 90:
-              {
-                input.readMessage(getAuthenticationFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 90
-            case 98:
-              {
-                input.readMessage(getContextFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 98
-            case 122:
-              {
-                input.readMessage(getUsageFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 122
-            case 146:
-              {
-                com.google.api.Endpoint m =
-                    input.readMessage(com.google.api.Endpoint.parser(), extensionRegistry);
-                if (endpointsBuilder_ == null) {
-                  ensureEndpointsIsMutable();
-                  endpoints_.add(m);
-                } else {
-                  endpointsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 146
-            case 162:
-              {
-                input.readMessage(getConfigVersionFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 162
-            case 170:
-              {
-                input.readMessage(getControlFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 170
-            case 178:
-              {
-                producerProjectId_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 178
-            case 186:
-              {
-                com.google.api.LogDescriptor m =
-                    input.readMessage(com.google.api.LogDescriptor.parser(), extensionRegistry);
-                if (logsBuilder_ == null) {
-                  ensureLogsIsMutable();
-                  logs_.add(m);
-                } else {
-                  logsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 186
-            case 194:
-              {
-                com.google.api.MetricDescriptor m =
-                    input.readMessage(com.google.api.MetricDescriptor.parser(), extensionRegistry);
-                if (metricsBuilder_ == null) {
-                  ensureMetricsIsMutable();
-                  metrics_.add(m);
-                } else {
-                  metricsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 194
-            case 202:
-              {
-                com.google.api.MonitoredResourceDescriptor m =
-                    input.readMessage(
-                        com.google.api.MonitoredResourceDescriptor.parser(), extensionRegistry);
-                if (monitoredResourcesBuilder_ == null) {
-                  ensureMonitoredResourcesIsMutable();
-                  monitoredResources_.add(m);
-                } else {
-                  monitoredResourcesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 202
-            case 210:
-              {
-                input.readMessage(getBillingFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 210
-            case 218:
-              {
-                input.readMessage(getLoggingFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 218
-            case 226:
-              {
-                input.readMessage(getMonitoringFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 226
-            case 234:
-              {
-                input.readMessage(
-                    getSystemParametersFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 234
-            case 266:
-              {
-                id_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 266
-            case 298:
-              {
-                input.readMessage(getSourceInfoFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 298
-            case 362:
-              {
-                input.readMessage(getPublishingFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 362
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Service) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -9296,18 +9465,7 @@ public Service parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Service(input, extensionRegistry);
         }
       };
 
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 878315a9dd..ddf49e455e 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
@@ -53,6 +53,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SourceInfo(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                sourceFiles_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              sourceFiles_.add(
+                  input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        sourceFiles_ = java.util.Collections.unmodifiableList(sourceFiles_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.SourceInfoProto.internal_static_google_api_SourceInfo_descriptor;
   }
@@ -155,7 +208,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < sourceFiles_.size(); i++) {
       output.writeMessage(1, sourceFiles_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -167,7 +220,7 @@ public int getSerializedSize() {
     for (int i = 0; i < sourceFiles_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, sourceFiles_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -183,7 +236,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.api.SourceInfo other = (com.google.api.SourceInfo) obj;
 
     if (!getSourceFilesList().equals(other.getSourceFilesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -198,7 +251,7 @@ public int hashCode() {
       hash = (37 * hash) + SOURCE_FILES_FIELD_NUMBER;
       hash = (53 * hash) + getSourceFilesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -324,10 +377,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.SourceInfo.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getSourceFilesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -335,11 +397,10 @@ public Builder clear() {
       super.clear();
       if (sourceFilesBuilder_ == null) {
         sourceFiles_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        sourceFiles_ = null;
         sourceFilesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -451,7 +512,7 @@ public Builder mergeFrom(com.google.api.SourceInfo other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -466,43 +527,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.SourceInfo parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.protobuf.Any m =
-                    input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry);
-                if (sourceFilesBuilder_ == null) {
-                  ensureSourceFilesIsMutable();
-                  sourceFiles_.add(m);
-                } else {
-                  sourceFilesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.SourceInfo) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -901,18 +936,7 @@ public SourceInfo parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new SourceInfo(input, extensionRegistry);
         }
       };
 
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 cceba5b476..2fc65bf0ac 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
@@ -57,6 +57,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SystemParameter(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              httpHeader_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              urlQueryParameter_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.SystemParameterProto
         .internal_static_google_api_SystemParameter_descriptor;
@@ -251,7 +311,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(urlQueryParameter_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, urlQueryParameter_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -269,7 +329,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(urlQueryParameter_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, urlQueryParameter_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -287,7 +347,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getName().equals(other.getName())) return false;
     if (!getHttpHeader().equals(other.getHttpHeader())) return false;
     if (!getUrlQueryParameter().equals(other.getUrlQueryParameter())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -304,7 +364,7 @@ public int hashCode() {
     hash = (53 * hash) + getHttpHeader().hashCode();
     hash = (37 * hash) + URL_QUERY_PARAMETER_FIELD_NUMBER;
     hash = (53 * hash) + getUrlQueryParameter().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -434,10 +494,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.SystemParameter.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -539,7 +606,7 @@ public Builder mergeFrom(com.google.api.SystemParameter other) {
         urlQueryParameter_ = other.urlQueryParameter_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -554,49 +621,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.SystemParameter parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                httpHeader_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                urlQueryParameter_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.SystemParameter) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -975,18 +1010,7 @@ public SystemParameter parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new SystemParameter(input, extensionRegistry);
         }
       };
 
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 005eb66570..a5aea60fcf 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
@@ -55,6 +55,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SystemParameterRule(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              selector_ = s;
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                parameters_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              parameters_.add(
+                  input.readMessage(com.google.api.SystemParameter.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        parameters_ = java.util.Collections.unmodifiableList(parameters_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.SystemParameterProto
         .internal_static_google_api_SystemParameterRule_descriptor;
@@ -241,7 +301,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < parameters_.size(); i++) {
       output.writeMessage(2, parameters_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -256,7 +316,7 @@ public int getSerializedSize() {
     for (int i = 0; i < parameters_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, parameters_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -273,7 +333,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getSelector().equals(other.getSelector())) return false;
     if (!getParametersList().equals(other.getParametersList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -290,7 +350,7 @@ public int hashCode() {
       hash = (37 * hash) + PARAMETERS_FIELD_NUMBER;
       hash = (53 * hash) + getParametersList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -420,10 +480,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.SystemParameterRule.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getParametersFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -433,11 +502,10 @@ public Builder clear() {
 
       if (parametersBuilder_ == null) {
         parameters_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        parameters_ = null;
         parametersBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -555,7 +623,7 @@ public Builder mergeFrom(com.google.api.SystemParameterRule other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -570,49 +638,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.SystemParameterRule parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                selector_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.api.SystemParameter m =
-                    input.readMessage(com.google.api.SystemParameter.parser(), extensionRegistry);
-                if (parametersBuilder_ == null) {
-                  ensureParametersIsMutable();
-                  parameters_.add(m);
-                } else {
-                  parametersBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.SystemParameterRule) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1213,18 +1249,7 @@ public SystemParameterRule parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new SystemParameterRule(input, extensionRegistry);
         }
       };
 
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 ae94fca60f..68545a26e6 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
@@ -57,6 +57,60 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SystemParameters(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                rules_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              rules_.add(
+                  input.readMessage(
+                      com.google.api.SystemParameterRule.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        rules_ = java.util.Collections.unmodifiableList(rules_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.SystemParameterProto
         .internal_static_google_api_SystemParameters_descriptor;
@@ -267,7 +321,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < rules_.size(); i++) {
       output.writeMessage(1, rules_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -279,7 +333,7 @@ public int getSerializedSize() {
     for (int i = 0; i < rules_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, rules_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -295,7 +349,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.api.SystemParameters other = (com.google.api.SystemParameters) obj;
 
     if (!getRulesList().equals(other.getRulesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -310,7 +364,7 @@ public int hashCode() {
       hash = (37 * hash) + RULES_FIELD_NUMBER;
       hash = (53 * hash) + getRulesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -442,10 +496,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.SystemParameters.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getRulesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -453,11 +516,10 @@ public Builder clear() {
       super.clear();
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        rules_ = null;
         rulesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -570,7 +632,7 @@ public Builder mergeFrom(com.google.api.SystemParameters other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -585,44 +647,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.SystemParameters parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.api.SystemParameterRule m =
-                    input.readMessage(
-                        com.google.api.SystemParameterRule.parser(), extensionRegistry);
-                if (rulesBuilder_ == null) {
-                  ensureRulesIsMutable();
-                  rules_.add(m);
-                } else {
-                  rulesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.SystemParameters) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1401,18 +1436,7 @@ public SystemParameters parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new SystemParameters(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/TypeReference.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/TypeReference.java
index 1667d3c2d8..1bf72bdd19 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/TypeReference.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/TypeReference.java
@@ -53,6 +53,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private TypeReference(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              typeName_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.FieldInfoProto.internal_static_google_api_TypeReference_descriptor;
   }
@@ -145,7 +191,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(typeName_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, typeName_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -157,7 +203,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(typeName_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, typeName_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -173,7 +219,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.api.TypeReference other = (com.google.api.TypeReference) obj;
 
     if (!getTypeName().equals(other.getTypeName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -186,7 +232,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + TYPE_NAME_FIELD_NUMBER;
     hash = (53 * hash) + getTypeName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -313,10 +359,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.TypeReference.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -403,7 +456,7 @@ public Builder mergeFrom(com.google.api.TypeReference other) {
         typeName_ = other.typeName_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -418,37 +471,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.TypeReference parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                typeName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.TypeReference) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -625,18 +658,7 @@ public TypeReference parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new TypeReference(input, extensionRegistry);
         }
       };
 
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 05ce34d055..83d6f19fba 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
@@ -55,6 +55,78 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Usage(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                requirements_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              requirements_.add(s);
+              break;
+            }
+          case 50:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                rules_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              rules_.add(input.readMessage(com.google.api.UsageRule.parser(), extensionRegistry));
+              break;
+            }
+          case 58:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              producerNotificationChannel_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        requirements_ = requirements_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        rules_ = java.util.Collections.unmodifiableList(rules_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.UsageProto.internal_static_google_api_Usage_descriptor;
   }
@@ -324,7 +396,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(producerNotificationChannel_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 7, producerNotificationChannel_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -348,7 +420,7 @@ public int getSerializedSize() {
       size +=
           com.google.protobuf.GeneratedMessageV3.computeStringSize(7, producerNotificationChannel_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -367,7 +439,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getRulesList().equals(other.getRulesList())) return false;
     if (!getProducerNotificationChannel().equals(other.getProducerNotificationChannel()))
       return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -388,7 +460,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + PRODUCER_NOTIFICATION_CHANNEL_FIELD_NUMBER;
     hash = (53 * hash) + getProducerNotificationChannel().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -514,10 +586,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Usage.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getRulesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -527,11 +608,10 @@ public Builder clear() {
       bitField0_ = (bitField0_ & ~0x00000001);
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
-        rules_ = null;
         rulesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
       producerNotificationChannel_ = "";
 
       return this;
@@ -665,7 +745,7 @@ public Builder mergeFrom(com.google.api.Usage other) {
         producerNotificationChannel_ = other.producerNotificationChannel_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -680,56 +760,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Usage parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureRequirementsIsMutable();
-                requirements_.add(s);
-                break;
-              } // case 10
-            case 50:
-              {
-                com.google.api.UsageRule m =
-                    input.readMessage(com.google.api.UsageRule.parser(), extensionRegistry);
-                if (rulesBuilder_ == null) {
-                  ensureRulesIsMutable();
-                  rules_.add(m);
-                } else {
-                  rulesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 50
-            case 58:
-              {
-                producerNotificationChannel_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 58
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Usage) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1525,18 +1566,7 @@ public Usage parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Usage(input, extensionRegistry);
         }
       };
 
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 8c1abbbb64..154994fc6c 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
@@ -70,6 +70,62 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private UsageRule(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              selector_ = s;
+              break;
+            }
+          case 16:
+            {
+              allowUnregisteredCalls_ = input.readBool();
+              break;
+            }
+          case 24:
+            {
+              skipServiceControl_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.UsageProto.internal_static_google_api_UsageRule_descriptor;
   }
@@ -204,7 +260,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (skipServiceControl_ != false) {
       output.writeBool(3, skipServiceControl_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -222,7 +278,7 @@ public int getSerializedSize() {
     if (skipServiceControl_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(3, skipServiceControl_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -240,7 +296,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getSelector().equals(other.getSelector())) return false;
     if (getAllowUnregisteredCalls() != other.getAllowUnregisteredCalls()) return false;
     if (getSkipServiceControl() != other.getSkipServiceControl()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -257,7 +313,7 @@ public int hashCode() {
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getAllowUnregisteredCalls());
     hash = (37 * hash) + SKIP_SERVICE_CONTROL_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getSkipServiceControl());
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -400,10 +456,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.UsageRule.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -502,7 +565,7 @@ public Builder mergeFrom(com.google.api.UsageRule other) {
       if (other.getSkipServiceControl() != false) {
         setSkipServiceControl(other.getSkipServiceControl());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -517,49 +580,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.UsageRule parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                selector_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                allowUnregisteredCalls_ = input.readBool();
-
-                break;
-              } // case 16
-            case 24:
-              {
-                skipServiceControl_ = input.readBool();
-
-                break;
-              } // case 24
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.UsageRule) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -843,18 +874,7 @@ public UsageRule parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new UsageRule(input, extensionRegistry);
         }
       };
 
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 b884585670..764f5f2d13 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
@@ -70,6 +70,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Visibility(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                rules_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              rules_.add(
+                  input.readMessage(com.google.api.VisibilityRule.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        rules_ = java.util.Collections.unmodifiableList(rules_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.VisibilityProto.internal_static_google_api_Visibility_descriptor;
   }
@@ -177,7 +230,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < rules_.size(); i++) {
       output.writeMessage(1, rules_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -189,7 +242,7 @@ public int getSerializedSize() {
     for (int i = 0; i < rules_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, rules_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -205,7 +258,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.api.Visibility other = (com.google.api.Visibility) obj;
 
     if (!getRulesList().equals(other.getRulesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -220,7 +273,7 @@ public int hashCode() {
       hash = (37 * hash) + RULES_FIELD_NUMBER;
       hash = (53 * hash) + getRulesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -363,10 +416,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.Visibility.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getRulesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -374,11 +436,10 @@ public Builder clear() {
       super.clear();
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        rules_ = null;
         rulesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -490,7 +551,7 @@ public Builder mergeFrom(com.google.api.Visibility other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -505,43 +566,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.Visibility parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.api.VisibilityRule m =
-                    input.readMessage(com.google.api.VisibilityRule.parser(), extensionRegistry);
-                if (rulesBuilder_ == null) {
-                  ensureRulesIsMutable();
-                  rules_.add(m);
-                } else {
-                  rulesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.Visibility) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -958,18 +993,7 @@ public Visibility parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Visibility(input, extensionRegistry);
         }
       };
 
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 ed4be3ac22..10531f1bd3 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
@@ -55,6 +55,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private VisibilityRule(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              selector_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              restriction_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.VisibilityProto.internal_static_google_api_VisibilityRule_descriptor;
   }
@@ -214,7 +267,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(restriction_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, restriction_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -229,7 +282,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(restriction_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, restriction_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -246,7 +299,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getSelector().equals(other.getSelector())) return false;
     if (!getRestriction().equals(other.getRestriction())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -261,7 +314,7 @@ public int hashCode() {
     hash = (53 * hash) + getSelector().hashCode();
     hash = (37 * hash) + RESTRICTION_FIELD_NUMBER;
     hash = (53 * hash) + getRestriction().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -389,10 +442,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.api.VisibilityRule.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -486,7 +546,7 @@ public Builder mergeFrom(com.google.api.VisibilityRule other) {
         restriction_ = other.restriction_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -501,43 +561,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.api.VisibilityRule parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                selector_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                restriction_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.api.VisibilityRule) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -855,18 +889,7 @@ public VisibilityRule parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new VisibilityRule(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Action.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Action.java
index 1f3ca465b3..44a2812e56 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Action.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Action.java
@@ -61,6 +61,105 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Action(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              function_ = s;
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                parameters_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              parameters_.add(
+                  input.readMessage(
+                      com.google.apps.card.v1.Action.ActionParameter.parser(), extensionRegistry));
+              break;
+            }
+          case 24:
+            {
+              int rawValue = input.readEnum();
+
+              loadIndicator_ = rawValue;
+              break;
+            }
+          case 32:
+            {
+              persistValues_ = input.readBool();
+              break;
+            }
+          case 40:
+            {
+              int rawValue = input.readEnum();
+
+              interaction_ = rawValue;
+              break;
+            }
+          case 50:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                requiredWidgets_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              requiredWidgets_.add(s);
+              break;
+            }
+          case 56:
+            {
+              allWidgetsAreRequired_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        parameters_ = java.util.Collections.unmodifiableList(parameters_);
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        requiredWidgets_ = requiredWidgets_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Action_descriptor;
   }
@@ -473,6 +572,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private ActionParameter(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                key_ = s;
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                value_ = s;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Action_ActionParameter_descriptor;
@@ -610,7 +762,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(value_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, value_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -625,7 +777,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(value_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, value_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -643,7 +795,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getKey().equals(other.getKey())) return false;
       if (!getValue().equals(other.getValue())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -658,7 +810,7 @@ public int hashCode() {
       hash = (53 * hash) + getKey().hashCode();
       hash = (37 * hash) + VALUE_FIELD_NUMBER;
       hash = (53 * hash) + getValue().hashCode();
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -797,10 +949,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.Action.ActionParameter.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -899,7 +1058,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Action.ActionParameter other) {
           value_ = other.value_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -914,43 +1073,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.apps.card.v1.Action.ActionParameter parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  key_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  value_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 18
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.apps.card.v1.Action.ActionParameter) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1209,19 +1342,7 @@ public ActionParameter parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new ActionParameter(input, extensionRegistry);
           }
         };
 
@@ -1649,7 +1770,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (allWidgetsAreRequired_ != false) {
       output.writeBool(7, allWidgetsAreRequired_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1685,7 +1806,7 @@ public int getSerializedSize() {
     if (allWidgetsAreRequired_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(7, allWidgetsAreRequired_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1707,7 +1828,7 @@ public boolean equals(final java.lang.Object obj) {
     if (interaction_ != other.interaction_) return false;
     if (!getRequiredWidgetsList().equals(other.getRequiredWidgetsList())) return false;
     if (getAllWidgetsAreRequired() != other.getAllWidgetsAreRequired()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1736,7 +1857,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + ALL_WIDGETS_ARE_REQUIRED_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getAllWidgetsAreRequired());
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1868,10 +1989,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Action.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getParametersFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -1881,11 +2011,10 @@ public Builder clear() {
 
       if (parametersBuilder_ == null) {
         parameters_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        parameters_ = null;
         parametersBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       loadIndicator_ = 0;
 
       persistValues_ = false;
@@ -2044,7 +2173,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Action other) {
       if (other.getAllWidgetsAreRequired() != false) {
         setAllWidgetsAreRequired(other.getAllWidgetsAreRequired());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2059,81 +2188,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.Action parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                function_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.apps.card.v1.Action.ActionParameter m =
-                    input.readMessage(
-                        com.google.apps.card.v1.Action.ActionParameter.parser(), extensionRegistry);
-                if (parametersBuilder_ == null) {
-                  ensureParametersIsMutable();
-                  parameters_.add(m);
-                } else {
-                  parametersBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            case 24:
-              {
-                loadIndicator_ = input.readEnum();
-
-                break;
-              } // case 24
-            case 32:
-              {
-                persistValues_ = input.readBool();
-
-                break;
-              } // case 32
-            case 40:
-              {
-                interaction_ = input.readEnum();
-
-                break;
-              } // case 40
-            case 50:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureRequiredWidgetsIsMutable();
-                requiredWidgets_.add(s);
-                break;
-              } // case 50
-            case 56:
-              {
-                allWidgetsAreRequired_ = input.readBool();
-
-                break;
-              } // case 56
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.Action) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -3307,18 +3372,7 @@ public Action parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Action(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/BorderStyle.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/BorderStyle.java
index 257547834e..2a02fe0d1a 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/BorderStyle.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/BorderStyle.java
@@ -56,6 +56,71 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private BorderStyle(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              int rawValue = input.readEnum();
+
+              type_ = rawValue;
+              break;
+            }
+          case 18:
+            {
+              com.google.type.Color.Builder subBuilder = null;
+              if (strokeColor_ != null) {
+                subBuilder = strokeColor_.toBuilder();
+              }
+              strokeColor_ = input.readMessage(com.google.type.Color.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(strokeColor_);
+                strokeColor_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 24:
+            {
+              cornerRadius_ = input.readInt32();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_BorderStyle_descriptor;
@@ -407,7 +472,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (cornerRadius_ != 0) {
       output.writeInt32(3, cornerRadius_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -426,7 +491,7 @@ public int getSerializedSize() {
     if (cornerRadius_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(3, cornerRadius_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -447,7 +512,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getStrokeColor().equals(other.getStrokeColor())) return false;
     }
     if (getCornerRadius() != other.getCornerRadius()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -466,7 +531,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + CORNER_RADIUS_FIELD_NUMBER;
     hash = (53 * hash) + getCornerRadius();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -598,10 +663,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.BorderStyle.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -708,7 +780,7 @@ public Builder mergeFrom(com.google.apps.card.v1.BorderStyle other) {
       if (other.getCornerRadius() != 0) {
         setCornerRadius(other.getCornerRadius());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -723,49 +795,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.BorderStyle parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                type_ = input.readEnum();
-
-                break;
-              } // case 8
-            case 18:
-              {
-                input.readMessage(getStrokeColorFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            case 24:
-              {
-                cornerRadius_ = input.readInt32();
-
-                break;
-              } // case 24
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.BorderStyle) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1271,18 +1311,7 @@ public BorderStyle parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new BorderStyle(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Button.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Button.java
index 6aed3cc45f..dd463e0a4c 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Button.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Button.java
@@ -64,6 +64,114 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Button(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              text_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.apps.card.v1.Icon.Builder subBuilder = null;
+              if (icon_ != null) {
+                subBuilder = icon_.toBuilder();
+              }
+              icon_ = input.readMessage(com.google.apps.card.v1.Icon.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(icon_);
+                icon_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 26:
+            {
+              com.google.type.Color.Builder subBuilder = null;
+              if (color_ != null) {
+                subBuilder = color_.toBuilder();
+              }
+              color_ = input.readMessage(com.google.type.Color.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(color_);
+                color_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 34:
+            {
+              com.google.apps.card.v1.OnClick.Builder subBuilder = null;
+              if (onClick_ != null) {
+                subBuilder = onClick_.toBuilder();
+              }
+              onClick_ =
+                  input.readMessage(com.google.apps.card.v1.OnClick.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(onClick_);
+                onClick_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 40:
+            {
+              disabled_ = input.readBool();
+              break;
+            }
+          case 50:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              altText_ = s;
+              break;
+            }
+          case 56:
+            {
+              int rawValue = input.readEnum();
+
+              type_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Button_descriptor;
   }
@@ -714,7 +822,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (type_ != com.google.apps.card.v1.Button.Type.TYPE_UNSPECIFIED.getNumber()) {
       output.writeEnum(7, type_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -744,7 +852,7 @@ public int getSerializedSize() {
     if (type_ != com.google.apps.card.v1.Button.Type.TYPE_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(7, type_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -775,7 +883,7 @@ public boolean equals(final java.lang.Object obj) {
     if (getDisabled() != other.getDisabled()) return false;
     if (!getAltText().equals(other.getAltText())) return false;
     if (type_ != other.type_) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -806,7 +914,7 @@ public int hashCode() {
     hash = (53 * hash) + getAltText().hashCode();
     hash = (37 * hash) + TYPE_FIELD_NUMBER;
     hash = (53 * hash) + type_;
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -943,10 +1051,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Button.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1095,7 +1210,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Button other) {
       if (other.type_ != 0) {
         setTypeValue(other.getTypeValue());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1110,73 +1225,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.Button parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                text_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getIconFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(getColorFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            case 34:
-              {
-                input.readMessage(getOnClickFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 34
-            case 40:
-              {
-                disabled_ = input.readBool();
-
-                break;
-              } // case 40
-            case 50:
-              {
-                altText_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 50
-            case 56:
-              {
-                type_ = input.readEnum();
-
-                break;
-              } // case 56
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.Button) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2355,18 +2414,7 @@ public Button parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Button(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ButtonList.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ButtonList.java
index 1757991332..4d97fe69bb 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ButtonList.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ButtonList.java
@@ -58,6 +58,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ButtonList(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                buttons_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              buttons_.add(
+                  input.readMessage(com.google.apps.card.v1.Button.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        buttons_ = java.util.Collections.unmodifiableList(buttons_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_ButtonList_descriptor;
@@ -164,7 +217,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < buttons_.size(); i++) {
       output.writeMessage(1, buttons_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -176,7 +229,7 @@ public int getSerializedSize() {
     for (int i = 0; i < buttons_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, buttons_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -192,7 +245,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.apps.card.v1.ButtonList other = (com.google.apps.card.v1.ButtonList) obj;
 
     if (!getButtonsList().equals(other.getButtonsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -207,7 +260,7 @@ public int hashCode() {
       hash = (37 * hash) + BUTTONS_FIELD_NUMBER;
       hash = (53 * hash) + getButtonsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -341,10 +394,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.ButtonList.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getButtonsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -352,11 +414,10 @@ public Builder clear() {
       super.clear();
       if (buttonsBuilder_ == null) {
         buttons_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        buttons_ = null;
         buttonsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -469,7 +530,7 @@ public Builder mergeFrom(com.google.apps.card.v1.ButtonList other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -484,43 +545,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.ButtonList parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.apps.card.v1.Button m =
-                    input.readMessage(com.google.apps.card.v1.Button.parser(), extensionRegistry);
-                if (buttonsBuilder_ == null) {
-                  ensureButtonsIsMutable();
-                  buttons_.add(m);
-                } else {
-                  buttonsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.ButtonList) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -921,18 +956,7 @@ public ButtonList parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ButtonList(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Card.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Card.java
index 5faf74dd27..4a9c4b94dc 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Card.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Card.java
@@ -155,6 +155,143 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Card(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.apps.card.v1.Card.CardHeader.Builder subBuilder = null;
+              if (header_ != null) {
+                subBuilder = header_.toBuilder();
+              }
+              header_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.Card.CardHeader.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(header_);
+                header_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                sections_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              sections_.add(
+                  input.readMessage(
+                      com.google.apps.card.v1.Card.Section.parser(), extensionRegistry));
+              break;
+            }
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                cardActions_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              cardActions_.add(
+                  input.readMessage(
+                      com.google.apps.card.v1.Card.CardAction.parser(), extensionRegistry));
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 42:
+            {
+              com.google.apps.card.v1.Card.CardFixedFooter.Builder subBuilder = null;
+              if (fixedFooter_ != null) {
+                subBuilder = fixedFooter_.toBuilder();
+              }
+              fixedFooter_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.Card.CardFixedFooter.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(fixedFooter_);
+                fixedFooter_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 48:
+            {
+              int rawValue = input.readEnum();
+
+              displayStyle_ = rawValue;
+              break;
+            }
+          case 58:
+            {
+              com.google.apps.card.v1.Card.CardHeader.Builder subBuilder = null;
+              if (peekCardHeader_ != null) {
+                subBuilder = peekCardHeader_.toBuilder();
+              }
+              peekCardHeader_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.Card.CardHeader.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(peekCardHeader_);
+                peekCardHeader_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 72:
+            {
+              int rawValue = input.readEnum();
+
+              sectionDividerStyle_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        sections_ = java.util.Collections.unmodifiableList(sections_);
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        cardActions_ = java.util.Collections.unmodifiableList(cardActions_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Card_descriptor;
   }
@@ -692,6 +829,80 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private CardHeader(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                title_ = s;
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                subtitle_ = s;
+                break;
+              }
+            case 24:
+              {
+                int rawValue = input.readEnum();
+
+                imageType_ = rawValue;
+                break;
+              }
+            case 34:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                imageUrl_ = s;
+                break;
+              }
+            case 42:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                imageAltText_ = s;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Card_CardHeader_descriptor;
@@ -990,7 +1201,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(imageAltText_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 5, imageAltText_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -1014,7 +1225,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(imageAltText_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, imageAltText_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1034,7 +1245,7 @@ public boolean equals(final java.lang.Object obj) {
       if (imageType_ != other.imageType_) return false;
       if (!getImageUrl().equals(other.getImageUrl())) return false;
       if (!getImageAltText().equals(other.getImageAltText())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -1055,7 +1266,7 @@ public int hashCode() {
       hash = (53 * hash) + getImageUrl().hashCode();
       hash = (37 * hash) + IMAGE_ALT_TEXT_FIELD_NUMBER;
       hash = (53 * hash) + getImageAltText().hashCode();
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1190,10 +1401,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.Card.CardHeader.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -1311,7 +1529,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Card.CardHeader other) {
           imageAltText_ = other.imageAltText_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1326,61 +1544,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.apps.card.v1.Card.CardHeader parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  title_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  subtitle_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 18
-              case 24:
-                {
-                  imageType_ = input.readEnum();
-
-                  break;
-                } // case 24
-              case 34:
-                {
-                  imageUrl_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 34
-              case 42:
-                {
-                  imageAltText_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 42
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.apps.card.v1.Card.CardHeader) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1987,19 +2161,7 @@ public CardHeader parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new CardHeader(input, extensionRegistry);
           }
         };
 
@@ -2245,6 +2407,92 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Section(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                header_ = s;
+                break;
+              }
+            case 18:
+              {
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  widgets_ = new java.util.ArrayList();
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                widgets_.add(
+                    input.readMessage(com.google.apps.card.v1.Widget.parser(), extensionRegistry));
+                break;
+              }
+            case 40:
+              {
+                collapsible_ = input.readBool();
+                break;
+              }
+            case 48:
+              {
+                uncollapsibleWidgetsCount_ = input.readInt32();
+                break;
+              }
+            case 66:
+              {
+                com.google.apps.card.v1.CollapseControl.Builder subBuilder = null;
+                if (collapseControl_ != null) {
+                  subBuilder = collapseControl_.toBuilder();
+                }
+                collapseControl_ =
+                    input.readMessage(
+                        com.google.apps.card.v1.CollapseControl.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(collapseControl_);
+                  collapseControl_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          widgets_ = java.util.Collections.unmodifiableList(widgets_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Card_Section_descriptor;
@@ -2541,7 +2789,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (collapseControl_ != null) {
         output.writeMessage(8, getCollapseControl());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -2566,7 +2814,7 @@ public int getSerializedSize() {
       if (collapseControl_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getCollapseControl());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2589,7 +2837,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasCollapseControl()) {
         if (!getCollapseControl().equals(other.getCollapseControl())) return false;
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -2614,7 +2862,7 @@ public int hashCode() {
         hash = (37 * hash) + COLLAPSE_CONTROL_FIELD_NUMBER;
         hash = (53 * hash) + getCollapseControl().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2749,10 +2997,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.Card.Section.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+          getWidgetsFieldBuilder();
+        }
       }
 
       @java.lang.Override
@@ -2762,11 +3019,10 @@ public Builder clear() {
 
         if (widgetsBuilder_ == null) {
           widgets_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
-          widgets_ = null;
           widgetsBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         collapsible_ = false;
 
         uncollapsibleWidgetsCount_ = 0;
@@ -2913,7 +3169,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Card.Section other) {
         if (other.hasCollapseControl()) {
           mergeCollapseControl(other.getCollapseControl());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -2928,68 +3184,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.apps.card.v1.Card.Section parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  header_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  com.google.apps.card.v1.Widget m =
-                      input.readMessage(com.google.apps.card.v1.Widget.parser(), extensionRegistry);
-                  if (widgetsBuilder_ == null) {
-                    ensureWidgetsIsMutable();
-                    widgets_.add(m);
-                  } else {
-                    widgetsBuilder_.addMessage(m);
-                  }
-                  break;
-                } // case 18
-              case 40:
-                {
-                  collapsible_ = input.readBool();
-
-                  break;
-                } // case 40
-              case 48:
-                {
-                  uncollapsibleWidgetsCount_ = input.readInt32();
-
-                  break;
-                } // case 48
-              case 66:
-                {
-                  input.readMessage(
-                      getCollapseControlFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 66
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.apps.card.v1.Card.Section) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -3916,19 +4121,7 @@ public Section parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Section(input, extensionRegistry);
           }
         };
 
@@ -4055,6 +4248,67 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private CardAction(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                actionLabel_ = s;
+                break;
+              }
+            case 18:
+              {
+                com.google.apps.card.v1.OnClick.Builder subBuilder = null;
+                if (onClick_ != null) {
+                  subBuilder = onClick_.toBuilder();
+                }
+                onClick_ =
+                    input.readMessage(com.google.apps.card.v1.OnClick.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(onClick_);
+                  onClick_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Card_CardAction_descriptor;
@@ -4190,7 +4444,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (onClick_ != null) {
         output.writeMessage(2, getOnClick());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -4205,7 +4459,7 @@ public int getSerializedSize() {
       if (onClick_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getOnClick());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4225,7 +4479,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasOnClick()) {
         if (!getOnClick().equals(other.getOnClick())) return false;
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -4242,7 +4496,7 @@ public int hashCode() {
         hash = (37 * hash) + ON_CLICK_FIELD_NUMBER;
         hash = (53 * hash) + getOnClick().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4378,10 +4632,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.Card.CardAction.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -4486,7 +4747,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Card.CardAction other) {
         if (other.hasOnClick()) {
           mergeOnClick(other.getOnClick());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -4501,43 +4762,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.apps.card.v1.Card.CardAction parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  actionLabel_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  input.readMessage(getOnClickFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 18
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.apps.card.v1.Card.CardAction) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -4875,19 +5110,7 @@ public CardAction parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new CardAction(input, extensionRegistry);
           }
         };
 
@@ -5060,6 +5283,92 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private NestedWidget(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.apps.card.v1.TextParagraph.Builder subBuilder = null;
+                if (dataCase_ == 1) {
+                  subBuilder = ((com.google.apps.card.v1.TextParagraph) data_).toBuilder();
+                }
+                data_ =
+                    input.readMessage(
+                        com.google.apps.card.v1.TextParagraph.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom((com.google.apps.card.v1.TextParagraph) data_);
+                  data_ = subBuilder.buildPartial();
+                }
+                dataCase_ = 1;
+                break;
+              }
+            case 26:
+              {
+                com.google.apps.card.v1.ButtonList.Builder subBuilder = null;
+                if (dataCase_ == 3) {
+                  subBuilder = ((com.google.apps.card.v1.ButtonList) data_).toBuilder();
+                }
+                data_ =
+                    input.readMessage(
+                        com.google.apps.card.v1.ButtonList.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom((com.google.apps.card.v1.ButtonList) data_);
+                  data_ = subBuilder.buildPartial();
+                }
+                dataCase_ = 3;
+                break;
+              }
+            case 82:
+              {
+                com.google.apps.card.v1.Image.Builder subBuilder = null;
+                if (dataCase_ == 10) {
+                  subBuilder = ((com.google.apps.card.v1.Image) data_).toBuilder();
+                }
+                data_ =
+                    input.readMessage(com.google.apps.card.v1.Image.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom((com.google.apps.card.v1.Image) data_);
+                  data_ = subBuilder.buildPartial();
+                }
+                dataCase_ = 10;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Card_NestedWidget_descriptor;
@@ -5311,7 +5620,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (dataCase_ == 10) {
         output.writeMessage(10, (com.google.apps.card.v1.Image) data_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -5335,7 +5644,7 @@ public int getSerializedSize() {
             com.google.protobuf.CodedOutputStream.computeMessageSize(
                 10, (com.google.apps.card.v1.Image) data_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5365,7 +5674,7 @@ public boolean equals(final java.lang.Object obj) {
         case 0:
         default:
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -5392,7 +5701,7 @@ public int hashCode() {
         case 0:
         default:
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5526,24 +5835,22 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.Card.NestedWidget.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (textParagraphBuilder_ != null) {
-          textParagraphBuilder_.clear();
-        }
-        if (buttonListBuilder_ != null) {
-          buttonListBuilder_.clear();
-        }
-        if (imageBuilder_ != null) {
-          imageBuilder_.clear();
-        }
         dataCase_ = 0;
         data_ = null;
         return this;
@@ -5667,7 +5974,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Card.NestedWidget other) {
               break;
             }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -5682,49 +5989,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.apps.card.v1.Card.NestedWidget parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  input.readMessage(getTextParagraphFieldBuilder().getBuilder(), extensionRegistry);
-                  dataCase_ = 1;
-                  break;
-                } // case 10
-              case 26:
-                {
-                  input.readMessage(getButtonListFieldBuilder().getBuilder(), extensionRegistry);
-                  dataCase_ = 3;
-                  break;
-                } // case 26
-              case 82:
-                {
-                  input.readMessage(getImageFieldBuilder().getBuilder(), extensionRegistry);
-                  dataCase_ = 10;
-                  break;
-                } // case 82
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.apps.card.v1.Card.NestedWidget) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -6421,19 +6696,7 @@ public NestedWidget parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new NestedWidget(input, extensionRegistry);
           }
         };
 
@@ -6584,6 +6847,75 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private CardFixedFooter(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.apps.card.v1.Button.Builder subBuilder = null;
+                if (primaryButton_ != null) {
+                  subBuilder = primaryButton_.toBuilder();
+                }
+                primaryButton_ =
+                    input.readMessage(com.google.apps.card.v1.Button.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(primaryButton_);
+                  primaryButton_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 18:
+              {
+                com.google.apps.card.v1.Button.Builder subBuilder = null;
+                if (secondaryButton_ != null) {
+                  subBuilder = secondaryButton_.toBuilder();
+                }
+                secondaryButton_ =
+                    input.readMessage(com.google.apps.card.v1.Button.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(secondaryButton_);
+                  secondaryButton_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Card_CardFixedFooter_descriptor;
@@ -6730,7 +7062,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (secondaryButton_ != null) {
         output.writeMessage(2, getSecondaryButton());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -6745,7 +7077,7 @@ public int getSerializedSize() {
       if (secondaryButton_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getSecondaryButton());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -6769,7 +7101,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasSecondaryButton()) {
         if (!getSecondaryButton().equals(other.getSecondaryButton())) return false;
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -6788,7 +7120,7 @@ public int hashCode() {
         hash = (37 * hash) + SECONDARY_BUTTON_FIELD_NUMBER;
         hash = (53 * hash) + getSecondaryButton().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6930,10 +7262,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.Card.CardFixedFooter.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -7045,7 +7384,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Card.CardFixedFooter other) {
         if (other.hasSecondaryButton()) {
           mergeSecondaryButton(other.getSecondaryButton());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -7060,44 +7399,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.apps.card.v1.Card.CardFixedFooter parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  input.readMessage(getPrimaryButtonFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  input.readMessage(
-                      getSecondaryButtonFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 18
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.apps.card.v1.Card.CardFixedFooter) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -7549,19 +7861,7 @@ public CardFixedFooter parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new CardFixedFooter(input, extensionRegistry);
           }
         };
 
@@ -8265,7 +8565,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         != com.google.apps.card.v1.Card.DividerStyle.DIVIDER_STYLE_UNSPECIFIED.getNumber()) {
       output.writeEnum(9, sectionDividerStyle_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -8300,7 +8600,7 @@ public int getSerializedSize() {
         != com.google.apps.card.v1.Card.DividerStyle.DIVIDER_STYLE_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(9, sectionDividerStyle_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -8332,7 +8632,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasPeekCardHeader()) {
       if (!getPeekCardHeader().equals(other.getPeekCardHeader())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -8369,7 +8669,7 @@ public int hashCode() {
       hash = (37 * hash) + PEEK_CARD_HEADER_FIELD_NUMBER;
       hash = (53 * hash) + getPeekCardHeader().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -8594,10 +8894,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Card.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getSectionsFieldBuilder();
+        getCardActionsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -8611,20 +8921,18 @@ public Builder clear() {
       }
       if (sectionsBuilder_ == null) {
         sections_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        sections_ = null;
         sectionsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       sectionDividerStyle_ = 0;
 
       if (cardActionsBuilder_ == null) {
         cardActions_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
-        cardActions_ = null;
         cardActionsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
       name_ = "";
 
       if (fixedFooterBuilder_ == null) {
@@ -8825,7 +9133,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Card other) {
       if (other.hasPeekCardHeader()) {
         mergePeekCardHeader(other.getPeekCardHeader());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -8840,93 +9148,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.Card parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getHeaderFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.apps.card.v1.Card.Section m =
-                    input.readMessage(
-                        com.google.apps.card.v1.Card.Section.parser(), extensionRegistry);
-                if (sectionsBuilder_ == null) {
-                  ensureSectionsIsMutable();
-                  sections_.add(m);
-                } else {
-                  sectionsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            case 26:
-              {
-                com.google.apps.card.v1.Card.CardAction m =
-                    input.readMessage(
-                        com.google.apps.card.v1.Card.CardAction.parser(), extensionRegistry);
-                if (cardActionsBuilder_ == null) {
-                  ensureCardActionsIsMutable();
-                  cardActions_.add(m);
-                } else {
-                  cardActionsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 26
-            case 34:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            case 42:
-              {
-                input.readMessage(getFixedFooterFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 42
-            case 48:
-              {
-                displayStyle_ = input.readEnum();
-
-                break;
-              } // case 48
-            case 58:
-              {
-                input.readMessage(getPeekCardHeaderFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 58
-            case 72:
-              {
-                sectionDividerStyle_ = input.readEnum();
-
-                break;
-              } // case 72
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.Card) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -11337,18 +11569,7 @@ public Card parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Card(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Carousel.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Carousel.java
index 007ae9f239..fe491899fb 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Carousel.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Carousel.java
@@ -90,6 +90,61 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Carousel(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 34:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                carouselCards_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              carouselCards_.add(
+                  input.readMessage(
+                      com.google.apps.card.v1.Carousel.CarouselCard.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        carouselCards_ = java.util.Collections.unmodifiableList(carouselCards_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_Carousel_descriptor;
@@ -269,6 +324,75 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private CarouselCard(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  widgets_ = new java.util.ArrayList();
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                widgets_.add(
+                    input.readMessage(
+                        com.google.apps.card.v1.Card.NestedWidget.parser(), extensionRegistry));
+                break;
+              }
+            case 18:
+              {
+                if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                  footerWidgets_ =
+                      new java.util.ArrayList();
+                  mutable_bitField0_ |= 0x00000002;
+                }
+                footerWidgets_.add(
+                    input.readMessage(
+                        com.google.apps.card.v1.Card.NestedWidget.parser(), extensionRegistry));
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          widgets_ = java.util.Collections.unmodifiableList(widgets_);
+        }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          footerWidgets_ = java.util.Collections.unmodifiableList(footerWidgets_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Carousel_CarouselCard_descriptor;
@@ -462,7 +586,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       for (int i = 0; i < footerWidgets_.size(); i++) {
         output.writeMessage(2, footerWidgets_.get(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -477,7 +601,7 @@ public int getSerializedSize() {
       for (int i = 0; i < footerWidgets_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, footerWidgets_.get(i));
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -495,7 +619,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getWidgetsList().equals(other.getWidgetsList())) return false;
       if (!getFooterWidgetsList().equals(other.getFooterWidgetsList())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -514,7 +638,7 @@ public int hashCode() {
         hash = (37 * hash) + FOOTER_WIDGETS_FIELD_NUMBER;
         hash = (53 * hash) + getFooterWidgetsList().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -647,10 +771,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.Carousel.CarouselCard.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+          getWidgetsFieldBuilder();
+          getFooterWidgetsFieldBuilder();
+        }
       }
 
       @java.lang.Override
@@ -658,18 +792,16 @@ public Builder clear() {
         super.clear();
         if (widgetsBuilder_ == null) {
           widgets_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
-          widgets_ = null;
           widgetsBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (footerWidgetsBuilder_ == null) {
           footerWidgets_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
-          footerWidgets_ = null;
           footerWidgetsBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -822,7 +954,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Carousel.CarouselCard other) {
             }
           }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -837,57 +969,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.apps.card.v1.Carousel.CarouselCard parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  com.google.apps.card.v1.Card.NestedWidget m =
-                      input.readMessage(
-                          com.google.apps.card.v1.Card.NestedWidget.parser(), extensionRegistry);
-                  if (widgetsBuilder_ == null) {
-                    ensureWidgetsIsMutable();
-                    widgets_.add(m);
-                  } else {
-                    widgetsBuilder_.addMessage(m);
-                  }
-                  break;
-                } // case 10
-              case 18:
-                {
-                  com.google.apps.card.v1.Card.NestedWidget m =
-                      input.readMessage(
-                          com.google.apps.card.v1.Card.NestedWidget.parser(), extensionRegistry);
-                  if (footerWidgetsBuilder_ == null) {
-                    ensureFooterWidgetsIsMutable();
-                    footerWidgets_.add(m);
-                  } else {
-                    footerWidgetsBuilder_.addMessage(m);
-                  }
-                  break;
-                } // case 18
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.apps.card.v1.Carousel.CarouselCard) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1700,19 +1792,7 @@ public CarouselCard parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new CarouselCard(input, extensionRegistry);
           }
         };
 
@@ -1823,7 +1903,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < carouselCards_.size(); i++) {
       output.writeMessage(4, carouselCards_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1835,7 +1915,7 @@ public int getSerializedSize() {
     for (int i = 0; i < carouselCards_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, carouselCards_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1851,7 +1931,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.apps.card.v1.Carousel other = (com.google.apps.card.v1.Carousel) obj;
 
     if (!getCarouselCardsList().equals(other.getCarouselCardsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1866,7 +1946,7 @@ public int hashCode() {
       hash = (37 * hash) + CAROUSEL_CARDS_FIELD_NUMBER;
       hash = (53 * hash) + getCarouselCardsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -2032,10 +2112,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Carousel.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getCarouselCardsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -2043,11 +2132,10 @@ public Builder clear() {
       super.clear();
       if (carouselCardsBuilder_ == null) {
         carouselCards_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        carouselCards_ = null;
         carouselCardsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -2160,7 +2248,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Carousel other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2175,44 +2263,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.Carousel parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 34:
-              {
-                com.google.apps.card.v1.Carousel.CarouselCard m =
-                    input.readMessage(
-                        com.google.apps.card.v1.Carousel.CarouselCard.parser(), extensionRegistry);
-                if (carouselCardsBuilder_ == null) {
-                  ensureCarouselCardsIsMutable();
-                  carouselCards_.add(m);
-                } else {
-                  carouselCardsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.Carousel) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2626,18 +2687,7 @@ public Carousel parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Carousel(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Chip.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Chip.java
index c3c6185ba4..1e3247e6ee 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Chip.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Chip.java
@@ -56,6 +56,98 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Chip(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.apps.card.v1.Icon.Builder subBuilder = null;
+              if (icon_ != null) {
+                subBuilder = icon_.toBuilder();
+              }
+              icon_ = input.readMessage(com.google.apps.card.v1.Icon.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(icon_);
+                icon_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              label_ = s;
+              break;
+            }
+          case 26:
+            {
+              com.google.apps.card.v1.OnClick.Builder subBuilder = null;
+              if (onClick_ != null) {
+                subBuilder = onClick_.toBuilder();
+              }
+              onClick_ =
+                  input.readMessage(com.google.apps.card.v1.OnClick.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(onClick_);
+                onClick_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 32:
+            {
+              enabled_ = input.readBool();
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              altText_ = s;
+              break;
+            }
+          case 48:
+            {
+              disabled_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Chip_descriptor;
   }
@@ -359,7 +451,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (disabled_ != false) {
       output.writeBool(6, disabled_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -386,7 +478,7 @@ public int getSerializedSize() {
     if (disabled_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(6, disabled_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -413,7 +505,7 @@ public boolean equals(final java.lang.Object obj) {
     if (getEnabled() != other.getEnabled()) return false;
     if (getDisabled() != other.getDisabled()) return false;
     if (!getAltText().equals(other.getAltText())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -440,7 +532,7 @@ public int hashCode() {
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getDisabled());
     hash = (37 * hash) + ALT_TEXT_FIELD_NUMBER;
     hash = (53 * hash) + getAltText().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -569,10 +661,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Chip.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -706,7 +805,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Chip other) {
         altText_ = other.altText_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -721,67 +820,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.Chip parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getIconFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                label_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(getOnClickFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            case 32:
-              {
-                enabled_ = input.readBool();
-
-                break;
-              } // case 32
-            case 42:
-              {
-                altText_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 42
-            case 48:
-              {
-                disabled_ = input.readBool();
-
-                break;
-              } // case 48
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.Chip) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1580,18 +1629,7 @@ public Chip parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Chip(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ChipList.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ChipList.java
index 53efa7e802..ffd6ef8e83 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ChipList.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ChipList.java
@@ -57,6 +57,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ChipList(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              int rawValue = input.readEnum();
+
+              layout_ = rawValue;
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                chips_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              chips_.add(
+                  input.readMessage(com.google.apps.card.v1.Chip.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        chips_ = java.util.Collections.unmodifiableList(chips_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_ChipList_descriptor;
@@ -363,7 +423,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < chips_.size(); i++) {
       output.writeMessage(2, chips_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -378,7 +438,7 @@ public int getSerializedSize() {
     for (int i = 0; i < chips_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, chips_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -395,7 +455,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (layout_ != other.layout_) return false;
     if (!getChipsList().equals(other.getChipsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -412,7 +472,7 @@ public int hashCode() {
       hash = (37 * hash) + CHIPS_FIELD_NUMBER;
       hash = (53 * hash) + getChipsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -544,10 +604,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.ChipList.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getChipsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -557,11 +626,10 @@ public Builder clear() {
 
       if (chipsBuilder_ == null) {
         chips_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        chips_ = null;
         chipsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -678,7 +746,7 @@ public Builder mergeFrom(com.google.apps.card.v1.ChipList other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -693,49 +761,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.ChipList parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                layout_ = input.readEnum();
-
-                break;
-              } // case 8
-            case 18:
-              {
-                com.google.apps.card.v1.Chip m =
-                    input.readMessage(com.google.apps.card.v1.Chip.parser(), extensionRegistry);
-                if (chipsBuilder_ == null) {
-                  ensureChipsIsMutable();
-                  chips_.add(m);
-                } else {
-                  chipsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.ChipList) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1228,18 +1264,7 @@ public ChipList parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ChipList(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CollapseControl.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CollapseControl.java
index 9da8d6e236..e7f292e20c 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CollapseControl.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/CollapseControl.java
@@ -55,6 +55,82 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CollapseControl(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              int rawValue = input.readEnum();
+
+              horizontalAlignment_ = rawValue;
+              break;
+            }
+          case 18:
+            {
+              com.google.apps.card.v1.Button.Builder subBuilder = null;
+              if (expandButton_ != null) {
+                subBuilder = expandButton_.toBuilder();
+              }
+              expandButton_ =
+                  input.readMessage(com.google.apps.card.v1.Button.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(expandButton_);
+                expandButton_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 26:
+            {
+              com.google.apps.card.v1.Button.Builder subBuilder = null;
+              if (collapseButton_ != null) {
+                subBuilder = collapseButton_.toBuilder();
+              }
+              collapseButton_ =
+                  input.readMessage(com.google.apps.card.v1.Button.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(collapseButton_);
+                collapseButton_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_CollapseControl_descriptor;
@@ -255,7 +331,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (collapseButton_ != null) {
       output.writeMessage(3, getCollapseButton());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -275,7 +351,7 @@ public int getSerializedSize() {
     if (collapseButton_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getCollapseButton());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -299,7 +375,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasCollapseButton()) {
       if (!getCollapseButton().equals(other.getCollapseButton())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -320,7 +396,7 @@ public int hashCode() {
       hash = (37 * hash) + COLLAPSE_BUTTON_FIELD_NUMBER;
       hash = (53 * hash) + getCollapseButton().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -452,10 +528,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.CollapseControl.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -571,7 +654,7 @@ public Builder mergeFrom(com.google.apps.card.v1.CollapseControl other) {
       if (other.hasCollapseButton()) {
         mergeCollapseButton(other.getCollapseButton());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -586,49 +669,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.CollapseControl parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                horizontalAlignment_ = input.readEnum();
-
-                break;
-              } // case 8
-            case 18:
-              {
-                input.readMessage(getExpandButtonFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(getCollapseButtonFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.CollapseControl) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1205,18 +1256,7 @@ public CollapseControl parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new CollapseControl(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Columns.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Columns.java
index 4c4de10442..2e8339ad75 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Columns.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Columns.java
@@ -79,6 +79,60 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Columns(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                columnItems_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              columnItems_.add(
+                  input.readMessage(
+                      com.google.apps.card.v1.Columns.Column.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        columnItems_ = java.util.Collections.unmodifiableList(columnItems_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Columns_descriptor;
   }
@@ -283,6 +337,83 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Column(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                int rawValue = input.readEnum();
+
+                horizontalSizeStyle_ = rawValue;
+                break;
+              }
+            case 16:
+              {
+                int rawValue = input.readEnum();
+
+                horizontalAlignment_ = rawValue;
+                break;
+              }
+            case 24:
+              {
+                int rawValue = input.readEnum();
+
+                verticalAlignment_ = rawValue;
+                break;
+              }
+            case 34:
+              {
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  widgets_ =
+                      new java.util.ArrayList();
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                widgets_.add(
+                    input.readMessage(
+                        com.google.apps.card.v1.Columns.Column.Widgets.parser(),
+                        extensionRegistry));
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          widgets_ = java.util.Collections.unmodifiableList(widgets_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Columns_Column_descriptor;
@@ -997,6 +1128,173 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
         return this.unknownFields;
       }
 
+      private Widgets(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        this();
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+            com.google.protobuf.UnknownFieldSet.newBuilder();
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  com.google.apps.card.v1.TextParagraph.Builder subBuilder = null;
+                  if (dataCase_ == 1) {
+                    subBuilder = ((com.google.apps.card.v1.TextParagraph) data_).toBuilder();
+                  }
+                  data_ =
+                      input.readMessage(
+                          com.google.apps.card.v1.TextParagraph.parser(), extensionRegistry);
+                  if (subBuilder != null) {
+                    subBuilder.mergeFrom((com.google.apps.card.v1.TextParagraph) data_);
+                    data_ = subBuilder.buildPartial();
+                  }
+                  dataCase_ = 1;
+                  break;
+                }
+              case 18:
+                {
+                  com.google.apps.card.v1.Image.Builder subBuilder = null;
+                  if (dataCase_ == 2) {
+                    subBuilder = ((com.google.apps.card.v1.Image) data_).toBuilder();
+                  }
+                  data_ =
+                      input.readMessage(com.google.apps.card.v1.Image.parser(), extensionRegistry);
+                  if (subBuilder != null) {
+                    subBuilder.mergeFrom((com.google.apps.card.v1.Image) data_);
+                    data_ = subBuilder.buildPartial();
+                  }
+                  dataCase_ = 2;
+                  break;
+                }
+              case 26:
+                {
+                  com.google.apps.card.v1.DecoratedText.Builder subBuilder = null;
+                  if (dataCase_ == 3) {
+                    subBuilder = ((com.google.apps.card.v1.DecoratedText) data_).toBuilder();
+                  }
+                  data_ =
+                      input.readMessage(
+                          com.google.apps.card.v1.DecoratedText.parser(), extensionRegistry);
+                  if (subBuilder != null) {
+                    subBuilder.mergeFrom((com.google.apps.card.v1.DecoratedText) data_);
+                    data_ = subBuilder.buildPartial();
+                  }
+                  dataCase_ = 3;
+                  break;
+                }
+              case 34:
+                {
+                  com.google.apps.card.v1.ButtonList.Builder subBuilder = null;
+                  if (dataCase_ == 4) {
+                    subBuilder = ((com.google.apps.card.v1.ButtonList) data_).toBuilder();
+                  }
+                  data_ =
+                      input.readMessage(
+                          com.google.apps.card.v1.ButtonList.parser(), extensionRegistry);
+                  if (subBuilder != null) {
+                    subBuilder.mergeFrom((com.google.apps.card.v1.ButtonList) data_);
+                    data_ = subBuilder.buildPartial();
+                  }
+                  dataCase_ = 4;
+                  break;
+                }
+              case 42:
+                {
+                  com.google.apps.card.v1.TextInput.Builder subBuilder = null;
+                  if (dataCase_ == 5) {
+                    subBuilder = ((com.google.apps.card.v1.TextInput) data_).toBuilder();
+                  }
+                  data_ =
+                      input.readMessage(
+                          com.google.apps.card.v1.TextInput.parser(), extensionRegistry);
+                  if (subBuilder != null) {
+                    subBuilder.mergeFrom((com.google.apps.card.v1.TextInput) data_);
+                    data_ = subBuilder.buildPartial();
+                  }
+                  dataCase_ = 5;
+                  break;
+                }
+              case 50:
+                {
+                  com.google.apps.card.v1.SelectionInput.Builder subBuilder = null;
+                  if (dataCase_ == 6) {
+                    subBuilder = ((com.google.apps.card.v1.SelectionInput) data_).toBuilder();
+                  }
+                  data_ =
+                      input.readMessage(
+                          com.google.apps.card.v1.SelectionInput.parser(), extensionRegistry);
+                  if (subBuilder != null) {
+                    subBuilder.mergeFrom((com.google.apps.card.v1.SelectionInput) data_);
+                    data_ = subBuilder.buildPartial();
+                  }
+                  dataCase_ = 6;
+                  break;
+                }
+              case 58:
+                {
+                  com.google.apps.card.v1.DateTimePicker.Builder subBuilder = null;
+                  if (dataCase_ == 7) {
+                    subBuilder = ((com.google.apps.card.v1.DateTimePicker) data_).toBuilder();
+                  }
+                  data_ =
+                      input.readMessage(
+                          com.google.apps.card.v1.DateTimePicker.parser(), extensionRegistry);
+                  if (subBuilder != null) {
+                    subBuilder.mergeFrom((com.google.apps.card.v1.DateTimePicker) data_);
+                    data_ = subBuilder.buildPartial();
+                  }
+                  dataCase_ = 7;
+                  break;
+                }
+              case 66:
+                {
+                  com.google.apps.card.v1.ChipList.Builder subBuilder = null;
+                  if (dataCase_ == 8) {
+                    subBuilder = ((com.google.apps.card.v1.ChipList) data_).toBuilder();
+                  }
+                  data_ =
+                      input.readMessage(
+                          com.google.apps.card.v1.ChipList.parser(), extensionRegistry);
+                  if (subBuilder != null) {
+                    subBuilder.mergeFrom((com.google.apps.card.v1.ChipList) data_);
+                    data_ = subBuilder.buildPartial();
+                  }
+                  dataCase_ = 8;
+                  break;
+                }
+              default:
+                {
+                  if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                    done = true;
+                  }
+                  break;
+                }
+            }
+          }
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(this);
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(this);
+        } finally {
+          this.unknownFields = unknownFields.build();
+          makeExtensionsImmutable();
+        }
+      }
+
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return com.google.apps.card.v1.CardProto
             .internal_static_google_apps_card_v1_Columns_Column_Widgets_descriptor;
@@ -1548,7 +1846,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         if (dataCase_ == 8) {
           output.writeMessage(8, (com.google.apps.card.v1.ChipList) data_);
         }
-        getUnknownFields().writeTo(output);
+        unknownFields.writeTo(output);
       }
 
       @java.lang.Override
@@ -1597,7 +1895,7 @@ public int getSerializedSize() {
               com.google.protobuf.CodedOutputStream.computeMessageSize(
                   8, (com.google.apps.card.v1.ChipList) data_);
         }
-        size += getUnknownFields().getSerializedSize();
+        size += unknownFields.getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -1642,7 +1940,7 @@ public boolean equals(final java.lang.Object obj) {
           case 0:
           default:
         }
-        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+        if (!unknownFields.equals(other.unknownFields)) return false;
         return true;
       }
 
@@ -1689,7 +1987,7 @@ public int hashCode() {
           case 0:
           default:
         }
-        hash = (29 * hash) + getUnknownFields().hashCode();
+        hash = (29 * hash) + unknownFields.hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -1823,39 +2121,22 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         }
 
         // Construct using com.google.apps.card.v1.Columns.Column.Widgets.newBuilder()
-        private Builder() {}
+        private Builder() {
+          maybeForceBuilderInitialization();
+        }
 
         private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
+          maybeForceBuilderInitialization();
+        }
+
+        private void maybeForceBuilderInitialization() {
+          if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
         }
 
         @java.lang.Override
         public Builder clear() {
           super.clear();
-          if (textParagraphBuilder_ != null) {
-            textParagraphBuilder_.clear();
-          }
-          if (imageBuilder_ != null) {
-            imageBuilder_.clear();
-          }
-          if (decoratedTextBuilder_ != null) {
-            decoratedTextBuilder_.clear();
-          }
-          if (buttonListBuilder_ != null) {
-            buttonListBuilder_.clear();
-          }
-          if (textInputBuilder_ != null) {
-            textInputBuilder_.clear();
-          }
-          if (selectionInputBuilder_ != null) {
-            selectionInputBuilder_.clear();
-          }
-          if (dateTimePickerBuilder_ != null) {
-            dateTimePickerBuilder_.clear();
-          }
-          if (chipListBuilder_ != null) {
-            chipListBuilder_.clear();
-          }
           dataCase_ = 0;
           data_ = null;
           return this;
@@ -2040,7 +2321,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Columns.Column.Widgets other) {
                 break;
               }
           }
-          this.mergeUnknownFields(other.getUnknownFields());
+          this.mergeUnknownFields(other.unknownFields);
           onChanged();
           return this;
         }
@@ -2055,83 +2336,18 @@ public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
+          com.google.apps.card.v1.Columns.Column.Widgets parsedMessage = null;
           try {
-            boolean done = false;
-            while (!done) {
-              int tag = input.readTag();
-              switch (tag) {
-                case 0:
-                  done = true;
-                  break;
-                case 10:
-                  {
-                    input.readMessage(
-                        getTextParagraphFieldBuilder().getBuilder(), extensionRegistry);
-                    dataCase_ = 1;
-                    break;
-                  } // case 10
-                case 18:
-                  {
-                    input.readMessage(getImageFieldBuilder().getBuilder(), extensionRegistry);
-                    dataCase_ = 2;
-                    break;
-                  } // case 18
-                case 26:
-                  {
-                    input.readMessage(
-                        getDecoratedTextFieldBuilder().getBuilder(), extensionRegistry);
-                    dataCase_ = 3;
-                    break;
-                  } // case 26
-                case 34:
-                  {
-                    input.readMessage(getButtonListFieldBuilder().getBuilder(), extensionRegistry);
-                    dataCase_ = 4;
-                    break;
-                  } // case 34
-                case 42:
-                  {
-                    input.readMessage(getTextInputFieldBuilder().getBuilder(), extensionRegistry);
-                    dataCase_ = 5;
-                    break;
-                  } // case 42
-                case 50:
-                  {
-                    input.readMessage(
-                        getSelectionInputFieldBuilder().getBuilder(), extensionRegistry);
-                    dataCase_ = 6;
-                    break;
-                  } // case 50
-                case 58:
-                  {
-                    input.readMessage(
-                        getDateTimePickerFieldBuilder().getBuilder(), extensionRegistry);
-                    dataCase_ = 7;
-                    break;
-                  } // case 58
-                case 66:
-                  {
-                    input.readMessage(getChipListFieldBuilder().getBuilder(), extensionRegistry);
-                    dataCase_ = 8;
-                    break;
-                  } // case 66
-                default:
-                  {
-                    if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                      done = true; // was an endgroup tag
-                    }
-                    break;
-                  } // default:
-              } // switch (tag)
-            } // while (!done)
+            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            parsedMessage =
+                (com.google.apps.card.v1.Columns.Column.Widgets) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            onChanged();
-          } // finally
+            if (parsedMessage != null) {
+              mergeFrom(parsedMessage);
+            }
+          }
           return this;
         }
 
@@ -3918,19 +4134,7 @@ public Widgets parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new Widgets(input, extensionRegistry);
             }
           };
 
@@ -4187,7 +4391,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       for (int i = 0; i < widgets_.size(); i++) {
         output.writeMessage(4, widgets_.get(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -4215,7 +4419,7 @@ public int getSerializedSize() {
       for (int i = 0; i < widgets_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, widgets_.get(i));
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4234,7 +4438,7 @@ public boolean equals(final java.lang.Object obj) {
       if (horizontalAlignment_ != other.horizontalAlignment_) return false;
       if (verticalAlignment_ != other.verticalAlignment_) return false;
       if (!getWidgetsList().equals(other.getWidgetsList())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -4255,7 +4459,7 @@ public int hashCode() {
         hash = (37 * hash) + WIDGETS_FIELD_NUMBER;
         hash = (53 * hash) + getWidgetsList().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4389,10 +4593,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.Columns.Column.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+          getWidgetsFieldBuilder();
+        }
       }
 
       @java.lang.Override
@@ -4406,11 +4619,10 @@ public Builder clear() {
 
         if (widgetsBuilder_ == null) {
           widgets_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
-          widgets_ = null;
           widgetsBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -4538,7 +4750,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Columns.Column other) {
             }
           }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -4553,63 +4765,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.apps.card.v1.Columns.Column parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 8:
-                {
-                  horizontalSizeStyle_ = input.readEnum();
-
-                  break;
-                } // case 8
-              case 16:
-                {
-                  horizontalAlignment_ = input.readEnum();
-
-                  break;
-                } // case 16
-              case 24:
-                {
-                  verticalAlignment_ = input.readEnum();
-
-                  break;
-                } // case 24
-              case 34:
-                {
-                  com.google.apps.card.v1.Columns.Column.Widgets m =
-                      input.readMessage(
-                          com.google.apps.card.v1.Columns.Column.Widgets.parser(),
-                          extensionRegistry);
-                  if (widgetsBuilder_ == null) {
-                    ensureWidgetsIsMutable();
-                    widgets_.add(m);
-                  } else {
-                    widgetsBuilder_.addMessage(m);
-                  }
-                  break;
-                } // case 34
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.apps.card.v1.Columns.Column) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -5348,19 +5514,7 @@ public Column parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Column(input, extensionRegistry);
           }
         };
 
@@ -5470,7 +5624,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < columnItems_.size(); i++) {
       output.writeMessage(2, columnItems_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -5482,7 +5636,7 @@ public int getSerializedSize() {
     for (int i = 0; i < columnItems_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, columnItems_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -5498,7 +5652,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.apps.card.v1.Columns other = (com.google.apps.card.v1.Columns) obj;
 
     if (!getColumnItemsList().equals(other.getColumnItemsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -5513,7 +5667,7 @@ public int hashCode() {
       hash = (37 * hash) + COLUMN_ITEMS_FIELD_NUMBER;
       hash = (53 * hash) + getColumnItemsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -5667,10 +5821,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Columns.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getColumnItemsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -5678,11 +5841,10 @@ public Builder clear() {
       super.clear();
       if (columnItemsBuilder_ == null) {
         columnItems_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        columnItems_ = null;
         columnItemsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -5795,7 +5957,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Columns other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -5810,44 +5972,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.Columns parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 18:
-              {
-                com.google.apps.card.v1.Columns.Column m =
-                    input.readMessage(
-                        com.google.apps.card.v1.Columns.Column.parser(), extensionRegistry);
-                if (columnItemsBuilder_ == null) {
-                  ensureColumnItemsIsMutable();
-                  columnItems_.add(m);
-                } else {
-                  columnItemsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.Columns) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -6252,18 +6387,7 @@ public Columns parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Columns(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DateTimePicker.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DateTimePicker.java
index 7b0e2e3703..b3ef0ac1ad 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DateTimePicker.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DateTimePicker.java
@@ -65,6 +65,93 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DateTimePicker(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              label_ = s;
+              break;
+            }
+          case 24:
+            {
+              int rawValue = input.readEnum();
+
+              type_ = rawValue;
+              break;
+            }
+          case 32:
+            {
+              bitField0_ |= 0x00000001;
+              valueMsEpoch_ = input.readInt64();
+              break;
+            }
+          case 40:
+            {
+              timezoneOffsetDate_ = input.readInt32();
+              break;
+            }
+          case 50:
+            {
+              com.google.apps.card.v1.Action.Builder subBuilder = null;
+              if (onChangeAction_ != null) {
+                subBuilder = onChangeAction_.toBuilder();
+              }
+              onChangeAction_ =
+                  input.readMessage(com.google.apps.card.v1.Action.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(onChangeAction_);
+                onChangeAction_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_DateTimePicker_descriptor;
@@ -555,7 +642,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (onChangeAction_ != null) {
       output.writeMessage(6, getOnChangeAction());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -583,7 +670,7 @@ public int getSerializedSize() {
     if (onChangeAction_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getOnChangeAction());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -610,7 +697,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasOnChangeAction()) {
       if (!getOnChangeAction().equals(other.getOnChangeAction())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -637,7 +724,7 @@ public int hashCode() {
       hash = (37 * hash) + ON_CHANGE_ACTION_FIELD_NUMBER;
       hash = (53 * hash) + getOnChangeAction().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -777,10 +864,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.DateTimePicker.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -914,7 +1008,7 @@ public Builder mergeFrom(com.google.apps.card.v1.DateTimePicker other) {
       if (other.hasOnChangeAction()) {
         mergeOnChangeAction(other.getOnChangeAction());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -929,67 +1023,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.DateTimePicker parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                label_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 24:
-              {
-                type_ = input.readEnum();
-
-                break;
-              } // case 24
-            case 32:
-              {
-                valueMsEpoch_ = input.readInt64();
-                bitField0_ |= 0x00000001;
-                break;
-              } // case 32
-            case 40:
-              {
-                timezoneOffsetDate_ = input.readInt32();
-
-                break;
-              } // case 40
-            case 50:
-              {
-                input.readMessage(getOnChangeActionFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 50
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.DateTimePicker) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1734,18 +1778,7 @@ public DateTimePicker parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DateTimePicker(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DecoratedText.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DecoratedText.java
index 1dcaf9d9c3..ebf34894a5 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DecoratedText.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/DecoratedText.java
@@ -62,6 +62,219 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DecoratedText(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.apps.card.v1.Icon.Builder subBuilder = null;
+              if (icon_ != null) {
+                subBuilder = icon_.toBuilder();
+              }
+              icon_ = input.readMessage(com.google.apps.card.v1.Icon.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(icon_);
+                icon_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              topLabel_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              text_ = s;
+              break;
+            }
+          case 40:
+            {
+              wrapText_ = input.readBool();
+              break;
+            }
+          case 50:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              bottomLabel_ = s;
+              break;
+            }
+          case 58:
+            {
+              com.google.apps.card.v1.OnClick.Builder subBuilder = null;
+              if (onClick_ != null) {
+                subBuilder = onClick_.toBuilder();
+              }
+              onClick_ =
+                  input.readMessage(com.google.apps.card.v1.OnClick.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(onClick_);
+                onClick_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 66:
+            {
+              com.google.apps.card.v1.Button.Builder subBuilder = null;
+              if (controlCase_ == 8) {
+                subBuilder = ((com.google.apps.card.v1.Button) control_).toBuilder();
+              }
+              control_ =
+                  input.readMessage(com.google.apps.card.v1.Button.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.Button) control_);
+                control_ = subBuilder.buildPartial();
+              }
+              controlCase_ = 8;
+              break;
+            }
+          case 74:
+            {
+              com.google.apps.card.v1.DecoratedText.SwitchControl.Builder subBuilder = null;
+              if (controlCase_ == 9) {
+                subBuilder =
+                    ((com.google.apps.card.v1.DecoratedText.SwitchControl) control_).toBuilder();
+              }
+              control_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.DecoratedText.SwitchControl.parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(
+                    (com.google.apps.card.v1.DecoratedText.SwitchControl) control_);
+                control_ = subBuilder.buildPartial();
+              }
+              controlCase_ = 9;
+              break;
+            }
+          case 90:
+            {
+              com.google.apps.card.v1.Icon.Builder subBuilder = null;
+              if (controlCase_ == 11) {
+                subBuilder = ((com.google.apps.card.v1.Icon) control_).toBuilder();
+              }
+              control_ =
+                  input.readMessage(com.google.apps.card.v1.Icon.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.Icon) control_);
+                control_ = subBuilder.buildPartial();
+              }
+              controlCase_ = 11;
+              break;
+            }
+          case 98:
+            {
+              com.google.apps.card.v1.Icon.Builder subBuilder = null;
+              if (startIcon_ != null) {
+                subBuilder = startIcon_.toBuilder();
+              }
+              startIcon_ =
+                  input.readMessage(com.google.apps.card.v1.Icon.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(startIcon_);
+                startIcon_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 104:
+            {
+              int rawValue = input.readEnum();
+
+              startIconVerticalAlignment_ = rawValue;
+              break;
+            }
+          case 138:
+            {
+              com.google.apps.card.v1.TextParagraph.Builder subBuilder = null;
+              if (topLabelText_ != null) {
+                subBuilder = topLabelText_.toBuilder();
+              }
+              topLabelText_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.TextParagraph.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(topLabelText_);
+                topLabelText_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 146:
+            {
+              com.google.apps.card.v1.TextParagraph.Builder subBuilder = null;
+              if (contentText_ != null) {
+                subBuilder = contentText_.toBuilder();
+              }
+              contentText_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.TextParagraph.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(contentText_);
+                contentText_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 154:
+            {
+              com.google.apps.card.v1.TextParagraph.Builder subBuilder = null;
+              if (bottomLabelText_ != null) {
+                subBuilder = bottomLabelText_.toBuilder();
+              }
+              bottomLabelText_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.TextParagraph.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(bottomLabelText_);
+                bottomLabelText_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_DecoratedText_descriptor;
@@ -266,6 +479,86 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private SwitchControl(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                name_ = s;
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                value_ = s;
+                break;
+              }
+            case 24:
+              {
+                selected_ = input.readBool();
+                break;
+              }
+            case 34:
+              {
+                com.google.apps.card.v1.Action.Builder subBuilder = null;
+                if (onChangeAction_ != null) {
+                  subBuilder = onChangeAction_.toBuilder();
+                }
+                onChangeAction_ =
+                    input.readMessage(com.google.apps.card.v1.Action.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(onChangeAction_);
+                  onChangeAction_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 40:
+              {
+                int rawValue = input.readEnum();
+
+                controlType_ = rawValue;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_DecoratedText_SwitchControl_descriptor;
@@ -701,7 +994,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
           != com.google.apps.card.v1.DecoratedText.SwitchControl.ControlType.SWITCH.getNumber()) {
         output.writeEnum(5, controlType_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -726,7 +1019,7 @@ public int getSerializedSize() {
           != com.google.apps.card.v1.DecoratedText.SwitchControl.ControlType.SWITCH.getNumber()) {
         size += com.google.protobuf.CodedOutputStream.computeEnumSize(5, controlType_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -750,7 +1043,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getOnChangeAction().equals(other.getOnChangeAction())) return false;
       }
       if (controlType_ != other.controlType_) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -773,7 +1066,7 @@ public int hashCode() {
       }
       hash = (37 * hash) + CONTROL_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + controlType_;
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -909,10 +1202,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.DecoratedText.SwitchControl.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -1037,7 +1337,7 @@ public Builder mergeFrom(com.google.apps.card.v1.DecoratedText.SwitchControl oth
         if (other.controlType_ != 0) {
           setControlTypeValue(other.getControlTypeValue());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1052,62 +1352,18 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.apps.card.v1.DecoratedText.SwitchControl parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  name_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  value_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 18
-              case 24:
-                {
-                  selected_ = input.readBool();
-
-                  break;
-                } // case 24
-              case 34:
-                {
-                  input.readMessage(
-                      getOnChangeActionFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 34
-              case 40:
-                {
-                  controlType_ = input.readEnum();
-
-                  break;
-                } // case 40
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.apps.card.v1.DecoratedText.SwitchControl) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1753,19 +2009,7 @@ public SwitchControl parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new SwitchControl(input, extensionRegistry);
           }
         };
 
@@ -2630,7 +2874,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (bottomLabelText_ != null) {
       output.writeMessage(19, getBottomLabelText());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -2690,7 +2934,7 @@ public int getSerializedSize() {
     if (bottomLabelText_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(19, getBottomLabelText());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -2748,7 +2992,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -2809,7 +3053,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -2944,10 +3188,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.DecoratedText.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -2999,15 +3250,6 @@ public Builder clear() {
         onClick_ = null;
         onClickBuilder_ = null;
       }
-      if (buttonBuilder_ != null) {
-        buttonBuilder_.clear();
-      }
-      if (switchControlBuilder_ != null) {
-        switchControlBuilder_.clear();
-      }
-      if (endIconBuilder_ != null) {
-        endIconBuilder_.clear();
-      }
       controlCase_ = 0;
       control_ = null;
       return this;
@@ -3200,7 +3442,7 @@ public Builder mergeFrom(com.google.apps.card.v1.DecoratedText other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -3215,115 +3457,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.DecoratedText parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getIconFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 26:
-              {
-                topLabel_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                text_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            case 40:
-              {
-                wrapText_ = input.readBool();
-
-                break;
-              } // case 40
-            case 50:
-              {
-                bottomLabel_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 50
-            case 58:
-              {
-                input.readMessage(getOnClickFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 58
-            case 66:
-              {
-                input.readMessage(getButtonFieldBuilder().getBuilder(), extensionRegistry);
-                controlCase_ = 8;
-                break;
-              } // case 66
-            case 74:
-              {
-                input.readMessage(getSwitchControlFieldBuilder().getBuilder(), extensionRegistry);
-                controlCase_ = 9;
-                break;
-              } // case 74
-            case 90:
-              {
-                input.readMessage(getEndIconFieldBuilder().getBuilder(), extensionRegistry);
-                controlCase_ = 11;
-                break;
-              } // case 90
-            case 98:
-              {
-                input.readMessage(getStartIconFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 98
-            case 104:
-              {
-                startIconVerticalAlignment_ = input.readEnum();
-
-                break;
-              } // case 104
-            case 138:
-              {
-                input.readMessage(getTopLabelTextFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 138
-            case 146:
-              {
-                input.readMessage(getContentTextFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 146
-            case 154:
-              {
-                input.readMessage(getBottomLabelTextFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 154
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.DecoratedText) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -5836,18 +5980,7 @@ public DecoratedText parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DecoratedText(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Divider.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Divider.java
index d1954de7aa..5f632a3db0 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Divider.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Divider.java
@@ -60,6 +60,45 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Divider(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Divider_descriptor;
   }
@@ -87,7 +126,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -96,7 +135,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -111,7 +150,7 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.apps.card.v1.Divider other = (com.google.apps.card.v1.Divider) obj;
 
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -122,7 +161,7 @@ public int hashCode() {
     }
     int hash = 41;
     hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -259,10 +298,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Divider.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -343,7 +389,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
     public Builder mergeFrom(com.google.apps.card.v1.Divider other) {
       if (other == com.google.apps.card.v1.Divider.getDefaultInstance()) return this;
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -358,31 +404,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.Divider parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.Divider) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -418,18 +450,7 @@ public Divider parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Divider(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Grid.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Grid.java
index c31ed36a98..c94bb3e1af 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Grid.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Grid.java
@@ -96,6 +96,103 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Grid(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              title_ = s;
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                items_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              items_.add(
+                  input.readMessage(
+                      com.google.apps.card.v1.Grid.GridItem.parser(), extensionRegistry));
+              break;
+            }
+          case 26:
+            {
+              com.google.apps.card.v1.BorderStyle.Builder subBuilder = null;
+              if (borderStyle_ != null) {
+                subBuilder = borderStyle_.toBuilder();
+              }
+              borderStyle_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.BorderStyle.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(borderStyle_);
+                borderStyle_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 32:
+            {
+              columnCount_ = input.readInt32();
+              break;
+            }
+          case 42:
+            {
+              com.google.apps.card.v1.OnClick.Builder subBuilder = null;
+              if (onClick_ != null) {
+                subBuilder = onClick_.toBuilder();
+              }
+              onClick_ =
+                  input.readMessage(com.google.apps.card.v1.OnClick.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(onClick_);
+                onClick_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        items_ = java.util.Collections.unmodifiableList(items_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Grid_descriptor;
   }
@@ -299,6 +396,89 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private GridItem(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                id_ = s;
+                break;
+              }
+            case 18:
+              {
+                com.google.apps.card.v1.ImageComponent.Builder subBuilder = null;
+                if (image_ != null) {
+                  subBuilder = image_.toBuilder();
+                }
+                image_ =
+                    input.readMessage(
+                        com.google.apps.card.v1.ImageComponent.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(image_);
+                  image_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 26:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                title_ = s;
+                break;
+              }
+            case 34:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                subtitle_ = s;
+                break;
+              }
+            case 72:
+              {
+                int rawValue = input.readEnum();
+
+                layout_ = rawValue;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Grid_GridItem_descriptor;
@@ -752,7 +932,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
               .getNumber()) {
         output.writeEnum(9, layout_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -778,7 +958,7 @@ public int getSerializedSize() {
               .getNumber()) {
         size += com.google.protobuf.CodedOutputStream.computeEnumSize(9, layout_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -801,7 +981,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getTitle().equals(other.getTitle())) return false;
       if (!getSubtitle().equals(other.getSubtitle())) return false;
       if (layout_ != other.layout_) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -824,7 +1004,7 @@ public int hashCode() {
       hash = (53 * hash) + getSubtitle().hashCode();
       hash = (37 * hash) + LAYOUT_FIELD_NUMBER;
       hash = (53 * hash) + layout_;
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -959,10 +1139,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.Grid.GridItem.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -1087,7 +1274,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Grid.GridItem other) {
         if (other.layout_ != 0) {
           setLayoutValue(other.getLayoutValue());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1102,61 +1289,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.apps.card.v1.Grid.GridItem parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  id_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  input.readMessage(getImageFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 18
-              case 26:
-                {
-                  title_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 26
-              case 34:
-                {
-                  subtitle_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 34
-              case 72:
-                {
-                  layout_ = input.readEnum();
-
-                  break;
-                } // case 72
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.apps.card.v1.Grid.GridItem) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1823,19 +1966,7 @@ public GridItem parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new GridItem(input, extensionRegistry);
           }
         };
 
@@ -2135,7 +2266,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (onClick_ != null) {
       output.writeMessage(5, getOnClick());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -2159,7 +2290,7 @@ public int getSerializedSize() {
     if (onClick_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getOnClick());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -2185,7 +2316,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasOnClick()) {
       if (!getOnClick().equals(other.getOnClick())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -2212,7 +2343,7 @@ public int hashCode() {
       hash = (37 * hash) + ON_CLICK_FIELD_NUMBER;
       hash = (53 * hash) + getOnClick().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -2381,10 +2512,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Grid.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getItemsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -2394,11 +2534,10 @@ public Builder clear() {
 
       if (itemsBuilder_ == null) {
         items_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        items_ = null;
         itemsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       if (borderStyleBuilder_ == null) {
         borderStyle_ = null;
       } else {
@@ -2549,7 +2688,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Grid other) {
       if (other.hasOnClick()) {
         mergeOnClick(other.getOnClick());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2564,68 +2703,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.Grid parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                title_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.apps.card.v1.Grid.GridItem m =
-                    input.readMessage(
-                        com.google.apps.card.v1.Grid.GridItem.parser(), extensionRegistry);
-                if (itemsBuilder_ == null) {
-                  ensureItemsIsMutable();
-                  items_.add(m);
-                } else {
-                  itemsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(getBorderStyleFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            case 32:
-              {
-                columnCount_ = input.readInt32();
-
-                break;
-              } // case 32
-            case 42:
-              {
-                input.readMessage(getOnClickFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 42
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.Grid) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -3600,18 +3688,7 @@ public Grid parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Grid(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Icon.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Icon.java
index ecf142a858..e80234064e 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Icon.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Icon.java
@@ -63,6 +63,89 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Icon(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              iconsCase_ = 1;
+              icons_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              iconsCase_ = 2;
+              icons_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              altText_ = s;
+              break;
+            }
+          case 32:
+            {
+              int rawValue = input.readEnum();
+
+              imageType_ = rawValue;
+              break;
+            }
+          case 42:
+            {
+              com.google.apps.card.v1.MaterialIcon.Builder subBuilder = null;
+              if (iconsCase_ == 5) {
+                subBuilder = ((com.google.apps.card.v1.MaterialIcon) icons_).toBuilder();
+              }
+              icons_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.MaterialIcon.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.MaterialIcon) icons_);
+                icons_ = subBuilder.buildPartial();
+              }
+              iconsCase_ = 5;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Icon_descriptor;
   }
@@ -525,7 +608,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (iconsCase_ == 5) {
       output.writeMessage(5, (com.google.apps.card.v1.MaterialIcon) icons_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -551,7 +634,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               5, (com.google.apps.card.v1.MaterialIcon) icons_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -582,7 +665,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -613,7 +696,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -749,18 +832,22 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Icon.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (materialIconBuilder_ != null) {
-        materialIconBuilder_.clear();
-      }
       altText_ = "";
 
       imageType_ = 0;
@@ -889,7 +976,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Icon other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -904,63 +991,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.Icon parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                iconsCase_ = 1;
-                icons_ = s;
-                break;
-              } // case 10
-            case 18:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                iconsCase_ = 2;
-                icons_ = s;
-                break;
-              } // case 18
-            case 26:
-              {
-                altText_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 32:
-              {
-                imageType_ = input.readEnum();
-
-                break;
-              } // case 32
-            case 42:
-              {
-                input.readMessage(getMaterialIconFieldBuilder().getBuilder(), extensionRegistry);
-                iconsCase_ = 5;
-                break;
-              } // case 42
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.Icon) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1911,18 +1952,7 @@ public Icon parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Icon(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Image.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Image.java
index 4565735438..6ec5b21624 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Image.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Image.java
@@ -58,6 +58,74 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Image(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              imageUrl_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.apps.card.v1.OnClick.Builder subBuilder = null;
+              if (onClick_ != null) {
+                subBuilder = onClick_.toBuilder();
+              }
+              onClick_ =
+                  input.readMessage(com.google.apps.card.v1.OnClick.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(onClick_);
+                onClick_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              altText_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Image_descriptor;
   }
@@ -253,7 +321,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(altText_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, altText_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -271,7 +339,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(altText_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, altText_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -292,7 +360,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getOnClick().equals(other.getOnClick())) return false;
     }
     if (!getAltText().equals(other.getAltText())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -311,7 +379,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + ALT_TEXT_FIELD_NUMBER;
     hash = (53 * hash) + getAltText().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -442,10 +510,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Image.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -553,7 +628,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Image other) {
         altText_ = other.altText_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -568,49 +643,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.Image parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                imageUrl_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getOnClickFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            case 26:
-              {
-                altText_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.Image) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1076,18 +1119,7 @@ public Image parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Image(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageComponent.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageComponent.java
index a3c8de5dfa..ac5fa8b2fd 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageComponent.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageComponent.java
@@ -56,6 +56,91 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ImageComponent(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              imageUri_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              altText_ = s;
+              break;
+            }
+          case 26:
+            {
+              com.google.apps.card.v1.ImageCropStyle.Builder subBuilder = null;
+              if (cropStyle_ != null) {
+                subBuilder = cropStyle_.toBuilder();
+              }
+              cropStyle_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.ImageCropStyle.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(cropStyle_);
+                cropStyle_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 34:
+            {
+              com.google.apps.card.v1.BorderStyle.Builder subBuilder = null;
+              if (borderStyle_ != null) {
+                subBuilder = borderStyle_.toBuilder();
+              }
+              borderStyle_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.BorderStyle.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(borderStyle_);
+                borderStyle_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_ImageComponent_descriptor;
@@ -301,7 +386,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (borderStyle_ != null) {
       output.writeMessage(4, getBorderStyle());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -322,7 +407,7 @@ public int getSerializedSize() {
     if (borderStyle_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getBorderStyle());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -347,7 +432,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasBorderStyle()) {
       if (!getBorderStyle().equals(other.getBorderStyle())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -370,7 +455,7 @@ public int hashCode() {
       hash = (37 * hash) + BORDER_STYLE_FIELD_NUMBER;
       hash = (53 * hash) + getBorderStyle().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -502,10 +587,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.ImageComponent.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -629,7 +721,7 @@ public Builder mergeFrom(com.google.apps.card.v1.ImageComponent other) {
       if (other.hasBorderStyle()) {
         mergeBorderStyle(other.getBorderStyle());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -644,55 +736,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.ImageComponent parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                imageUri_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                altText_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(getCropStyleFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            case 34:
-              {
-                input.readMessage(getBorderStyleFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.ImageComponent) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1338,18 +1392,7 @@ public ImageComponent parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ImageComponent(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageCropStyle.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageCropStyle.java
index 1becc33259..4c52b3b498 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageCropStyle.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/ImageCropStyle.java
@@ -62,6 +62,57 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ImageCropStyle(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              int rawValue = input.readEnum();
+
+              type_ = rawValue;
+              break;
+            }
+          case 17:
+            {
+              aspectRatio_ = input.readDouble();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_ImageCropStyle_descriptor;
@@ -374,7 +425,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (java.lang.Double.doubleToRawLongBits(aspectRatio_) != 0) {
       output.writeDouble(2, aspectRatio_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -391,7 +442,7 @@ public int getSerializedSize() {
     if (java.lang.Double.doubleToRawLongBits(aspectRatio_) != 0) {
       size += com.google.protobuf.CodedOutputStream.computeDoubleSize(2, aspectRatio_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -409,7 +460,7 @@ public boolean equals(final java.lang.Object obj) {
     if (type_ != other.type_) return false;
     if (java.lang.Double.doubleToLongBits(getAspectRatio())
         != java.lang.Double.doubleToLongBits(other.getAspectRatio())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -427,7 +478,7 @@ public int hashCode() {
         (53 * hash)
             + com.google.protobuf.Internal.hashLong(
                 java.lang.Double.doubleToLongBits(getAspectRatio()));
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -566,10 +617,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.ImageCropStyle.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -663,7 +721,7 @@ public Builder mergeFrom(com.google.apps.card.v1.ImageCropStyle other) {
       if (other.getAspectRatio() != 0D) {
         setAspectRatio(other.getAspectRatio());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -678,43 +736,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.ImageCropStyle parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                type_ = input.readEnum();
-
-                break;
-              } // case 8
-            case 17:
-              {
-                aspectRatio_ = input.readDouble();
-
-                break;
-              } // case 17
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.ImageCropStyle) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -924,18 +956,7 @@ public ImageCropStyle parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ImageCropStyle(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/MaterialIcon.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/MaterialIcon.java
index da9c427710..5bda1931b8 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/MaterialIcon.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/MaterialIcon.java
@@ -66,6 +66,67 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private MaterialIcon(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 16:
+            {
+              fill_ = input.readBool();
+              break;
+            }
+          case 24:
+            {
+              weight_ = input.readInt32();
+              break;
+            }
+          case 32:
+            {
+              grade_ = input.readInt32();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_MaterialIcon_descriptor;
@@ -235,7 +296,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (grade_ != 0) {
       output.writeInt32(4, grade_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -256,7 +317,7 @@ public int getSerializedSize() {
     if (grade_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(4, grade_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -275,7 +336,7 @@ public boolean equals(final java.lang.Object obj) {
     if (getFill() != other.getFill()) return false;
     if (getWeight() != other.getWeight()) return false;
     if (getGrade() != other.getGrade()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -294,7 +355,7 @@ public int hashCode() {
     hash = (53 * hash) + getWeight();
     hash = (37 * hash) + GRADE_FIELD_NUMBER;
     hash = (53 * hash) + getGrade();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -436,10 +497,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.MaterialIcon.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -545,7 +613,7 @@ public Builder mergeFrom(com.google.apps.card.v1.MaterialIcon other) {
       if (other.getGrade() != 0) {
         setGrade(other.getGrade());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -560,55 +628,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.MaterialIcon parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                fill_ = input.readBool();
-
-                break;
-              } // case 16
-            case 24:
-              {
-                weight_ = input.readInt32();
-
-                break;
-              } // case 24
-            case 32:
-              {
-                grade_ = input.readInt32();
-
-                break;
-              } // case 32
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.MaterialIcon) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -977,18 +1007,7 @@ public MaterialIcon parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new MaterialIcon(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OnClick.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OnClick.java
index 92ee742fa0..57cd80d321 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OnClick.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OnClick.java
@@ -54,6 +54,118 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private OnClick(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.apps.card.v1.Action.Builder subBuilder = null;
+              if (dataCase_ == 1) {
+                subBuilder = ((com.google.apps.card.v1.Action) data_).toBuilder();
+              }
+              data_ = input.readMessage(com.google.apps.card.v1.Action.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.Action) data_);
+                data_ = subBuilder.buildPartial();
+              }
+              dataCase_ = 1;
+              break;
+            }
+          case 18:
+            {
+              com.google.apps.card.v1.OpenLink.Builder subBuilder = null;
+              if (dataCase_ == 2) {
+                subBuilder = ((com.google.apps.card.v1.OpenLink) data_).toBuilder();
+              }
+              data_ =
+                  input.readMessage(com.google.apps.card.v1.OpenLink.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.OpenLink) data_);
+                data_ = subBuilder.buildPartial();
+              }
+              dataCase_ = 2;
+              break;
+            }
+          case 26:
+            {
+              com.google.apps.card.v1.Action.Builder subBuilder = null;
+              if (dataCase_ == 3) {
+                subBuilder = ((com.google.apps.card.v1.Action) data_).toBuilder();
+              }
+              data_ = input.readMessage(com.google.apps.card.v1.Action.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.Action) data_);
+                data_ = subBuilder.buildPartial();
+              }
+              dataCase_ = 3;
+              break;
+            }
+          case 34:
+            {
+              com.google.apps.card.v1.Card.Builder subBuilder = null;
+              if (dataCase_ == 4) {
+                subBuilder = ((com.google.apps.card.v1.Card) data_).toBuilder();
+              }
+              data_ = input.readMessage(com.google.apps.card.v1.Card.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.Card) data_);
+                data_ = subBuilder.buildPartial();
+              }
+              dataCase_ = 4;
+              break;
+            }
+          case 66:
+            {
+              com.google.apps.card.v1.OverflowMenu.Builder subBuilder = null;
+              if (dataCase_ == 8) {
+                subBuilder = ((com.google.apps.card.v1.OverflowMenu) data_).toBuilder();
+              }
+              data_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.OverflowMenu.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.OverflowMenu) data_);
+                data_ = subBuilder.buildPartial();
+              }
+              dataCase_ = 8;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto.internal_static_google_apps_card_v1_OnClick_descriptor;
   }
@@ -444,7 +556,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (dataCase_ == 8) {
       output.writeMessage(8, (com.google.apps.card.v1.OverflowMenu) data_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -478,7 +590,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               8, (com.google.apps.card.v1.OverflowMenu) data_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -513,7 +625,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -548,7 +660,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -679,30 +791,22 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.OnClick.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (actionBuilder_ != null) {
-        actionBuilder_.clear();
-      }
-      if (openLinkBuilder_ != null) {
-        openLinkBuilder_.clear();
-      }
-      if (openDynamicLinkActionBuilder_ != null) {
-        openDynamicLinkActionBuilder_.clear();
-      }
-      if (cardBuilder_ != null) {
-        cardBuilder_.clear();
-      }
-      if (overflowMenuBuilder_ != null) {
-        overflowMenuBuilder_.clear();
-      }
       dataCase_ = 0;
       data_ = null;
       return this;
@@ -847,7 +951,7 @@ public Builder mergeFrom(com.google.apps.card.v1.OnClick other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -862,62 +966,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.OnClick parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getActionFieldBuilder().getBuilder(), extensionRegistry);
-                dataCase_ = 1;
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getOpenLinkFieldBuilder().getBuilder(), extensionRegistry);
-                dataCase_ = 2;
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(
-                    getOpenDynamicLinkActionFieldBuilder().getBuilder(), extensionRegistry);
-                dataCase_ = 3;
-                break;
-              } // case 26
-            case 34:
-              {
-                input.readMessage(getCardFieldBuilder().getBuilder(), extensionRegistry);
-                dataCase_ = 4;
-                break;
-              } // case 34
-            case 66:
-              {
-                input.readMessage(getOverflowMenuFieldBuilder().getBuilder(), extensionRegistry);
-                dataCase_ = 8;
-                break;
-              } // case 66
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.OnClick) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2102,18 +2161,7 @@ public OnClick parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new OnClick(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OpenLink.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OpenLink.java
index d75f3785ed..49b707d831 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OpenLink.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OpenLink.java
@@ -57,6 +57,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private OpenLink(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              url_ = s;
+              break;
+            }
+          case 16:
+            {
+              int rawValue = input.readEnum();
+
+              openAs_ = rawValue;
+              break;
+            }
+          case 24:
+            {
+              int rawValue = input.readEnum();
+
+              onClose_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_OpenLink_descriptor;
@@ -525,7 +585,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (onClose_ != com.google.apps.card.v1.OpenLink.OnClose.NOTHING.getNumber()) {
       output.writeEnum(3, onClose_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -543,7 +603,7 @@ public int getSerializedSize() {
     if (onClose_ != com.google.apps.card.v1.OpenLink.OnClose.NOTHING.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(3, onClose_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -561,7 +621,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getUrl().equals(other.getUrl())) return false;
     if (openAs_ != other.openAs_) return false;
     if (onClose_ != other.onClose_) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -578,7 +638,7 @@ public int hashCode() {
     hash = (53 * hash) + openAs_;
     hash = (37 * hash) + ON_CLOSE_FIELD_NUMBER;
     hash = (53 * hash) + onClose_;
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -709,10 +769,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.OpenLink.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -812,7 +879,7 @@ public Builder mergeFrom(com.google.apps.card.v1.OpenLink other) {
       if (other.onClose_ != 0) {
         setOnCloseValue(other.getOnCloseValue());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -827,49 +894,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.OpenLink parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                url_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                openAs_ = input.readEnum();
-
-                break;
-              } // case 16
-            case 24:
-              {
-                onClose_ = input.readEnum();
-
-                break;
-              } // case 24
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.OpenLink) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1233,18 +1268,7 @@ public OpenLink parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new OpenLink(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OverflowMenu.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OverflowMenu.java
index 0cff22c4f1..16988abddc 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OverflowMenu.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/OverflowMenu.java
@@ -59,6 +59,63 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private OverflowMenu(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                items_ =
+                    new java.util.ArrayList<
+                        com.google.apps.card.v1.OverflowMenu.OverflowMenuItem>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              items_.add(
+                  input.readMessage(
+                      com.google.apps.card.v1.OverflowMenu.OverflowMenuItem.parser(),
+                      extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        items_ = java.util.Collections.unmodifiableList(items_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_OverflowMenu_descriptor;
@@ -237,6 +294,87 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private OverflowMenuItem(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.apps.card.v1.Icon.Builder subBuilder = null;
+                if (startIcon_ != null) {
+                  subBuilder = startIcon_.toBuilder();
+                }
+                startIcon_ =
+                    input.readMessage(com.google.apps.card.v1.Icon.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(startIcon_);
+                  startIcon_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                text_ = s;
+                break;
+              }
+            case 26:
+              {
+                com.google.apps.card.v1.OnClick.Builder subBuilder = null;
+                if (onClick_ != null) {
+                  subBuilder = onClick_.toBuilder();
+                }
+                onClick_ =
+                    input.readMessage(com.google.apps.card.v1.OnClick.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(onClick_);
+                  onClick_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 32:
+              {
+                disabled_ = input.readBool();
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_OverflowMenu_OverflowMenuItem_descriptor;
@@ -453,7 +591,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (disabled_ != false) {
         output.writeBool(4, disabled_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -474,7 +612,7 @@ public int getSerializedSize() {
       if (disabled_ != false) {
         size += com.google.protobuf.CodedOutputStream.computeBoolSize(4, disabled_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -500,7 +638,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getOnClick().equals(other.getOnClick())) return false;
       }
       if (getDisabled() != other.getDisabled()) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -523,7 +661,7 @@ public int hashCode() {
       }
       hash = (37 * hash) + DISABLED_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getDisabled());
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -658,10 +796,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.OverflowMenu.OverflowMenuItem.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -787,7 +932,7 @@ public Builder mergeFrom(com.google.apps.card.v1.OverflowMenu.OverflowMenuItem o
         if (other.getDisabled() != false) {
           setDisabled(other.getDisabled());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -802,55 +947,18 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.apps.card.v1.OverflowMenu.OverflowMenuItem parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  input.readMessage(getStartIconFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  text_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 18
-              case 26:
-                {
-                  input.readMessage(getOnClickFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 26
-              case 32:
-                {
-                  disabled_ = input.readBool();
-
-                  break;
-                } // case 32
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.apps.card.v1.OverflowMenu.OverflowMenuItem) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1456,19 +1564,7 @@ public OverflowMenuItem parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new OverflowMenuItem(input, extensionRegistry);
           }
         };
 
@@ -1579,7 +1675,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < items_.size(); i++) {
       output.writeMessage(1, items_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1591,7 +1687,7 @@ public int getSerializedSize() {
     for (int i = 0; i < items_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, items_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1607,7 +1703,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.apps.card.v1.OverflowMenu other = (com.google.apps.card.v1.OverflowMenu) obj;
 
     if (!getItemsList().equals(other.getItemsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1622,7 +1718,7 @@ public int hashCode() {
       hash = (37 * hash) + ITEMS_FIELD_NUMBER;
       hash = (53 * hash) + getItemsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1757,10 +1853,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.OverflowMenu.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getItemsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -1768,11 +1873,10 @@ public Builder clear() {
       super.clear();
       if (itemsBuilder_ == null) {
         items_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        items_ = null;
         itemsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -1885,7 +1989,7 @@ public Builder mergeFrom(com.google.apps.card.v1.OverflowMenu other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1900,45 +2004,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.OverflowMenu parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.apps.card.v1.OverflowMenu.OverflowMenuItem m =
-                    input.readMessage(
-                        com.google.apps.card.v1.OverflowMenu.OverflowMenuItem.parser(),
-                        extensionRegistry);
-                if (itemsBuilder_ == null) {
-                  ensureItemsIsMutable();
-                  items_.add(m);
-                } else {
-                  itemsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.OverflowMenu) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2351,18 +2427,7 @@ public OverflowMenu parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new OverflowMenu(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/SelectionInput.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/SelectionInput.java
index 01d6649dd7..4014e7aaef 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/SelectionInput.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/SelectionInput.java
@@ -70,6 +70,146 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SelectionInput(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              label_ = s;
+              break;
+            }
+          case 24:
+            {
+              int rawValue = input.readEnum();
+
+              type_ = rawValue;
+              break;
+            }
+          case 34:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                items_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              items_.add(
+                  input.readMessage(
+                      com.google.apps.card.v1.SelectionInput.SelectionItem.parser(),
+                      extensionRegistry));
+              break;
+            }
+          case 42:
+            {
+              com.google.apps.card.v1.Action.Builder subBuilder = null;
+              if (onChangeAction_ != null) {
+                subBuilder = onChangeAction_.toBuilder();
+              }
+              onChangeAction_ =
+                  input.readMessage(com.google.apps.card.v1.Action.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(onChangeAction_);
+                onChangeAction_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 48:
+            {
+              bitField0_ |= 0x00000001;
+              multiSelectMaxSelectedItems_ = input.readInt32();
+              break;
+            }
+          case 56:
+            {
+              multiSelectMinQueryLength_ = input.readInt32();
+              break;
+            }
+          case 66:
+            {
+              com.google.apps.card.v1.Action.Builder subBuilder = null;
+              if (multiSelectDataSourceCase_ == 8) {
+                subBuilder = ((com.google.apps.card.v1.Action) multiSelectDataSource_).toBuilder();
+              }
+              multiSelectDataSource_ =
+                  input.readMessage(com.google.apps.card.v1.Action.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.Action) multiSelectDataSource_);
+                multiSelectDataSource_ = subBuilder.buildPartial();
+              }
+              multiSelectDataSourceCase_ = 8;
+              break;
+            }
+          case 74:
+            {
+              com.google.apps.card.v1.SelectionInput.PlatformDataSource.Builder subBuilder = null;
+              if (multiSelectDataSourceCase_ == 9) {
+                subBuilder =
+                    ((com.google.apps.card.v1.SelectionInput.PlatformDataSource)
+                            multiSelectDataSource_)
+                        .toBuilder();
+              }
+              multiSelectDataSource_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.SelectionInput.PlatformDataSource.parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(
+                    (com.google.apps.card.v1.SelectionInput.PlatformDataSource)
+                        multiSelectDataSource_);
+                multiSelectDataSource_ = subBuilder.buildPartial();
+              }
+              multiSelectDataSourceCase_ = 9;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        items_ = java.util.Collections.unmodifiableList(items_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_SelectionInput_descriptor;
@@ -498,6 +638,78 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private SelectionItem(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                text_ = s;
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                value_ = s;
+                break;
+              }
+            case 24:
+              {
+                selected_ = input.readBool();
+                break;
+              }
+            case 34:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+                startIconCase_ = 4;
+                startIcon_ = s;
+                break;
+              }
+            case 42:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                bottomText_ = s;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_SelectionInput_SelectionItem_descriptor;
@@ -824,7 +1036,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bottomText_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 5, bottomText_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -848,7 +1060,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bottomText_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, bottomText_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -876,7 +1088,7 @@ public boolean equals(final java.lang.Object obj) {
         case 0:
         default:
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -903,7 +1115,7 @@ public int hashCode() {
         case 0:
         default:
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1039,10 +1251,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.SelectionInput.SelectionItem.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -1173,7 +1392,7 @@ public Builder mergeFrom(com.google.apps.card.v1.SelectionInput.SelectionItem ot
               break;
             }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1188,62 +1407,18 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.apps.card.v1.SelectionInput.SelectionItem parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  text_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  value_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 18
-              case 24:
-                {
-                  selected_ = input.readBool();
-
-                  break;
-                } // case 24
-              case 34:
-                {
-                  java.lang.String s = input.readStringRequireUtf8();
-                  startIconCase_ = 4;
-                  startIcon_ = s;
-                  break;
-                } // case 34
-              case 42:
-                {
-                  bottomText_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 42
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.apps.card.v1.SelectionInput.SelectionItem) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1811,19 +1986,7 @@ public SelectionItem parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new SelectionItem(input, extensionRegistry);
           }
         };
 
@@ -1937,6 +2100,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private PlatformDataSource(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                int rawValue = input.readEnum();
+                dataSourceCase_ = 1;
+                dataSource_ = rawValue;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_SelectionInput_PlatformDataSource_descriptor;
@@ -2230,7 +2439,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (dataSourceCase_ == 1) {
         output.writeEnum(1, ((java.lang.Integer) dataSource_));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -2244,7 +2453,7 @@ public int getSerializedSize() {
             com.google.protobuf.CodedOutputStream.computeEnumSize(
                 1, ((java.lang.Integer) dataSource_));
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2268,7 +2477,7 @@ public boolean equals(final java.lang.Object obj) {
         case 0:
         default:
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -2287,7 +2496,7 @@ public int hashCode() {
         case 0:
         default:
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2424,10 +2633,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.SelectionInput.PlatformDataSource.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -2529,7 +2745,7 @@ public Builder mergeFrom(com.google.apps.card.v1.SelectionInput.PlatformDataSour
               break;
             }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -2544,38 +2760,18 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.apps.card.v1.SelectionInput.PlatformDataSource parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 8:
-                {
-                  int rawValue = input.readEnum();
-                  dataSourceCase_ = 1;
-                  dataSource_ = rawValue;
-                  break;
-                } // case 8
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.apps.card.v1.SelectionInput.PlatformDataSource) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -2768,19 +2964,7 @@ public PlatformDataSource parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new PlatformDataSource(input, extensionRegistry);
           }
         };
 
@@ -3364,7 +3548,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       output.writeMessage(
           9, (com.google.apps.card.v1.SelectionInput.PlatformDataSource) multiSelectDataSource_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -3406,7 +3590,7 @@ public int getSerializedSize() {
               9,
               (com.google.apps.card.v1.SelectionInput.PlatformDataSource) multiSelectDataSource_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -3445,7 +3629,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -3488,7 +3672,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -3632,10 +3816,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.SelectionInput.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getItemsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -3649,11 +3842,10 @@ public Builder clear() {
 
       if (itemsBuilder_ == null) {
         items_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        items_ = null;
         itemsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       if (onChangeActionBuilder_ == null) {
         onChangeAction_ = null;
       } else {
@@ -3664,12 +3856,6 @@ public Builder clear() {
       bitField0_ = (bitField0_ & ~0x00000002);
       multiSelectMinQueryLength_ = 0;
 
-      if (externalDataSourceBuilder_ != null) {
-        externalDataSourceBuilder_.clear();
-      }
-      if (platformDataSourceBuilder_ != null) {
-        platformDataSourceBuilder_.clear();
-      }
       multiSelectDataSourceCase_ = 0;
       multiSelectDataSource_ = null;
       return this;
@@ -3851,7 +4037,7 @@ public Builder mergeFrom(com.google.apps.card.v1.SelectionInput other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -3866,95 +4052,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.SelectionInput parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                label_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 24:
-              {
-                type_ = input.readEnum();
-
-                break;
-              } // case 24
-            case 34:
-              {
-                com.google.apps.card.v1.SelectionInput.SelectionItem m =
-                    input.readMessage(
-                        com.google.apps.card.v1.SelectionInput.SelectionItem.parser(),
-                        extensionRegistry);
-                if (itemsBuilder_ == null) {
-                  ensureItemsIsMutable();
-                  items_.add(m);
-                } else {
-                  itemsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 34
-            case 42:
-              {
-                input.readMessage(getOnChangeActionFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 42
-            case 48:
-              {
-                multiSelectMaxSelectedItems_ = input.readInt32();
-                bitField0_ |= 0x00000002;
-                break;
-              } // case 48
-            case 56:
-              {
-                multiSelectMinQueryLength_ = input.readInt32();
-
-                break;
-              } // case 56
-            case 66:
-              {
-                input.readMessage(
-                    getExternalDataSourceFieldBuilder().getBuilder(), extensionRegistry);
-                multiSelectDataSourceCase_ = 8;
-                break;
-              } // case 66
-            case 74:
-              {
-                input.readMessage(
-                    getPlatformDataSourceFieldBuilder().getBuilder(), extensionRegistry);
-                multiSelectDataSourceCase_ = 9;
-                break;
-              } // case 74
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.SelectionInput) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -5580,18 +5688,7 @@ public SelectionInput parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new SelectionInput(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Suggestions.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Suggestions.java
index 80fbdc46ae..4784fbb916 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Suggestions.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Suggestions.java
@@ -66,6 +66,62 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Suggestions(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                items_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              items_.add(
+                  input.readMessage(
+                      com.google.apps.card.v1.Suggestions.SuggestionItem.parser(),
+                      extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        items_ = java.util.Collections.unmodifiableList(items_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_Suggestions_descriptor;
@@ -166,6 +222,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private SuggestionItem(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+                contentCase_ = 1;
+                content_ = s;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.apps.card.v1.CardProto
           .internal_static_google_apps_card_v1_Suggestions_SuggestionItem_descriptor;
@@ -319,7 +421,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (contentCase_ == 1) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, content_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -331,7 +433,7 @@ public int getSerializedSize() {
       if (contentCase_ == 1) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, content_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -355,7 +457,7 @@ public boolean equals(final java.lang.Object obj) {
         case 0:
         default:
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -374,7 +476,7 @@ public int hashCode() {
         case 0:
         default:
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -508,10 +610,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.apps.card.v1.Suggestions.SuggestionItem.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -615,7 +724,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Suggestions.SuggestionItem othe
               break;
             }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -630,38 +739,18 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.apps.card.v1.Suggestions.SuggestionItem parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  java.lang.String s = input.readStringRequireUtf8();
-                  contentCase_ = 1;
-                  content_ = s;
-                  break;
-                } // case 10
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.apps.card.v1.Suggestions.SuggestionItem) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -857,19 +946,7 @@ public SuggestionItem parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new SuggestionItem(input, extensionRegistry);
           }
         };
 
@@ -984,7 +1061,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < items_.size(); i++) {
       output.writeMessage(1, items_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -996,7 +1073,7 @@ public int getSerializedSize() {
     for (int i = 0; i < items_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, items_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1012,7 +1089,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.apps.card.v1.Suggestions other = (com.google.apps.card.v1.Suggestions) obj;
 
     if (!getItemsList().equals(other.getItemsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1027,7 +1104,7 @@ public int hashCode() {
       hash = (37 * hash) + ITEMS_FIELD_NUMBER;
       hash = (53 * hash) + getItemsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1169,10 +1246,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Suggestions.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getItemsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -1180,11 +1266,10 @@ public Builder clear() {
       super.clear();
       if (itemsBuilder_ == null) {
         items_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        items_ = null;
         itemsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -1297,7 +1382,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Suggestions other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1312,45 +1397,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.Suggestions parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.apps.card.v1.Suggestions.SuggestionItem m =
-                    input.readMessage(
-                        com.google.apps.card.v1.Suggestions.SuggestionItem.parser(),
-                        extensionRegistry);
-                if (itemsBuilder_ == null) {
-                  ensureItemsIsMutable();
-                  items_.add(m);
-                } else {
-                  itemsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.Suggestions) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1776,18 +1833,7 @@ public Suggestions parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Suggestions(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextInput.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextInput.java
index 1f21a4f979..a4d1e414dc 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextInput.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextInput.java
@@ -72,6 +72,148 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private TextInput(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              label_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              hintText_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              value_ = s;
+              break;
+            }
+          case 40:
+            {
+              int rawValue = input.readEnum();
+
+              type_ = rawValue;
+              break;
+            }
+          case 50:
+            {
+              com.google.apps.card.v1.Action.Builder subBuilder = null;
+              if (onChangeAction_ != null) {
+                subBuilder = onChangeAction_.toBuilder();
+              }
+              onChangeAction_ =
+                  input.readMessage(com.google.apps.card.v1.Action.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(onChangeAction_);
+                onChangeAction_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 58:
+            {
+              com.google.apps.card.v1.Suggestions.Builder subBuilder = null;
+              if (initialSuggestions_ != null) {
+                subBuilder = initialSuggestions_.toBuilder();
+              }
+              initialSuggestions_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.Suggestions.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(initialSuggestions_);
+                initialSuggestions_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 66:
+            {
+              com.google.apps.card.v1.Action.Builder subBuilder = null;
+              if (autoCompleteAction_ != null) {
+                subBuilder = autoCompleteAction_.toBuilder();
+              }
+              autoCompleteAction_ =
+                  input.readMessage(com.google.apps.card.v1.Action.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(autoCompleteAction_);
+                autoCompleteAction_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 90:
+            {
+              com.google.apps.card.v1.Validation.Builder subBuilder = null;
+              if (validation_ != null) {
+                subBuilder = validation_.toBuilder();
+              }
+              validation_ =
+                  input.readMessage(com.google.apps.card.v1.Validation.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(validation_);
+                validation_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 98:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              placeholderText_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_TextInput_descriptor;
@@ -875,7 +1017,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(placeholderText_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 12, placeholderText_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -914,7 +1056,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(placeholderText_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, placeholderText_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -951,7 +1093,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getValidation().equals(other.getValidation())) return false;
     }
     if (!getPlaceholderText().equals(other.getPlaceholderText())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -990,7 +1132,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + PLACEHOLDER_TEXT_FIELD_NUMBER;
     hash = (53 * hash) + getPlaceholderText().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1133,10 +1275,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.TextInput.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1314,7 +1463,7 @@ public Builder mergeFrom(com.google.apps.card.v1.TextInput other) {
         placeholderText_ = other.placeholderText_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1329,93 +1478,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.TextInput parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                label_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                hintText_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                value_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            case 40:
-              {
-                type_ = input.readEnum();
-
-                break;
-              } // case 40
-            case 50:
-              {
-                input.readMessage(getOnChangeActionFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 50
-            case 58:
-              {
-                input.readMessage(
-                    getInitialSuggestionsFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 58
-            case 66:
-              {
-                input.readMessage(
-                    getAutoCompleteActionFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 66
-            case 90:
-              {
-                input.readMessage(getValidationFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 90
-            case 98:
-              {
-                placeholderText_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 98
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.TextInput) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -3183,18 +3256,7 @@ public TextInput parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new TextInput(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextParagraph.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextParagraph.java
index 0782791c12..2feec12dd0 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextParagraph.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/TextParagraph.java
@@ -66,6 +66,64 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private TextParagraph(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              text_ = s;
+              break;
+            }
+          case 16:
+            {
+              maxLines_ = input.readInt32();
+              break;
+            }
+          case 32:
+            {
+              int rawValue = input.readEnum();
+
+              textSyntax_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_TextParagraph_descriptor;
@@ -381,7 +439,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         != com.google.apps.card.v1.TextParagraph.TextSyntax.TEXT_SYNTAX_UNSPECIFIED.getNumber()) {
       output.writeEnum(4, textSyntax_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -400,7 +458,7 @@ public int getSerializedSize() {
         != com.google.apps.card.v1.TextParagraph.TextSyntax.TEXT_SYNTAX_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(4, textSyntax_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -418,7 +476,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getText().equals(other.getText())) return false;
     if (getMaxLines() != other.getMaxLines()) return false;
     if (textSyntax_ != other.textSyntax_) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -435,7 +493,7 @@ public int hashCode() {
     hash = (53 * hash) + getMaxLines();
     hash = (37 * hash) + TEXT_SYNTAX_FIELD_NUMBER;
     hash = (53 * hash) + textSyntax_;
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -576,10 +634,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.TextParagraph.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -680,7 +745,7 @@ public Builder mergeFrom(com.google.apps.card.v1.TextParagraph other) {
       if (other.textSyntax_ != 0) {
         setTextSyntaxValue(other.getTextSyntaxValue());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -695,49 +760,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.TextParagraph parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                text_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                maxLines_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 32:
-              {
-                textSyntax_ = input.readEnum();
-
-                break;
-              } // case 32
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.TextParagraph) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1060,18 +1093,7 @@ public TextParagraph parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new TextParagraph(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Validation.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Validation.java
index e88b4b5d53..b6a1a67790 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Validation.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Validation.java
@@ -55,6 +55,57 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Validation(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              characterLimit_ = input.readInt32();
+              break;
+            }
+          case 16:
+            {
+              int rawValue = input.readEnum();
+
+              inputType_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto
         .internal_static_google_apps_card_v1_Validation_descriptor;
@@ -383,7 +434,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         != com.google.apps.card.v1.Validation.InputType.INPUT_TYPE_UNSPECIFIED.getNumber()) {
       output.writeEnum(2, inputType_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -399,7 +450,7 @@ public int getSerializedSize() {
         != com.google.apps.card.v1.Validation.InputType.INPUT_TYPE_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, inputType_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -416,7 +467,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (getCharacterLimit() != other.getCharacterLimit()) return false;
     if (inputType_ != other.inputType_) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -431,7 +482,7 @@ public int hashCode() {
     hash = (53 * hash) + getCharacterLimit();
     hash = (37 * hash) + INPUT_TYPE_FIELD_NUMBER;
     hash = (53 * hash) + inputType_;
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -562,10 +613,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Validation.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -658,7 +716,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Validation other) {
       if (other.inputType_ != 0) {
         setInputTypeValue(other.getInputTypeValue());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -673,43 +731,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.Validation parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                characterLimit_ = input.readInt32();
-
-                break;
-              } // case 8
-            case 16:
-              {
-                inputType_ = input.readEnum();
-
-                break;
-              } // case 16
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.Validation) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -915,18 +947,7 @@ public Validation parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Validation(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Widget.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Widget.java
index b2de553629..2a038f2efc 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Widget.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/apps/card/v1/Widget.java
@@ -55,6 +55,234 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Widget(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.apps.card.v1.TextParagraph.Builder subBuilder = null;
+              if (dataCase_ == 1) {
+                subBuilder = ((com.google.apps.card.v1.TextParagraph) data_).toBuilder();
+              }
+              data_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.TextParagraph.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.TextParagraph) data_);
+                data_ = subBuilder.buildPartial();
+              }
+              dataCase_ = 1;
+              break;
+            }
+          case 18:
+            {
+              com.google.apps.card.v1.Image.Builder subBuilder = null;
+              if (dataCase_ == 2) {
+                subBuilder = ((com.google.apps.card.v1.Image) data_).toBuilder();
+              }
+              data_ = input.readMessage(com.google.apps.card.v1.Image.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.Image) data_);
+                data_ = subBuilder.buildPartial();
+              }
+              dataCase_ = 2;
+              break;
+            }
+          case 26:
+            {
+              com.google.apps.card.v1.DecoratedText.Builder subBuilder = null;
+              if (dataCase_ == 3) {
+                subBuilder = ((com.google.apps.card.v1.DecoratedText) data_).toBuilder();
+              }
+              data_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.DecoratedText.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.DecoratedText) data_);
+                data_ = subBuilder.buildPartial();
+              }
+              dataCase_ = 3;
+              break;
+            }
+          case 34:
+            {
+              com.google.apps.card.v1.ButtonList.Builder subBuilder = null;
+              if (dataCase_ == 4) {
+                subBuilder = ((com.google.apps.card.v1.ButtonList) data_).toBuilder();
+              }
+              data_ =
+                  input.readMessage(com.google.apps.card.v1.ButtonList.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.ButtonList) data_);
+                data_ = subBuilder.buildPartial();
+              }
+              dataCase_ = 4;
+              break;
+            }
+          case 42:
+            {
+              com.google.apps.card.v1.TextInput.Builder subBuilder = null;
+              if (dataCase_ == 5) {
+                subBuilder = ((com.google.apps.card.v1.TextInput) data_).toBuilder();
+              }
+              data_ =
+                  input.readMessage(com.google.apps.card.v1.TextInput.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.TextInput) data_);
+                data_ = subBuilder.buildPartial();
+              }
+              dataCase_ = 5;
+              break;
+            }
+          case 50:
+            {
+              com.google.apps.card.v1.SelectionInput.Builder subBuilder = null;
+              if (dataCase_ == 6) {
+                subBuilder = ((com.google.apps.card.v1.SelectionInput) data_).toBuilder();
+              }
+              data_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.SelectionInput.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.SelectionInput) data_);
+                data_ = subBuilder.buildPartial();
+              }
+              dataCase_ = 6;
+              break;
+            }
+          case 58:
+            {
+              com.google.apps.card.v1.DateTimePicker.Builder subBuilder = null;
+              if (dataCase_ == 7) {
+                subBuilder = ((com.google.apps.card.v1.DateTimePicker) data_).toBuilder();
+              }
+              data_ =
+                  input.readMessage(
+                      com.google.apps.card.v1.DateTimePicker.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.DateTimePicker) data_);
+                data_ = subBuilder.buildPartial();
+              }
+              dataCase_ = 7;
+              break;
+            }
+          case 64:
+            {
+              int rawValue = input.readEnum();
+
+              horizontalAlignment_ = rawValue;
+              break;
+            }
+          case 74:
+            {
+              com.google.apps.card.v1.Divider.Builder subBuilder = null;
+              if (dataCase_ == 9) {
+                subBuilder = ((com.google.apps.card.v1.Divider) data_).toBuilder();
+              }
+              data_ =
+                  input.readMessage(com.google.apps.card.v1.Divider.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.Divider) data_);
+                data_ = subBuilder.buildPartial();
+              }
+              dataCase_ = 9;
+              break;
+            }
+          case 82:
+            {
+              com.google.apps.card.v1.Grid.Builder subBuilder = null;
+              if (dataCase_ == 10) {
+                subBuilder = ((com.google.apps.card.v1.Grid) data_).toBuilder();
+              }
+              data_ = input.readMessage(com.google.apps.card.v1.Grid.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.Grid) data_);
+                data_ = subBuilder.buildPartial();
+              }
+              dataCase_ = 10;
+              break;
+            }
+          case 90:
+            {
+              com.google.apps.card.v1.Columns.Builder subBuilder = null;
+              if (dataCase_ == 11) {
+                subBuilder = ((com.google.apps.card.v1.Columns) data_).toBuilder();
+              }
+              data_ =
+                  input.readMessage(com.google.apps.card.v1.Columns.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.Columns) data_);
+                data_ = subBuilder.buildPartial();
+              }
+              dataCase_ = 11;
+              break;
+            }
+          case 106:
+            {
+              com.google.apps.card.v1.Carousel.Builder subBuilder = null;
+              if (dataCase_ == 13) {
+                subBuilder = ((com.google.apps.card.v1.Carousel) data_).toBuilder();
+              }
+              data_ =
+                  input.readMessage(com.google.apps.card.v1.Carousel.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.Carousel) data_);
+                data_ = subBuilder.buildPartial();
+              }
+              dataCase_ = 13;
+              break;
+            }
+          case 114:
+            {
+              com.google.apps.card.v1.ChipList.Builder subBuilder = null;
+              if (dataCase_ == 14) {
+                subBuilder = ((com.google.apps.card.v1.ChipList) data_).toBuilder();
+              }
+              data_ =
+                  input.readMessage(com.google.apps.card.v1.ChipList.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.apps.card.v1.ChipList) data_);
+                data_ = subBuilder.buildPartial();
+              }
+              dataCase_ = 14;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.apps.card.v1.CardProto.internal_static_google_apps_card_v1_Widget_descriptor;
   }
@@ -2187,7 +2415,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (dataCase_ == 14) {
       output.writeMessage(14, (com.google.apps.card.v1.ChipList) data_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -2261,7 +2489,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               14, (com.google.apps.card.v1.ChipList) data_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -2318,7 +2546,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -2383,7 +2611,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -2513,51 +2741,22 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.apps.card.v1.Widget.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (textParagraphBuilder_ != null) {
-        textParagraphBuilder_.clear();
-      }
-      if (imageBuilder_ != null) {
-        imageBuilder_.clear();
-      }
-      if (decoratedTextBuilder_ != null) {
-        decoratedTextBuilder_.clear();
-      }
-      if (buttonListBuilder_ != null) {
-        buttonListBuilder_.clear();
-      }
-      if (textInputBuilder_ != null) {
-        textInputBuilder_.clear();
-      }
-      if (selectionInputBuilder_ != null) {
-        selectionInputBuilder_.clear();
-      }
-      if (dateTimePickerBuilder_ != null) {
-        dateTimePickerBuilder_.clear();
-      }
-      if (dividerBuilder_ != null) {
-        dividerBuilder_.clear();
-      }
-      if (gridBuilder_ != null) {
-        gridBuilder_.clear();
-      }
-      if (columnsBuilder_ != null) {
-        columnsBuilder_.clear();
-      }
-      if (carouselBuilder_ != null) {
-        carouselBuilder_.clear();
-      }
-      if (chipListBuilder_ != null) {
-        chipListBuilder_.clear();
-      }
       horizontalAlignment_ = 0;
 
       dataCase_ = 0;
@@ -2792,7 +2991,7 @@ public Builder mergeFrom(com.google.apps.card.v1.Widget other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2807,109 +3006,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.apps.card.v1.Widget parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getTextParagraphFieldBuilder().getBuilder(), extensionRegistry);
-                dataCase_ = 1;
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getImageFieldBuilder().getBuilder(), extensionRegistry);
-                dataCase_ = 2;
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(getDecoratedTextFieldBuilder().getBuilder(), extensionRegistry);
-                dataCase_ = 3;
-                break;
-              } // case 26
-            case 34:
-              {
-                input.readMessage(getButtonListFieldBuilder().getBuilder(), extensionRegistry);
-                dataCase_ = 4;
-                break;
-              } // case 34
-            case 42:
-              {
-                input.readMessage(getTextInputFieldBuilder().getBuilder(), extensionRegistry);
-                dataCase_ = 5;
-                break;
-              } // case 42
-            case 50:
-              {
-                input.readMessage(getSelectionInputFieldBuilder().getBuilder(), extensionRegistry);
-                dataCase_ = 6;
-                break;
-              } // case 50
-            case 58:
-              {
-                input.readMessage(getDateTimePickerFieldBuilder().getBuilder(), extensionRegistry);
-                dataCase_ = 7;
-                break;
-              } // case 58
-            case 64:
-              {
-                horizontalAlignment_ = input.readEnum();
-
-                break;
-              } // case 64
-            case 74:
-              {
-                input.readMessage(getDividerFieldBuilder().getBuilder(), extensionRegistry);
-                dataCase_ = 9;
-                break;
-              } // case 74
-            case 82:
-              {
-                input.readMessage(getGridFieldBuilder().getBuilder(), extensionRegistry);
-                dataCase_ = 10;
-                break;
-              } // case 82
-            case 90:
-              {
-                input.readMessage(getColumnsFieldBuilder().getBuilder(), extensionRegistry);
-                dataCase_ = 11;
-                break;
-              } // case 90
-            case 106:
-              {
-                input.readMessage(getCarouselFieldBuilder().getBuilder(), extensionRegistry);
-                dataCase_ = 13;
-                break;
-              } // case 106
-            case 114:
-              {
-                input.readMessage(getChipListFieldBuilder().getBuilder(), extensionRegistry);
-                dataCase_ = 14;
-                break;
-              } // case 114
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.apps.card.v1.Widget) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -7967,18 +8074,7 @@ public Widget parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Widget(input, extensionRegistry);
         }
       };
 
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 d7eaf47d39..5d89519f8f 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
@@ -56,6 +56,236 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private AuditLog(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 18:
+            {
+              com.google.rpc.Status.Builder subBuilder = null;
+              if (status_ != null) {
+                subBuilder = status_.toBuilder();
+              }
+              status_ = input.readMessage(com.google.rpc.Status.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(status_);
+                status_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 26:
+            {
+              com.google.cloud.audit.AuthenticationInfo.Builder subBuilder = null;
+              if (authenticationInfo_ != null) {
+                subBuilder = authenticationInfo_.toBuilder();
+              }
+              authenticationInfo_ =
+                  input.readMessage(
+                      com.google.cloud.audit.AuthenticationInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(authenticationInfo_);
+                authenticationInfo_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 34:
+            {
+              com.google.cloud.audit.RequestMetadata.Builder subBuilder = null;
+              if (requestMetadata_ != null) {
+                subBuilder = requestMetadata_.toBuilder();
+              }
+              requestMetadata_ =
+                  input.readMessage(
+                      com.google.cloud.audit.RequestMetadata.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(requestMetadata_);
+                requestMetadata_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 58:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              serviceName_ = s;
+              break;
+            }
+          case 66:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              methodName_ = s;
+              break;
+            }
+          case 74:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                authorizationInfo_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              authorizationInfo_.add(
+                  input.readMessage(
+                      com.google.cloud.audit.AuthorizationInfo.parser(), extensionRegistry));
+              break;
+            }
+          case 90:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              resourceName_ = s;
+              break;
+            }
+          case 96:
+            {
+              numResponseItems_ = input.readInt64();
+              break;
+            }
+          case 122:
+            {
+              com.google.protobuf.Any.Builder subBuilder = null;
+              if (serviceData_ != null) {
+                subBuilder = serviceData_.toBuilder();
+              }
+              serviceData_ = input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(serviceData_);
+                serviceData_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 130:
+            {
+              com.google.protobuf.Struct.Builder subBuilder = null;
+              if (request_ != null) {
+                subBuilder = request_.toBuilder();
+              }
+              request_ = input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(request_);
+                request_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 138:
+            {
+              com.google.protobuf.Struct.Builder subBuilder = null;
+              if (response_ != null) {
+                subBuilder = response_.toBuilder();
+              }
+              response_ = input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(response_);
+                response_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 146:
+            {
+              com.google.protobuf.Struct.Builder subBuilder = null;
+              if (metadata_ != null) {
+                subBuilder = metadata_.toBuilder();
+              }
+              metadata_ = input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(metadata_);
+                metadata_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 154:
+            {
+              com.google.protobuf.Struct.Builder subBuilder = null;
+              if (resourceOriginalState_ != null) {
+                subBuilder = resourceOriginalState_.toBuilder();
+              }
+              resourceOriginalState_ =
+                  input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(resourceOriginalState_);
+                resourceOriginalState_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 162:
+            {
+              com.google.cloud.audit.ResourceLocation.Builder subBuilder = null;
+              if (resourceLocation_ != null) {
+                subBuilder = resourceLocation_.toBuilder();
+              }
+              resourceLocation_ =
+                  input.readMessage(
+                      com.google.cloud.audit.ResourceLocation.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(resourceLocation_);
+                resourceLocation_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 202:
+            {
+              com.google.cloud.audit.PolicyViolationInfo.Builder subBuilder = null;
+              if (policyViolationInfo_ != null) {
+                subBuilder = policyViolationInfo_.toBuilder();
+              }
+              policyViolationInfo_ =
+                  input.readMessage(
+                      com.google.cloud.audit.PolicyViolationInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(policyViolationInfo_);
+                policyViolationInfo_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        authorizationInfo_ = java.util.Collections.unmodifiableList(authorizationInfo_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_AuditLog_descriptor;
@@ -975,7 +1205,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (policyViolationInfo_ != null) {
       output.writeMessage(25, getPolicyViolationInfo());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1032,7 +1262,7 @@ public int getSerializedSize() {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(25, getPolicyViolationInfo());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1092,7 +1322,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasServiceData()) {
       if (!getServiceData().equals(other.getServiceData())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1155,7 +1385,7 @@ public int hashCode() {
       hash = (37 * hash) + SERVICE_DATA_FIELD_NUMBER;
       hash = (53 * hash) + getServiceData().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1283,10 +1513,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.cloud.audit.AuditLog.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getAuthorizationInfoFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -1326,11 +1565,10 @@ public Builder clear() {
       }
       if (authorizationInfoBuilder_ == null) {
         authorizationInfo_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        authorizationInfo_ = null;
         authorizationInfoBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       if (policyViolationInfoBuilder_ == null) {
         policyViolationInfo_ = null;
       } else {
@@ -1578,7 +1816,7 @@ public Builder mergeFrom(com.google.cloud.audit.AuditLog other) {
       if (other.hasServiceData()) {
         mergeServiceData(other.getServiceData());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1593,132 +1831,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.cloud.audit.AuditLog parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 18:
-              {
-                input.readMessage(getStatusFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(
-                    getAuthenticationInfoFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            case 34:
-              {
-                input.readMessage(getRequestMetadataFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 34
-            case 58:
-              {
-                serviceName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 58
-            case 66:
-              {
-                methodName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 66
-            case 74:
-              {
-                com.google.cloud.audit.AuthorizationInfo m =
-                    input.readMessage(
-                        com.google.cloud.audit.AuthorizationInfo.parser(), extensionRegistry);
-                if (authorizationInfoBuilder_ == null) {
-                  ensureAuthorizationInfoIsMutable();
-                  authorizationInfo_.add(m);
-                } else {
-                  authorizationInfoBuilder_.addMessage(m);
-                }
-                break;
-              } // case 74
-            case 90:
-              {
-                resourceName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 90
-            case 96:
-              {
-                numResponseItems_ = input.readInt64();
-
-                break;
-              } // case 96
-            case 122:
-              {
-                input.readMessage(getServiceDataFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 122
-            case 130:
-              {
-                input.readMessage(getRequestFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 130
-            case 138:
-              {
-                input.readMessage(getResponseFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 138
-            case 146:
-              {
-                input.readMessage(getMetadataFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 146
-            case 154:
-              {
-                input.readMessage(
-                    getResourceOriginalStateFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 154
-            case 162:
-              {
-                input.readMessage(
-                    getResourceLocationFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 162
-            case 202:
-              {
-                input.readMessage(
-                    getPolicyViolationInfoFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 202
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.audit.AuditLog) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -4709,18 +4832,7 @@ public AuditLog parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new AuditLog(input, extensionRegistry);
         }
       };
 
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 75a97dd87f..a265ca0191 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
@@ -57,6 +57,106 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private AuthenticationInfo(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              principalEmail_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              authoritySelector_ = s;
+              break;
+            }
+          case 34:
+            {
+              com.google.protobuf.Struct.Builder subBuilder = null;
+              if (thirdPartyPrincipal_ != null) {
+                subBuilder = thirdPartyPrincipal_.toBuilder();
+              }
+              thirdPartyPrincipal_ =
+                  input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(thirdPartyPrincipal_);
+                thirdPartyPrincipal_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              serviceAccountKeyName_ = s;
+              break;
+            }
+          case 50:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                serviceAccountDelegationInfo_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              serviceAccountDelegationInfo_.add(
+                  input.readMessage(
+                      com.google.cloud.audit.ServiceAccountDelegationInfo.parser(),
+                      extensionRegistry));
+              break;
+            }
+          case 66:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              principalSubject_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        serviceAccountDelegationInfo_ =
+            java.util.Collections.unmodifiableList(serviceAccountDelegationInfo_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_AuthenticationInfo_descriptor;
@@ -496,7 +596,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(principalSubject_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, principalSubject_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -525,7 +625,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(principalSubject_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, principalSubject_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -551,7 +651,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getServiceAccountDelegationInfoList().equals(other.getServiceAccountDelegationInfoList()))
       return false;
     if (!getPrincipalSubject().equals(other.getPrincipalSubject())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -578,7 +678,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + PRINCIPAL_SUBJECT_FIELD_NUMBER;
     hash = (53 * hash) + getPrincipalSubject().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -708,10 +808,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.cloud.audit.AuthenticationInfo.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getServiceAccountDelegationInfoFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -731,11 +840,10 @@ public Builder clear() {
 
       if (serviceAccountDelegationInfoBuilder_ == null) {
         serviceAccountDelegationInfo_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        serviceAccountDelegationInfo_ = null;
         serviceAccountDelegationInfoBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       principalSubject_ = "";
 
       return this;
@@ -881,7 +989,7 @@ public Builder mergeFrom(com.google.cloud.audit.AuthenticationInfo other) {
         principalSubject_ = other.principalSubject_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -896,76 +1004,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.cloud.audit.AuthenticationInfo parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                principalEmail_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                authoritySelector_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 34:
-              {
-                input.readMessage(
-                    getThirdPartyPrincipalFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 34
-            case 42:
-              {
-                serviceAccountKeyName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 42
-            case 50:
-              {
-                com.google.cloud.audit.ServiceAccountDelegationInfo m =
-                    input.readMessage(
-                        com.google.cloud.audit.ServiceAccountDelegationInfo.parser(),
-                        extensionRegistry);
-                if (serviceAccountDelegationInfoBuilder_ == null) {
-                  ensureServiceAccountDelegationInfoIsMutable();
-                  serviceAccountDelegationInfo_.add(m);
-                } else {
-                  serviceAccountDelegationInfoBuilder_.addMessage(m);
-                }
-                break;
-              } // case 50
-            case 66:
-              {
-                principalSubject_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 66
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.audit.AuthenticationInfo) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2209,18 +2258,7 @@ public AuthenticationInfo parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new AuthenticationInfo(input, extensionRegistry);
         }
       };
 
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 350404d7f4..5c45bd20d0 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
@@ -55,6 +55,87 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private AuthorizationInfo(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              resource_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              permission_ = s;
+              break;
+            }
+          case 24:
+            {
+              granted_ = input.readBool();
+              break;
+            }
+          case 42:
+            {
+              com.google.rpc.context.AttributeContext.Resource.Builder subBuilder = null;
+              if (resourceAttributes_ != null) {
+                subBuilder = resourceAttributes_.toBuilder();
+              }
+              resourceAttributes_ =
+                  input.readMessage(
+                      com.google.rpc.context.AttributeContext.Resource.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(resourceAttributes_);
+                resourceAttributes_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 56:
+            {
+              int rawValue = input.readEnum();
+
+              permissionType_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_AuthorizationInfo_descriptor;
@@ -544,7 +625,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
             .getNumber()) {
       output.writeEnum(7, permissionType_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -570,7 +651,7 @@ public int getSerializedSize() {
             .getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(7, permissionType_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -593,7 +674,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getResourceAttributes().equals(other.getResourceAttributes())) return false;
     }
     if (permissionType_ != other.permissionType_) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -616,7 +697,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + PERMISSION_TYPE_FIELD_NUMBER;
     hash = (53 * hash) + permissionType_;
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -746,10 +827,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.cloud.audit.AuthorizationInfo.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -871,7 +959,7 @@ public Builder mergeFrom(com.google.cloud.audit.AuthorizationInfo other) {
       if (other.permissionType_ != 0) {
         setPermissionTypeValue(other.getPermissionTypeValue());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -886,62 +974,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.cloud.audit.AuthorizationInfo parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                resource_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                permission_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 24:
-              {
-                granted_ = input.readBool();
-
-                break;
-              } // case 24
-            case 42:
-              {
-                input.readMessage(
-                    getResourceAttributesFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 42
-            case 56:
-              {
-                permissionType_ = input.readEnum();
-
-                break;
-              } // case 56
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.audit.AuthorizationInfo) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1618,18 +1661,7 @@ public AuthorizationInfo parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new AuthorizationInfo(input, extensionRegistry);
         }
       };
 
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 ed20390b81..36fd0842b8 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
@@ -54,6 +54,96 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private OrgPolicyViolationInfo(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.protobuf.Struct.Builder subBuilder = null;
+              if (payload_ != null) {
+                subBuilder = payload_.toBuilder();
+              }
+              payload_ = input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(payload_);
+                payload_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              resourceType_ = s;
+              break;
+            }
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                resourceTags_ =
+                    com.google.protobuf.MapField.newMapField(
+                        ResourceTagsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry resourceTags__ =
+                  input.readMessage(
+                      ResourceTagsDefaultEntryHolder.defaultEntry.getParserForType(),
+                      extensionRegistry);
+              resourceTags_.getMutableMap().put(resourceTags__.getKey(), resourceTags__.getValue());
+              break;
+            }
+          case 34:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                violationInfo_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              violationInfo_.add(
+                  input.readMessage(
+                      com.google.cloud.audit.ViolationInfo.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        violationInfo_ = java.util.Collections.unmodifiableList(violationInfo_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_OrgPolicyViolationInfo_descriptor;
@@ -427,7 +517,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < violationInfo_.size(); i++) {
       output.writeMessage(4, violationInfo_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -455,7 +545,7 @@ public int getSerializedSize() {
     for (int i = 0; i < violationInfo_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, violationInfo_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -478,7 +568,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getResourceType().equals(other.getResourceType())) return false;
     if (!internalGetResourceTags().equals(other.internalGetResourceTags())) return false;
     if (!getViolationInfoList().equals(other.getViolationInfoList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -503,7 +593,7 @@ public int hashCode() {
       hash = (37 * hash) + VIOLATION_INFO_FIELD_NUMBER;
       hash = (53 * hash) + getViolationInfoList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -653,10 +743,19 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.cloud.audit.OrgPolicyViolationInfo.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getViolationInfoFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -673,11 +772,10 @@ public Builder clear() {
       internalGetMutableResourceTags().clear();
       if (violationInfoBuilder_ == null) {
         violationInfo_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
-        violationInfo_ = null;
         violationInfoBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -807,7 +905,7 @@ public Builder mergeFrom(com.google.cloud.audit.OrgPolicyViolationInfo other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -822,67 +920,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.cloud.audit.OrgPolicyViolationInfo parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getPayloadFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                resourceType_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                com.google.protobuf.MapEntry resourceTags__ =
-                    input.readMessage(
-                        ResourceTagsDefaultEntryHolder.defaultEntry.getParserForType(),
-                        extensionRegistry);
-                internalGetMutableResourceTags()
-                    .getMutableMap()
-                    .put(resourceTags__.getKey(), resourceTags__.getValue());
-                break;
-              } // case 26
-            case 34:
-              {
-                com.google.cloud.audit.ViolationInfo m =
-                    input.readMessage(
-                        com.google.cloud.audit.ViolationInfo.parser(), extensionRegistry);
-                if (violationInfoBuilder_ == null) {
-                  ensureViolationInfoIsMutable();
-                  violationInfo_.add(m);
-                } else {
-                  violationInfoBuilder_.addMessage(m);
-                }
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.audit.OrgPolicyViolationInfo) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1860,18 +1908,7 @@ public OrgPolicyViolationInfo parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new OrgPolicyViolationInfo(input, extensionRegistry);
         }
       };
 
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 07bc1a2b1e..b9f569f772 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
@@ -51,6 +51,61 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PolicyViolationInfo(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.cloud.audit.OrgPolicyViolationInfo.Builder subBuilder = null;
+              if (orgPolicyViolationInfo_ != null) {
+                subBuilder = orgPolicyViolationInfo_.toBuilder();
+              }
+              orgPolicyViolationInfo_ =
+                  input.readMessage(
+                      com.google.cloud.audit.OrgPolicyViolationInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(orgPolicyViolationInfo_);
+                orgPolicyViolationInfo_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_PolicyViolationInfo_descriptor;
@@ -135,7 +190,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (orgPolicyViolationInfo_ != null) {
       output.writeMessage(1, getOrgPolicyViolationInfo());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -148,7 +203,7 @@ public int getSerializedSize() {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(1, getOrgPolicyViolationInfo());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -168,7 +223,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasOrgPolicyViolationInfo()) {
       if (!getOrgPolicyViolationInfo().equals(other.getOrgPolicyViolationInfo())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -183,7 +238,7 @@ public int hashCode() {
       hash = (37 * hash) + ORG_POLICY_VIOLATION_INFO_FIELD_NUMBER;
       hash = (53 * hash) + getOrgPolicyViolationInfo().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -313,10 +368,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.cloud.audit.PolicyViolationInfo.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -412,7 +474,7 @@ public Builder mergeFrom(com.google.cloud.audit.PolicyViolationInfo other) {
       if (other.hasOrgPolicyViolationInfo()) {
         mergeOrgPolicyViolationInfo(other.getOrgPolicyViolationInfo());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -427,38 +489,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.cloud.audit.PolicyViolationInfo parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(
-                    getOrgPolicyViolationInfoFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.audit.PolicyViolationInfo) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -692,18 +733,7 @@ public PolicyViolationInfo parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PolicyViolationInfo(input, extensionRegistry);
         }
       };
 
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 b4804b7534..a110c79889 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
@@ -55,6 +55,98 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private RequestMetadata(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              callerIp_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              callerSuppliedUserAgent_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              callerNetwork_ = s;
+              break;
+            }
+          case 58:
+            {
+              com.google.rpc.context.AttributeContext.Request.Builder subBuilder = null;
+              if (requestAttributes_ != null) {
+                subBuilder = requestAttributes_.toBuilder();
+              }
+              requestAttributes_ =
+                  input.readMessage(
+                      com.google.rpc.context.AttributeContext.Request.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(requestAttributes_);
+                requestAttributes_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 66:
+            {
+              com.google.rpc.context.AttributeContext.Peer.Builder subBuilder = null;
+              if (destinationAttributes_ != null) {
+                subBuilder = destinationAttributes_.toBuilder();
+              }
+              destinationAttributes_ =
+                  input.readMessage(
+                      com.google.rpc.context.AttributeContext.Peer.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(destinationAttributes_);
+                destinationAttributes_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_RequestMetadata_descriptor;
@@ -429,7 +521,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (destinationAttributes_ != null) {
       output.writeMessage(8, getDestinationAttributes());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -454,7 +546,7 @@ public int getSerializedSize() {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(8, getDestinationAttributes());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -480,7 +572,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasDestinationAttributes()) {
       if (!getDestinationAttributes().equals(other.getDestinationAttributes())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -505,7 +597,7 @@ public int hashCode() {
       hash = (37 * hash) + DESTINATION_ATTRIBUTES_FIELD_NUMBER;
       hash = (53 * hash) + getDestinationAttributes().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -635,10 +727,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.cloud.audit.RequestMetadata.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -769,7 +868,7 @@ public Builder mergeFrom(com.google.cloud.audit.RequestMetadata other) {
       if (other.hasDestinationAttributes()) {
         mergeDestinationAttributes(other.getDestinationAttributes());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -784,63 +883,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.cloud.audit.RequestMetadata parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                callerIp_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                callerSuppliedUserAgent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                callerNetwork_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 58:
-              {
-                input.readMessage(
-                    getRequestAttributesFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 58
-            case 66:
-              {
-                input.readMessage(
-                    getDestinationAttributesFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 66
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.audit.RequestMetadata) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1802,18 +1855,7 @@ public RequestMetadata parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new RequestMetadata(input, extensionRegistry);
         }
       };
 
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 55197dd791..901efaf6f2 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
@@ -54,6 +54,72 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ResourceLocation(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                currentLocations_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              currentLocations_.add(s);
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                originalLocations_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              originalLocations_.add(s);
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        currentLocations_ = currentLocations_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        originalLocations_ = originalLocations_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_ResourceLocation_descriptor;
@@ -267,7 +333,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < originalLocations_.size(); i++) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, originalLocations_.getRaw(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -292,7 +358,7 @@ public int getSerializedSize() {
       size += dataSize;
       size += 1 * getOriginalLocationsList().size();
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -309,7 +375,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getCurrentLocationsList().equals(other.getCurrentLocationsList())) return false;
     if (!getOriginalLocationsList().equals(other.getOriginalLocationsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -328,7 +394,7 @@ public int hashCode() {
       hash = (37 * hash) + ORIGINAL_LOCATIONS_FIELD_NUMBER;
       hash = (53 * hash) + getOriginalLocationsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -458,10 +524,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.cloud.audit.ResourceLocation.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -578,7 +651,7 @@ public Builder mergeFrom(com.google.cloud.audit.ResourceLocation other) {
         }
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -593,45 +666,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.cloud.audit.ResourceLocation parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureCurrentLocationsIsMutable();
-                currentLocations_.add(s);
-                break;
-              } // case 10
-            case 18:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureOriginalLocationsIsMutable();
-                originalLocations_.add(s);
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.audit.ResourceLocation) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1131,18 +1176,7 @@ public ResourceLocation parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ResourceLocation(input, extensionRegistry);
         }
       };
 
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 2617754fa6..cdd9e9f479 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
@@ -53,6 +53,100 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ServiceAccountDelegationInfo(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.cloud.audit.ServiceAccountDelegationInfo.FirstPartyPrincipal.Builder
+                  subBuilder = null;
+              if (authorityCase_ == 1) {
+                subBuilder =
+                    ((com.google.cloud.audit.ServiceAccountDelegationInfo.FirstPartyPrincipal)
+                            authority_)
+                        .toBuilder();
+              }
+              authority_ =
+                  input.readMessage(
+                      com.google.cloud.audit.ServiceAccountDelegationInfo.FirstPartyPrincipal
+                          .parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(
+                    (com.google.cloud.audit.ServiceAccountDelegationInfo.FirstPartyPrincipal)
+                        authority_);
+                authority_ = subBuilder.buildPartial();
+              }
+              authorityCase_ = 1;
+              break;
+            }
+          case 18:
+            {
+              com.google.cloud.audit.ServiceAccountDelegationInfo.ThirdPartyPrincipal.Builder
+                  subBuilder = null;
+              if (authorityCase_ == 2) {
+                subBuilder =
+                    ((com.google.cloud.audit.ServiceAccountDelegationInfo.ThirdPartyPrincipal)
+                            authority_)
+                        .toBuilder();
+              }
+              authority_ =
+                  input.readMessage(
+                      com.google.cloud.audit.ServiceAccountDelegationInfo.ThirdPartyPrincipal
+                          .parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(
+                    (com.google.cloud.audit.ServiceAccountDelegationInfo.ThirdPartyPrincipal)
+                        authority_);
+                authority_ = subBuilder.buildPartial();
+              }
+              authorityCase_ = 2;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              principalSubject_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_ServiceAccountDelegationInfo_descriptor;
@@ -172,6 +266,67 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private FirstPartyPrincipal(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                principalEmail_ = s;
+                break;
+              }
+            case 18:
+              {
+                com.google.protobuf.Struct.Builder subBuilder = null;
+                if (serviceMetadata_ != null) {
+                  subBuilder = serviceMetadata_.toBuilder();
+                }
+                serviceMetadata_ =
+                    input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(serviceMetadata_);
+                  serviceMetadata_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.cloud.audit.AuditLogProto
           .internal_static_google_cloud_audit_ServiceAccountDelegationInfo_FirstPartyPrincipal_descriptor;
@@ -310,7 +465,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (serviceMetadata_ != null) {
         output.writeMessage(2, getServiceMetadata());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -325,7 +480,7 @@ public int getSerializedSize() {
       if (serviceMetadata_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getServiceMetadata());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -347,7 +502,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasServiceMetadata()) {
         if (!getServiceMetadata().equals(other.getServiceMetadata())) return false;
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -364,7 +519,7 @@ public int hashCode() {
         hash = (37 * hash) + SERVICE_METADATA_FIELD_NUMBER;
         hash = (53 * hash) + getServiceMetadata().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -500,10 +655,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
       // Construct using
       // com.google.cloud.audit.ServiceAccountDelegationInfo.FirstPartyPrincipal.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -617,7 +779,7 @@ public Builder mergeFrom(
         if (other.hasServiceMetadata()) {
           mergeServiceMetadata(other.getServiceMetadata());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -632,44 +794,20 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.cloud.audit.ServiceAccountDelegationInfo.FirstPartyPrincipal parsedMessage =
+            null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  principalEmail_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  input.readMessage(
-                      getServiceMetadataFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 18
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.cloud.audit.ServiceAccountDelegationInfo.FirstPartyPrincipal)
+                  e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1014,19 +1152,7 @@ public FirstPartyPrincipal parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new FirstPartyPrincipal(input, extensionRegistry);
           }
         };
 
@@ -1122,6 +1248,60 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private ThirdPartyPrincipal(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.protobuf.Struct.Builder subBuilder = null;
+                if (thirdPartyClaims_ != null) {
+                  subBuilder = thirdPartyClaims_.toBuilder();
+                }
+                thirdPartyClaims_ =
+                    input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(thirdPartyClaims_);
+                  thirdPartyClaims_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.cloud.audit.AuditLogProto
           .internal_static_google_cloud_audit_ServiceAccountDelegationInfo_ThirdPartyPrincipal_descriptor;
@@ -1206,7 +1386,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (thirdPartyClaims_ != null) {
         output.writeMessage(1, getThirdPartyClaims());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -1218,7 +1398,7 @@ public int getSerializedSize() {
       if (thirdPartyClaims_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getThirdPartyClaims());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1239,7 +1419,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasThirdPartyClaims()) {
         if (!getThirdPartyClaims().equals(other.getThirdPartyClaims())) return false;
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -1254,7 +1434,7 @@ public int hashCode() {
         hash = (37 * hash) + THIRD_PARTY_CLAIMS_FIELD_NUMBER;
         hash = (53 * hash) + getThirdPartyClaims().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1390,10 +1570,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
       // Construct using
       // com.google.cloud.audit.ServiceAccountDelegationInfo.ThirdPartyPrincipal.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -1500,7 +1687,7 @@ public Builder mergeFrom(
         if (other.hasThirdPartyClaims()) {
           mergeThirdPartyClaims(other.getThirdPartyClaims());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1515,38 +1702,20 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.cloud.audit.ServiceAccountDelegationInfo.ThirdPartyPrincipal parsedMessage =
+            null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  input.readMessage(
-                      getThirdPartyClaimsFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 10
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.cloud.audit.ServiceAccountDelegationInfo.ThirdPartyPrincipal)
+                  e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1780,19 +1949,7 @@ public ThirdPartyPrincipal parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new ThirdPartyPrincipal(input, extensionRegistry);
           }
         };
 
@@ -2074,7 +2231,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(principalSubject_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, principalSubject_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -2098,7 +2255,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(principalSubject_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, principalSubject_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -2126,7 +2283,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -2151,7 +2308,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -2281,10 +2438,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.cloud.audit.ServiceAccountDelegationInfo.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -2292,12 +2456,6 @@ public Builder clear() {
       super.clear();
       principalSubject_ = "";
 
-      if (firstPartyPrincipalBuilder_ != null) {
-        firstPartyPrincipalBuilder_.clear();
-      }
-      if (thirdPartyPrincipalBuilder_ != null) {
-        thirdPartyPrincipalBuilder_.clear();
-      }
       authorityCase_ = 0;
       authority_ = null;
       return this;
@@ -2413,7 +2571,7 @@ public Builder mergeFrom(com.google.cloud.audit.ServiceAccountDelegationInfo oth
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2428,51 +2586,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.cloud.audit.ServiceAccountDelegationInfo parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(
-                    getFirstPartyPrincipalFieldBuilder().getBuilder(), extensionRegistry);
-                authorityCase_ = 1;
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(
-                    getThirdPartyPrincipalFieldBuilder().getBuilder(), extensionRegistry);
-                authorityCase_ = 2;
-                break;
-              } // case 18
-            case 26:
-              {
-                principalSubject_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.cloud.audit.ServiceAccountDelegationInfo) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -3166,18 +3291,7 @@ public ServiceAccountDelegationInfo parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ServiceAccountDelegationInfo(input, extensionRegistry);
         }
       };
 
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 f5b1de9bf7..71bcd7f82a 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
@@ -56,6 +56,73 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ViolationInfo(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              constraint_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              errorMessage_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              checkedValue_ = s;
+              break;
+            }
+          case 32:
+            {
+              int rawValue = input.readEnum();
+
+              policyType_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.audit.AuditLogProto
         .internal_static_google_cloud_audit_ViolationInfo_descriptor;
@@ -479,7 +546,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         != com.google.cloud.audit.ViolationInfo.PolicyType.POLICY_TYPE_UNSPECIFIED.getNumber()) {
       output.writeEnum(4, policyType_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -501,7 +568,7 @@ public int getSerializedSize() {
         != com.google.cloud.audit.ViolationInfo.PolicyType.POLICY_TYPE_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(4, policyType_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -520,7 +587,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getErrorMessage().equals(other.getErrorMessage())) return false;
     if (!getCheckedValue().equals(other.getCheckedValue())) return false;
     if (policyType_ != other.policyType_) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -539,7 +606,7 @@ public int hashCode() {
     hash = (53 * hash) + getCheckedValue().hashCode();
     hash = (37 * hash) + POLICY_TYPE_FIELD_NUMBER;
     hash = (53 * hash) + policyType_;
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -668,10 +735,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.cloud.audit.ViolationInfo.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -779,7 +853,7 @@ public Builder mergeFrom(com.google.cloud.audit.ViolationInfo other) {
       if (other.policyType_ != 0) {
         setPolicyTypeValue(other.getPolicyTypeValue());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -794,55 +868,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.cloud.audit.ViolationInfo parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                constraint_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                errorMessage_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                checkedValue_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 32:
-              {
-                policyType_ = input.readEnum();
-
-                break;
-              } // case 32
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.audit.ViolationInfo) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1327,18 +1363,7 @@ public ViolationInfo parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ViolationInfo(input, extensionRegistry);
         }
       };
 
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 41bf5f8ea6..6add99766b 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
@@ -53,6 +53,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private GetLocationRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.location.LocationsProto
         .internal_static_google_cloud_location_GetLocationRequest_descriptor;
@@ -136,7 +182,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -148,7 +194,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -165,7 +211,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.cloud.location.GetLocationRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -178,7 +224,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -308,10 +354,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.cloud.location.GetLocationRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -400,7 +453,7 @@ public Builder mergeFrom(com.google.cloud.location.GetLocationRequest other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -415,37 +468,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.cloud.location.GetLocationRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.location.GetLocationRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -592,18 +625,7 @@ public GetLocationRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new GetLocationRequest(input, extensionRegistry);
         }
       };
 
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 01d0eaaa72..b06011163a 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
@@ -55,6 +55,71 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListLocationsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              filter_ = s;
+              break;
+            }
+          case 24:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.location.LocationsProto
         .internal_static_google_cloud_location_ListLocationsRequest_descriptor;
@@ -268,7 +333,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, pageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -289,7 +354,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, pageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -309,7 +374,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getFilter().equals(other.getFilter())) return false;
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -328,7 +393,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageSize();
     hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -458,10 +523,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.cloud.location.ListLocationsRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -570,7 +642,7 @@ public Builder mergeFrom(com.google.cloud.location.ListLocationsRequest other) {
         pageToken_ = other.pageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -585,55 +657,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.cloud.location.ListLocationsRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                filter_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 24:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 24
-            case 34:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.location.ListLocationsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1057,18 +1091,7 @@ public ListLocationsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListLocationsRequest(input, extensionRegistry);
         }
       };
 
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 4bbe5283db..51f445bce4 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
@@ -54,6 +54,67 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListLocationsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                locations_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              locations_.add(
+                  input.readMessage(
+                      com.google.cloud.location.Location.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        locations_ = java.util.Collections.unmodifiableList(locations_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.location.LocationsProto
         .internal_static_google_cloud_location_ListLocationsResponse_descriptor;
@@ -214,7 +275,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -229,7 +290,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -247,7 +308,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getLocationsList().equals(other.getLocationsList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -264,7 +325,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -394,10 +455,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.cloud.location.ListLocationsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getLocationsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -405,11 +475,10 @@ public Builder clear() {
       super.clear();
       if (locationsBuilder_ == null) {
         locations_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        locations_ = null;
         locationsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -531,7 +600,7 @@ public Builder mergeFrom(com.google.cloud.location.ListLocationsResponse other)
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -546,50 +615,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.cloud.location.ListLocationsResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.cloud.location.Location m =
-                    input.readMessage(
-                        com.google.cloud.location.Location.parser(), extensionRegistry);
-                if (locationsBuilder_ == null) {
-                  ensureLocationsIsMutable();
-                  locations_.add(m);
-                } else {
-                  locationsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.location.ListLocationsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1103,18 +1139,7 @@ public ListLocationsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListLocationsResponse(input, extensionRegistry);
         }
       };
 
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 8968e59ea6..79c371269c 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
@@ -55,6 +55,94 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Location(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                labels_ =
+                    com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry labels__ =
+                  input.readMessage(
+                      LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              labels_.getMutableMap().put(labels__.getKey(), labels__.getValue());
+              break;
+            }
+          case 26:
+            {
+              com.google.protobuf.Any.Builder subBuilder = null;
+              if (metadata_ != null) {
+                subBuilder = metadata_.toBuilder();
+              }
+              metadata_ = input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(metadata_);
+                metadata_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              locationId_ = s;
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              displayName_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.cloud.location.LocationsProto
         .internal_static_google_cloud_location_Location_descriptor;
@@ -425,7 +513,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 5, displayName_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -456,7 +544,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, displayName_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -479,7 +567,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasMetadata()) {
       if (!getMetadata().equals(other.getMetadata())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -504,7 +592,7 @@ public int hashCode() {
       hash = (37 * hash) + METADATA_FIELD_NUMBER;
       hash = (53 * hash) + getMetadata().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -653,10 +741,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.cloud.location.Location.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -777,7 +872,7 @@ public Builder mergeFrom(com.google.cloud.location.Location other) {
       if (other.hasMetadata()) {
         mergeMetadata(other.getMetadata());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -792,66 +887,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.cloud.location.Location parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.protobuf.MapEntry labels__ =
-                    input.readMessage(
-                        LabelsDefaultEntryHolder.defaultEntry.getParserForType(),
-                        extensionRegistry);
-                internalGetMutableLabels()
-                    .getMutableMap()
-                    .put(labels__.getKey(), labels__.getValue());
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(getMetadataFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            case 34:
-              {
-                locationId_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            case 42:
-              {
-                displayName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 42
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.location.Location) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1601,18 +1647,7 @@ public Location parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Location(input, extensionRegistry);
         }
       };
 
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 81f0e2b75a..9eafa38ea0 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
@@ -77,6 +77,73 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Viewport(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.type.LatLng.Builder subBuilder = null;
+              if (low_ != null) {
+                subBuilder = low_.toBuilder();
+              }
+              low_ = input.readMessage(com.google.type.LatLng.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(low_);
+                low_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              com.google.type.LatLng.Builder subBuilder = null;
+              if (high_ != null) {
+                subBuilder = high_.toBuilder();
+              }
+              high_ = input.readMessage(com.google.type.LatLng.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(high_);
+                high_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.geo.type.ViewportProto.internal_static_google_geo_type_Viewport_descriptor;
   }
@@ -208,7 +275,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (high_ != null) {
       output.writeMessage(2, getHigh());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -223,7 +290,7 @@ public int getSerializedSize() {
     if (high_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getHigh());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -246,7 +313,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasHigh()) {
       if (!getHigh().equals(other.getHigh())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -265,7 +332,7 @@ public int hashCode() {
       hash = (37 * hash) + HIGH_FIELD_NUMBER;
       hash = (53 * hash) + getHigh().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -418,10 +485,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.geo.type.Viewport.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -529,7 +603,7 @@ public Builder mergeFrom(com.google.geo.type.Viewport other) {
       if (other.hasHigh()) {
         mergeHigh(other.getHigh());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -544,43 +618,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.geo.type.Viewport parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getLowFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getHighFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.geo.type.Viewport) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -980,18 +1028,7 @@ public Viewport parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Viewport(input, extensionRegistry);
         }
       };
 
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 743d0eb2a1..a0edc7ddd2 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
@@ -61,6 +61,144 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private HttpRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              requestMethod_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              requestUrl_ = s;
+              break;
+            }
+          case 24:
+            {
+              requestSize_ = input.readInt64();
+              break;
+            }
+          case 32:
+            {
+              status_ = input.readInt32();
+              break;
+            }
+          case 40:
+            {
+              responseSize_ = input.readInt64();
+              break;
+            }
+          case 50:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              userAgent_ = s;
+              break;
+            }
+          case 58:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              remoteIp_ = s;
+              break;
+            }
+          case 66:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              referer_ = s;
+              break;
+            }
+          case 72:
+            {
+              cacheHit_ = input.readBool();
+              break;
+            }
+          case 80:
+            {
+              cacheValidatedWithOriginServer_ = input.readBool();
+              break;
+            }
+          case 88:
+            {
+              cacheLookup_ = input.readBool();
+              break;
+            }
+          case 96:
+            {
+              cacheFillBytes_ = input.readInt64();
+              break;
+            }
+          case 106:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              serverIp_ = s;
+              break;
+            }
+          case 114:
+            {
+              com.google.protobuf.Duration.Builder subBuilder = null;
+              if (latency_ != null) {
+                subBuilder = latency_.toBuilder();
+              }
+              latency_ =
+                  input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(latency_);
+                latency_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 122:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              protocol_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.logging.type.HttpRequestProto
         .internal_static_google_logging_type_HttpRequest_descriptor;
@@ -704,7 +842,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(protocol_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 15, protocol_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -760,7 +898,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(protocol_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, protocol_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -794,7 +932,7 @@ public boolean equals(final java.lang.Object obj) {
       return false;
     if (getCacheFillBytes() != other.getCacheFillBytes()) return false;
     if (!getProtocol().equals(other.getProtocol())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -838,7 +976,7 @@ public int hashCode() {
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getCacheFillBytes());
     hash = (37 * hash) + PROTOCOL_FIELD_NUMBER;
     hash = (53 * hash) + getProtocol().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -969,10 +1107,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.logging.type.HttpRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1158,7 +1303,7 @@ public Builder mergeFrom(com.google.logging.type.HttpRequest other) {
         protocol_ = other.protocol_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1173,121 +1318,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.logging.type.HttpRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                requestMethod_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                requestUrl_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 24:
-              {
-                requestSize_ = input.readInt64();
-
-                break;
-              } // case 24
-            case 32:
-              {
-                status_ = input.readInt32();
-
-                break;
-              } // case 32
-            case 40:
-              {
-                responseSize_ = input.readInt64();
-
-                break;
-              } // case 40
-            case 50:
-              {
-                userAgent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 50
-            case 58:
-              {
-                remoteIp_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 58
-            case 66:
-              {
-                referer_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 66
-            case 72:
-              {
-                cacheHit_ = input.readBool();
-
-                break;
-              } // case 72
-            case 80:
-              {
-                cacheValidatedWithOriginServer_ = input.readBool();
-
-                break;
-              } // case 80
-            case 88:
-              {
-                cacheLookup_ = input.readBool();
-
-                break;
-              } // case 88
-            case 96:
-              {
-                cacheFillBytes_ = input.readInt64();
-
-                break;
-              } // case 96
-            case 106:
-              {
-                serverIp_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 106
-            case 114:
-              {
-                input.readMessage(getLatencyFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 114
-            case 122:
-              {
-                protocol_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 122
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.logging.type.HttpRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2753,18 +2794,7 @@ public HttpRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new HttpRequest(input, extensionRegistry);
         }
       };
 
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 fd9de6ab38..ab89c69bc1 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
@@ -54,6 +54,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CancelOperationRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.longrunning.OperationsProto
         .internal_static_google_longrunning_CancelOperationRequest_descriptor;
@@ -137,7 +183,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -149,7 +195,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -166,7 +212,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.longrunning.CancelOperationRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -179,7 +225,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -310,10 +356,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.longrunning.CancelOperationRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -402,7 +455,7 @@ public Builder mergeFrom(com.google.longrunning.CancelOperationRequest other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -417,37 +470,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.longrunning.CancelOperationRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.longrunning.CancelOperationRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -594,18 +627,7 @@ public CancelOperationRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new CancelOperationRequest(input, extensionRegistry);
         }
       };
 
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 2953a2fa09..886934341d 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
@@ -54,6 +54,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DeleteOperationRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.longrunning.OperationsProto
         .internal_static_google_longrunning_DeleteOperationRequest_descriptor;
@@ -137,7 +183,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -149,7 +195,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -166,7 +212,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.longrunning.DeleteOperationRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -179,7 +225,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -310,10 +356,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.longrunning.DeleteOperationRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -402,7 +455,7 @@ public Builder mergeFrom(com.google.longrunning.DeleteOperationRequest other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -417,37 +470,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.longrunning.DeleteOperationRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.longrunning.DeleteOperationRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -594,18 +627,7 @@ public DeleteOperationRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DeleteOperationRequest(input, extensionRegistry);
         }
       };
 
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 41d98f1fe5..ee66408faf 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
@@ -54,6 +54,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private GetOperationRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.longrunning.OperationsProto
         .internal_static_google_longrunning_GetOperationRequest_descriptor;
@@ -137,7 +183,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -149,7 +195,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -166,7 +212,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.longrunning.GetOperationRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -179,7 +225,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -310,10 +356,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.longrunning.GetOperationRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -402,7 +455,7 @@ public Builder mergeFrom(com.google.longrunning.GetOperationRequest other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -417,37 +470,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.longrunning.GetOperationRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.longrunning.GetOperationRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -594,18 +627,7 @@ public GetOperationRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new GetOperationRequest(input, extensionRegistry);
         }
       };
 
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 c476659b06..1e9aedee03 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
@@ -56,6 +56,76 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListOperationsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              filter_ = s;
+              break;
+            }
+          case 16:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 40:
+            {
+              returnPartialSuccess_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.longrunning.OperationsProto
         .internal_static_google_longrunning_ListOperationsRequest_descriptor;
@@ -298,7 +368,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (returnPartialSuccess_ != false) {
       output.writeBool(5, returnPartialSuccess_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -322,7 +392,7 @@ public int getSerializedSize() {
     if (returnPartialSuccess_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(5, returnPartialSuccess_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -343,7 +413,7 @@ public boolean equals(final java.lang.Object obj) {
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
     if (getReturnPartialSuccess() != other.getReturnPartialSuccess()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -364,7 +434,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageToken().hashCode();
     hash = (37 * hash) + RETURN_PARTIAL_SUCCESS_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getReturnPartialSuccess());
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -495,10 +565,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.longrunning.ListOperationsRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -613,7 +690,7 @@ public Builder mergeFrom(com.google.longrunning.ListOperationsRequest other) {
       if (other.getReturnPartialSuccess() != false) {
         setReturnPartialSuccess(other.getReturnPartialSuccess());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -628,61 +705,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.longrunning.ListOperationsRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                filter_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            case 40:
-              {
-                returnPartialSuccess_ = input.readBool();
-
-                break;
-              } // case 40
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.longrunning.ListOperationsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1182,18 +1215,7 @@ public ListOperationsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListOperationsRequest(input, extensionRegistry);
         }
       };
 
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 f4f654dad2..1a917c0b1f 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
@@ -56,6 +56,79 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListOperationsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                operations_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              operations_.add(
+                  input.readMessage(com.google.longrunning.Operation.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                unreachable_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              unreachable_.add(s);
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        operations_ = java.util.Collections.unmodifiableList(operations_);
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        unreachable_ = unreachable_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.longrunning.OperationsProto
         .internal_static_google_longrunning_ListOperationsResponse_descriptor;
@@ -296,7 +369,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < unreachable_.size(); i++) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, unreachable_.getRaw(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -319,7 +392,7 @@ public int getSerializedSize() {
       size += dataSize;
       size += 1 * getUnreachableList().size();
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -338,7 +411,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getOperationsList().equals(other.getOperationsList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
     if (!getUnreachableList().equals(other.getUnreachableList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -359,7 +432,7 @@ public int hashCode() {
       hash = (37 * hash) + UNREACHABLE_FIELD_NUMBER;
       hash = (53 * hash) + getUnreachableList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -490,10 +563,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.longrunning.ListOperationsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getOperationsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -501,11 +583,10 @@ public Builder clear() {
       super.clear();
       if (operationsBuilder_ == null) {
         operations_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        operations_ = null;
         operationsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       unreachable_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -643,7 +724,7 @@ public Builder mergeFrom(com.google.longrunning.ListOperationsResponse other) {
         }
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -658,56 +739,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.longrunning.ListOperationsResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.longrunning.Operation m =
-                    input.readMessage(com.google.longrunning.Operation.parser(), extensionRegistry);
-                if (operationsBuilder_ == null) {
-                  ensureOperationsIsMutable();
-                  operations_.add(m);
-                } else {
-                  operationsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureUnreachableIsMutable();
-                unreachable_.add(s);
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.longrunning.ListOperationsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1425,18 +1467,7 @@ public ListOperationsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListOperationsResponse(input, extensionRegistry);
         }
       };
 
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 8183e06f04..6bc6bfdd11 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
@@ -54,6 +54,99 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Operation(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.protobuf.Any.Builder subBuilder = null;
+              if (metadata_ != null) {
+                subBuilder = metadata_.toBuilder();
+              }
+              metadata_ = input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(metadata_);
+                metadata_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 24:
+            {
+              done_ = input.readBool();
+              break;
+            }
+          case 34:
+            {
+              com.google.rpc.Status.Builder subBuilder = null;
+              if (resultCase_ == 4) {
+                subBuilder = ((com.google.rpc.Status) result_).toBuilder();
+              }
+              result_ = input.readMessage(com.google.rpc.Status.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.rpc.Status) result_);
+                result_ = subBuilder.buildPartial();
+              }
+              resultCase_ = 4;
+              break;
+            }
+          case 42:
+            {
+              com.google.protobuf.Any.Builder subBuilder = null;
+              if (resultCase_ == 5) {
+                subBuilder = ((com.google.protobuf.Any) result_).toBuilder();
+              }
+              result_ = input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.protobuf.Any) result_);
+                result_ = subBuilder.buildPartial();
+              }
+              resultCase_ = 5;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.longrunning.OperationsProto
         .internal_static_google_longrunning_Operation_descriptor;
@@ -408,7 +501,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (resultCase_ == 5) {
       output.writeMessage(5, (com.google.protobuf.Any) result_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -436,7 +529,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               5, (com.google.protobuf.Any) result_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -468,7 +561,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -499,7 +592,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -629,10 +722,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.longrunning.Operation.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -648,12 +748,6 @@ public Builder clear() {
       }
       done_ = false;
 
-      if (errorBuilder_ != null) {
-        errorBuilder_.clear();
-      }
-      if (responseBuilder_ != null) {
-        responseBuilder_.clear();
-      }
       resultCase_ = 0;
       result_ = null;
       return this;
@@ -779,7 +873,7 @@ public Builder mergeFrom(com.google.longrunning.Operation other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -794,61 +888,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.longrunning.Operation parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getMetadataFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            case 24:
-              {
-                done_ = input.readBool();
-
-                break;
-              } // case 24
-            case 34:
-              {
-                input.readMessage(getErrorFieldBuilder().getBuilder(), extensionRegistry);
-                resultCase_ = 4;
-                break;
-              } // case 34
-            case 42:
-              {
-                input.readMessage(getResponseFieldBuilder().getBuilder(), extensionRegistry);
-                resultCase_ = 5;
-                break;
-              } // case 42
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.longrunning.Operation) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1780,18 +1830,7 @@ public Operation parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Operation(input, extensionRegistry);
         }
       };
 
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 eef288ee67..8a18ca5123 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
@@ -61,6 +61,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private OperationInfo(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              responseType_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              metadataType_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.longrunning.OperationsProto
         .internal_static_google_longrunning_OperationInfo_descriptor;
@@ -216,7 +269,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(metadataType_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, metadataType_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -231,7 +284,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(metadataType_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, metadataType_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -248,7 +301,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getResponseType().equals(other.getResponseType())) return false;
     if (!getMetadataType().equals(other.getMetadataType())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -263,7 +316,7 @@ public int hashCode() {
     hash = (53 * hash) + getResponseType().hashCode();
     hash = (37 * hash) + METADATA_TYPE_FIELD_NUMBER;
     hash = (53 * hash) + getMetadataType().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -399,10 +452,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.longrunning.OperationInfo.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -497,7 +557,7 @@ public Builder mergeFrom(com.google.longrunning.OperationInfo other) {
         metadataType_ = other.metadataType_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -512,43 +572,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.longrunning.OperationInfo parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                responseType_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                metadataType_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.longrunning.OperationInfo) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -851,18 +885,7 @@ public OperationInfo parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new OperationInfo(input, extensionRegistry);
         }
       };
 
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 e7e25686dd..0446774a29 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
@@ -54,6 +54,67 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private WaitOperationRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.protobuf.Duration.Builder subBuilder = null;
+              if (timeout_ != null) {
+                subBuilder = timeout_.toBuilder();
+              }
+              timeout_ =
+                  input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(timeout_);
+                timeout_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.longrunning.OperationsProto
         .internal_static_google_longrunning_WaitOperationRequest_descriptor;
@@ -195,7 +256,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (timeout_ != null) {
       output.writeMessage(2, getTimeout());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -210,7 +271,7 @@ public int getSerializedSize() {
     if (timeout_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getTimeout());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -231,7 +292,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasTimeout()) {
       if (!getTimeout().equals(other.getTimeout())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -248,7 +309,7 @@ public int hashCode() {
       hash = (37 * hash) + TIMEOUT_FIELD_NUMBER;
       hash = (53 * hash) + getTimeout().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -379,10 +440,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.longrunning.WaitOperationRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -485,7 +553,7 @@ public Builder mergeFrom(com.google.longrunning.WaitOperationRequest other) {
       if (other.hasTimeout()) {
         mergeTimeout(other.getTimeout());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -500,43 +568,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.longrunning.WaitOperationRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getTimeoutFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.longrunning.WaitOperationRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -889,18 +931,7 @@ public WaitOperationRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new WaitOperationRequest(input, extensionRegistry);
         }
       };
 
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 d720872518..7339250e8a 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
@@ -54,6 +54,61 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private BadRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                fieldViolations_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              fieldViolations_.add(
+                  input.readMessage(
+                      com.google.rpc.BadRequest.FieldViolation.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        fieldViolations_ = java.util.Collections.unmodifiableList(fieldViolations_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_BadRequest_descriptor;
   }
@@ -293,6 +348,81 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private FieldViolation(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                field_ = s;
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                description_ = s;
+                break;
+              }
+            case 26:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                reason_ = s;
+                break;
+              }
+            case 34:
+              {
+                com.google.rpc.LocalizedMessage.Builder subBuilder = null;
+                if (localizedMessage_ != null) {
+                  subBuilder = localizedMessage_.toBuilder();
+                }
+                localizedMessage_ =
+                    input.readMessage(com.google.rpc.LocalizedMessage.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(localizedMessage_);
+                  localizedMessage_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.ErrorDetailsProto
           .internal_static_google_rpc_BadRequest_FieldViolation_descriptor;
@@ -607,7 +737,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (localizedMessage_ != null) {
         output.writeMessage(4, getLocalizedMessage());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -628,7 +758,7 @@ public int getSerializedSize() {
       if (localizedMessage_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getLocalizedMessage());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -651,7 +781,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasLocalizedMessage()) {
         if (!getLocalizedMessage().equals(other.getLocalizedMessage())) return false;
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -672,7 +802,7 @@ public int hashCode() {
         hash = (37 * hash) + LOCALIZED_MESSAGE_FIELD_NUMBER;
         hash = (53 * hash) + getLocalizedMessage().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -804,10 +934,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.rpc.BadRequest.FieldViolation.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -926,7 +1063,7 @@ public Builder mergeFrom(com.google.rpc.BadRequest.FieldViolation other) {
         if (other.hasLocalizedMessage()) {
           mergeLocalizedMessage(other.getLocalizedMessage());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -941,56 +1078,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.rpc.BadRequest.FieldViolation parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  field_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  description_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 18
-              case 26:
-                {
-                  reason_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 26
-              case 34:
-                {
-                  input.readMessage(
-                      getLocalizedMessageFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 34
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.rpc.BadRequest.FieldViolation) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1728,19 +1826,7 @@ public FieldViolation parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new FieldViolation(input, extensionRegistry);
           }
         };
 
@@ -1850,7 +1936,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < fieldViolations_.size(); i++) {
       output.writeMessage(1, fieldViolations_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1862,7 +1948,7 @@ public int getSerializedSize() {
     for (int i = 0; i < fieldViolations_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, fieldViolations_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1878,7 +1964,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.rpc.BadRequest other = (com.google.rpc.BadRequest) obj;
 
     if (!getFieldViolationsList().equals(other.getFieldViolationsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1893,7 +1979,7 @@ public int hashCode() {
       hash = (37 * hash) + FIELD_VIOLATIONS_FIELD_NUMBER;
       hash = (53 * hash) + getFieldViolationsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -2021,10 +2107,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.rpc.BadRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getFieldViolationsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -2032,11 +2127,10 @@ public Builder clear() {
       super.clear();
       if (fieldViolationsBuilder_ == null) {
         fieldViolations_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        fieldViolations_ = null;
         fieldViolationsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -2148,7 +2242,7 @@ public Builder mergeFrom(com.google.rpc.BadRequest other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2163,44 +2257,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.rpc.BadRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.rpc.BadRequest.FieldViolation m =
-                    input.readMessage(
-                        com.google.rpc.BadRequest.FieldViolation.parser(), extensionRegistry);
-                if (fieldViolationsBuilder_ == null) {
-                  ensureFieldViolationsIsMutable();
-                  fieldViolations_.add(m);
-                } else {
-                  fieldViolationsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.rpc.BadRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2610,18 +2677,7 @@ public BadRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new BadRequest(input, extensionRegistry);
         }
       };
 
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 bb9a019a0f..fe1d1eee1b 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
@@ -54,6 +54,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DebugInfo(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                stackEntries_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              stackEntries_.add(s);
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              detail_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        stackEntries_ = stackEntries_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_DebugInfo_descriptor;
   }
@@ -202,7 +262,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(detail_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, detail_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -222,7 +282,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(detail_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, detail_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -239,7 +299,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getStackEntriesList().equals(other.getStackEntriesList())) return false;
     if (!getDetail().equals(other.getDetail())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -256,7 +316,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + DETAIL_FIELD_NUMBER;
     hash = (53 * hash) + getDetail().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -383,10 +443,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.rpc.DebugInfo.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -491,7 +558,7 @@ public Builder mergeFrom(com.google.rpc.DebugInfo other) {
         detail_ = other.detail_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -506,44 +573,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.rpc.DebugInfo parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureStackEntriesIsMutable();
-                stackEntries_.add(s);
-                break;
-              } // case 10
-            case 18:
-              {
-                detail_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.rpc.DebugInfo) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -869,18 +909,7 @@ public DebugInfo parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DebugInfo(input, extensionRegistry);
         }
       };
 
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 a7408bb17b..a4e31f058b 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
@@ -72,6 +72,75 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ErrorInfo(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              reason_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              domain_ = s;
+              break;
+            }
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                metadata_ =
+                    com.google.protobuf.MapField.newMapField(
+                        MetadataDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry metadata__ =
+                  input.readMessage(
+                      MetadataDefaultEntryHolder.defaultEntry.getParserForType(),
+                      extensionRegistry);
+              metadata_.getMutableMap().put(metadata__.getKey(), metadata__.getValue());
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_ErrorInfo_descriptor;
   }
@@ -369,7 +438,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     }
     com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
         output, internalGetMetadata(), MetadataDefaultEntryHolder.defaultEntry, 3);
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -394,7 +463,7 @@ public int getSerializedSize() {
               .build();
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, metadata__);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -412,7 +481,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getReason().equals(other.getReason())) return false;
     if (!getDomain().equals(other.getDomain())) return false;
     if (!internalGetMetadata().equals(other.internalGetMetadata())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -431,7 +500,7 @@ public int hashCode() {
       hash = (37 * hash) + METADATA_FIELD_NUMBER;
       hash = (53 * hash) + internalGetMetadata().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -596,10 +665,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.rpc.ErrorInfo.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -698,7 +774,7 @@ public Builder mergeFrom(com.google.rpc.ErrorInfo other) {
         onChanged();
       }
       internalGetMutableMetadata().mergeFrom(other.internalGetMetadata());
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -713,54 +789,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.rpc.ErrorInfo parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                reason_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                domain_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                com.google.protobuf.MapEntry metadata__ =
-                    input.readMessage(
-                        MetadataDefaultEntryHolder.defaultEntry.getParserForType(),
-                        extensionRegistry);
-                internalGetMutableMetadata()
-                    .getMutableMap()
-                    .put(metadata__.getKey(), metadata__.getValue());
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.rpc.ErrorInfo) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1282,18 +1321,7 @@ public ErrorInfo parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ErrorInfo(input, extensionRegistry);
         }
       };
 
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 91425c6f4d..798dbd6ca5 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
@@ -56,6 +56,58 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Help(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                links_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              links_.add(input.readMessage(com.google.rpc.Help.Link.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        links_ = java.util.Collections.unmodifiableList(links_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_Help_descriptor;
   }
@@ -162,6 +214,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Link(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                description_ = s;
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                url_ = s;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_Help_Link_descriptor;
     }
@@ -297,7 +402,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(url_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, url_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -312,7 +417,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(url_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, url_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -329,7 +434,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getDescription().equals(other.getDescription())) return false;
       if (!getUrl().equals(other.getUrl())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -344,7 +449,7 @@ public int hashCode() {
       hash = (53 * hash) + getDescription().hashCode();
       hash = (37 * hash) + URL_FIELD_NUMBER;
       hash = (53 * hash) + getUrl().hashCode();
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -473,10 +578,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.rpc.Help.Link.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -572,7 +684,7 @@ public Builder mergeFrom(com.google.rpc.Help.Link other) {
           url_ = other.url_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -587,43 +699,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.rpc.Help.Link parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  description_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  url_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 18
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.rpc.Help.Link) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -882,19 +968,7 @@ public Link parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Link(input, extensionRegistry);
           }
         };
 
@@ -1003,7 +1077,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < links_.size(); i++) {
       output.writeMessage(1, links_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1015,7 +1089,7 @@ public int getSerializedSize() {
     for (int i = 0; i < links_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, links_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1031,7 +1105,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.rpc.Help other = (com.google.rpc.Help) obj;
 
     if (!getLinksList().equals(other.getLinksList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1046,7 +1120,7 @@ public int hashCode() {
       hash = (37 * hash) + LINKS_FIELD_NUMBER;
       hash = (53 * hash) + getLinksList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1175,10 +1249,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.rpc.Help.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getLinksFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -1186,11 +1269,10 @@ public Builder clear() {
       super.clear();
       if (linksBuilder_ == null) {
         links_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        links_ = null;
         linksBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -1302,7 +1384,7 @@ public Builder mergeFrom(com.google.rpc.Help other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1317,43 +1399,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.rpc.Help parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.rpc.Help.Link m =
-                    input.readMessage(com.google.rpc.Help.Link.parser(), extensionRegistry);
-                if (linksBuilder_ == null) {
-                  ensureLinksIsMutable();
-                  links_.add(m);
-                } else {
-                  linksBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.rpc.Help) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1750,18 +1806,7 @@ public Help parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Help(input, extensionRegistry);
         }
       };
 
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 259a74d83c..66e31ccd95 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
@@ -55,6 +55,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private LocalizedMessage(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              locale_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              message_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_LocalizedMessage_descriptor;
   }
@@ -194,7 +247,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(message_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, message_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -209,7 +262,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(message_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, message_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -226,7 +279,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getLocale().equals(other.getLocale())) return false;
     if (!getMessage().equals(other.getMessage())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -241,7 +294,7 @@ public int hashCode() {
     hash = (53 * hash) + getLocale().hashCode();
     hash = (37 * hash) + MESSAGE_FIELD_NUMBER;
     hash = (53 * hash) + getMessage().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -370,10 +423,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.rpc.LocalizedMessage.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -468,7 +528,7 @@ public Builder mergeFrom(com.google.rpc.LocalizedMessage other) {
         message_ = other.message_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -483,43 +543,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.rpc.LocalizedMessage parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                locale_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                message_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.rpc.LocalizedMessage) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -787,18 +821,7 @@ public LocalizedMessage parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new LocalizedMessage(input, extensionRegistry);
         }
       };
 
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 bb380509c3..55fca7c097 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
@@ -56,6 +56,61 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PreconditionFailure(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                violations_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              violations_.add(
+                  input.readMessage(
+                      com.google.rpc.PreconditionFailure.Violation.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        violations_ = java.util.Collections.unmodifiableList(violations_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto
         .internal_static_google_rpc_PreconditionFailure_descriptor;
@@ -204,6 +259,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Violation(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                type_ = s;
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                subject_ = s;
+                break;
+              }
+            case 26:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                description_ = s;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.ErrorDetailsProto
           .internal_static_google_rpc_PreconditionFailure_Violation_descriptor;
@@ -407,7 +522,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 3, description_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -425,7 +540,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, description_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -444,7 +559,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getType().equals(other.getType())) return false;
       if (!getSubject().equals(other.getSubject())) return false;
       if (!getDescription().equals(other.getDescription())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -461,7 +576,7 @@ public int hashCode() {
       hash = (53 * hash) + getSubject().hashCode();
       hash = (37 * hash) + DESCRIPTION_FIELD_NUMBER;
       hash = (53 * hash) + getDescription().hashCode();
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -593,10 +708,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.rpc.PreconditionFailure.Violation.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -701,7 +823,7 @@ public Builder mergeFrom(com.google.rpc.PreconditionFailure.Violation other) {
           description_ = other.description_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -716,49 +838,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.rpc.PreconditionFailure.Violation parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  type_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  subject_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 18
-              case 26:
-                {
-                  description_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 26
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.rpc.PreconditionFailure.Violation) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1158,19 +1248,7 @@ public Violation parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Violation(input, extensionRegistry);
           }
         };
 
@@ -1280,7 +1358,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < violations_.size(); i++) {
       output.writeMessage(1, violations_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1292,7 +1370,7 @@ public int getSerializedSize() {
     for (int i = 0; i < violations_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, violations_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1308,7 +1386,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.rpc.PreconditionFailure other = (com.google.rpc.PreconditionFailure) obj;
 
     if (!getViolationsList().equals(other.getViolationsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1323,7 +1401,7 @@ public int hashCode() {
       hash = (37 * hash) + VIOLATIONS_FIELD_NUMBER;
       hash = (53 * hash) + getViolationsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1455,10 +1533,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.rpc.PreconditionFailure.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getViolationsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -1466,11 +1553,10 @@ public Builder clear() {
       super.clear();
       if (violationsBuilder_ == null) {
         violations_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        violations_ = null;
         violationsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -1583,7 +1669,7 @@ public Builder mergeFrom(com.google.rpc.PreconditionFailure other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1598,44 +1684,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.rpc.PreconditionFailure parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.rpc.PreconditionFailure.Violation m =
-                    input.readMessage(
-                        com.google.rpc.PreconditionFailure.Violation.parser(), extensionRegistry);
-                if (violationsBuilder_ == null) {
-                  ensureViolationsIsMutable();
-                  violations_.add(m);
-                } else {
-                  violationsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.rpc.PreconditionFailure) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2041,18 +2100,7 @@ public PreconditionFailure parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PreconditionFailure(input, extensionRegistry);
         }
       };
 
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 e20149be22..ea50d2a1ef 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
@@ -61,6 +61,60 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private QuotaFailure(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                violations_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              violations_.add(
+                  input.readMessage(
+                      com.google.rpc.QuotaFailure.Violation.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        violations_ = java.util.Collections.unmodifiableList(violations_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_QuotaFailure_descriptor;
   }
@@ -478,6 +532,109 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Violation(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                subject_ = s;
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                description_ = s;
+                break;
+              }
+            case 26:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                apiService_ = s;
+                break;
+              }
+            case 34:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                quotaMetric_ = s;
+                break;
+              }
+            case 42:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                quotaId_ = s;
+                break;
+              }
+            case 50:
+              {
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  quotaDimensions_ =
+                      com.google.protobuf.MapField.newMapField(
+                          QuotaDimensionsDefaultEntryHolder.defaultEntry);
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                com.google.protobuf.MapEntry quotaDimensions__ =
+                    input.readMessage(
+                        QuotaDimensionsDefaultEntryHolder.defaultEntry.getParserForType(),
+                        extensionRegistry);
+                quotaDimensions_
+                    .getMutableMap()
+                    .put(quotaDimensions__.getKey(), quotaDimensions__.getValue());
+                break;
+              }
+            case 56:
+              {
+                quotaValue_ = input.readInt64();
+                break;
+              }
+            case 64:
+              {
+                bitField0_ |= 0x00000001;
+                futureQuotaValue_ = input.readInt64();
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.ErrorDetailsProto
           .internal_static_google_rpc_QuotaFailure_Violation_descriptor;
@@ -1070,7 +1227,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt64(8, futureQuotaValue_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -1110,7 +1267,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.CodedOutputStream.computeInt64Size(8, futureQuotaValue_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1136,7 +1293,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasFutureQuotaValue()) {
         if (getFutureQuotaValue() != other.getFutureQuotaValue()) return false;
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -1167,7 +1324,7 @@ public int hashCode() {
         hash = (37 * hash) + FUTURE_QUOTA_VALUE_FIELD_NUMBER;
         hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getFutureQuotaValue());
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1320,10 +1477,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       }
 
       // Construct using com.google.rpc.QuotaFailure.Violation.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -1464,7 +1628,7 @@ public Builder mergeFrom(com.google.rpc.QuotaFailure.Violation other) {
         if (other.hasFutureQuotaValue()) {
           setFutureQuotaValue(other.getFutureQuotaValue());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1479,85 +1643,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.rpc.QuotaFailure.Violation parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  subject_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  description_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 18
-              case 26:
-                {
-                  apiService_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 26
-              case 34:
-                {
-                  quotaMetric_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 34
-              case 42:
-                {
-                  quotaId_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 42
-              case 50:
-                {
-                  com.google.protobuf.MapEntry
-                      quotaDimensions__ =
-                          input.readMessage(
-                              QuotaDimensionsDefaultEntryHolder.defaultEntry.getParserForType(),
-                              extensionRegistry);
-                  internalGetMutableQuotaDimensions()
-                      .getMutableMap()
-                      .put(quotaDimensions__.getKey(), quotaDimensions__.getValue());
-                  break;
-                } // case 50
-              case 56:
-                {
-                  quotaValue_ = input.readInt64();
-
-                  break;
-                } // case 56
-              case 64:
-                {
-                  futureQuotaValue_ = input.readInt64();
-                  bitField0_ |= 0x00000002;
-                  break;
-                } // case 64
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.rpc.QuotaFailure.Violation) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -2693,19 +2789,7 @@ public Violation parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Violation(input, extensionRegistry);
           }
         };
 
@@ -2815,7 +2899,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < violations_.size(); i++) {
       output.writeMessage(1, violations_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -2827,7 +2911,7 @@ public int getSerializedSize() {
     for (int i = 0; i < violations_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, violations_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -2843,7 +2927,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.rpc.QuotaFailure other = (com.google.rpc.QuotaFailure) obj;
 
     if (!getViolationsList().equals(other.getViolationsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -2858,7 +2942,7 @@ public int hashCode() {
       hash = (37 * hash) + VIOLATIONS_FIELD_NUMBER;
       hash = (53 * hash) + getViolationsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -2993,10 +3077,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.rpc.QuotaFailure.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getViolationsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -3004,11 +3097,10 @@ public Builder clear() {
       super.clear();
       if (violationsBuilder_ == null) {
         violations_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        violations_ = null;
         violationsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -3120,7 +3212,7 @@ public Builder mergeFrom(com.google.rpc.QuotaFailure other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -3135,44 +3227,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.rpc.QuotaFailure parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.rpc.QuotaFailure.Violation m =
-                    input.readMessage(
-                        com.google.rpc.QuotaFailure.Violation.parser(), extensionRegistry);
-                if (violationsBuilder_ == null) {
-                  ensureViolationsIsMutable();
-                  violations_.add(m);
-                } else {
-                  violationsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.rpc.QuotaFailure) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -3576,18 +3641,7 @@ public QuotaFailure parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new QuotaFailure(input, extensionRegistry);
         }
       };
 
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 1e36facb2f..164349f50e 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
@@ -55,6 +55,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private RequestInfo(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              requestId_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              servingData_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_RequestInfo_descriptor;
   }
@@ -194,7 +247,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(servingData_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, servingData_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -209,7 +262,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(servingData_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, servingData_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -226,7 +279,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getRequestId().equals(other.getRequestId())) return false;
     if (!getServingData().equals(other.getServingData())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -241,7 +294,7 @@ public int hashCode() {
     hash = (53 * hash) + getRequestId().hashCode();
     hash = (37 * hash) + SERVING_DATA_FIELD_NUMBER;
     hash = (53 * hash) + getServingData().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -369,10 +422,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.rpc.RequestInfo.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -466,7 +526,7 @@ public Builder mergeFrom(com.google.rpc.RequestInfo other) {
         servingData_ = other.servingData_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -481,43 +541,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.rpc.RequestInfo parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                requestId_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                servingData_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.rpc.RequestInfo) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -785,18 +819,7 @@ public RequestInfo parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new RequestInfo(input, extensionRegistry);
         }
       };
 
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 b8a66a9c2b..ca4ee87dd6 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
@@ -56,6 +56,73 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ResourceInfo(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              resourceType_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              resourceName_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              owner_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              description_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_ResourceInfo_descriptor;
   }
@@ -317,7 +384,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, description_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -338,7 +405,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, description_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -357,7 +424,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getResourceName().equals(other.getResourceName())) return false;
     if (!getOwner().equals(other.getOwner())) return false;
     if (!getDescription().equals(other.getDescription())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -376,7 +443,7 @@ public int hashCode() {
     hash = (53 * hash) + getOwner().hashCode();
     hash = (37 * hash) + DESCRIPTION_FIELD_NUMBER;
     hash = (53 * hash) + getDescription().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -503,10 +570,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.rpc.ResourceInfo.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -614,7 +688,7 @@ public Builder mergeFrom(com.google.rpc.ResourceInfo other) {
         description_ = other.description_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -629,55 +703,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.rpc.ResourceInfo parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                resourceType_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                resourceName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                owner_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                description_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.rpc.ResourceInfo) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1202,18 +1238,7 @@ public ResourceInfo parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ResourceInfo(input, extensionRegistry);
         }
       };
 
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 6e1a33159e..468ca3de86 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
@@ -61,6 +61,60 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private RetryInfo(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.protobuf.Duration.Builder subBuilder = null;
+              if (retryDelay_ != null) {
+                subBuilder = retryDelay_.toBuilder();
+              }
+              retryDelay_ =
+                  input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(retryDelay_);
+                retryDelay_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.ErrorDetailsProto.internal_static_google_rpc_RetryInfo_descriptor;
   }
@@ -139,7 +193,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (retryDelay_ != null) {
       output.writeMessage(1, getRetryDelay());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -151,7 +205,7 @@ public int getSerializedSize() {
     if (retryDelay_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getRetryDelay());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -170,7 +224,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasRetryDelay()) {
       if (!getRetryDelay().equals(other.getRetryDelay())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -185,7 +239,7 @@ public int hashCode() {
       hash = (37 * hash) + RETRY_DELAY_FIELD_NUMBER;
       hash = (53 * hash) + getRetryDelay().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -322,10 +376,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.rpc.RetryInfo.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -419,7 +480,7 @@ public Builder mergeFrom(com.google.rpc.RetryInfo other) {
       if (other.hasRetryDelay()) {
         mergeRetryDelay(other.getRetryDelay());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -434,37 +495,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.rpc.RetryInfo parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getRetryDelayFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.rpc.RetryInfo) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -692,18 +733,7 @@ public RetryInfo parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new RetryInfo(input, extensionRegistry);
         }
       };
 
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 b7e4bff43e..a0958b0a0c 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
@@ -59,6 +59,70 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Status(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              code_ = input.readInt32();
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              message_ = s;
+              break;
+            }
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                details_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              details_.add(input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        details_ = java.util.Collections.unmodifiableList(details_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.StatusProto.internal_static_google_rpc_Status_descriptor;
   }
@@ -249,7 +313,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < details_.size(); i++) {
       output.writeMessage(3, details_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -267,7 +331,7 @@ public int getSerializedSize() {
     for (int i = 0; i < details_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, details_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -285,7 +349,7 @@ public boolean equals(final java.lang.Object obj) {
     if (getCode() != other.getCode()) return false;
     if (!getMessage().equals(other.getMessage())) return false;
     if (!getDetailsList().equals(other.getDetailsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -304,7 +368,7 @@ public int hashCode() {
       hash = (37 * hash) + DETAILS_FIELD_NUMBER;
       hash = (53 * hash) + getDetailsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -435,10 +499,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.rpc.Status.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getDetailsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -450,11 +523,10 @@ public Builder clear() {
 
       if (detailsBuilder_ == null) {
         details_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        details_ = null;
         detailsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -575,7 +647,7 @@ public Builder mergeFrom(com.google.rpc.Status other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -590,55 +662,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.rpc.Status parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                code_ = input.readInt32();
-
-                break;
-              } // case 8
-            case 18:
-              {
-                message_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                com.google.protobuf.Any m =
-                    input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry);
-                if (detailsBuilder_ == null) {
-                  ensureDetailsIsMutable();
-                  details_.add(m);
-                } else {
-                  detailsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.rpc.Status) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1237,18 +1271,7 @@ public Status parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Status(input, extensionRegistry);
         }
       };
 
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 c4131cae01..96172af606 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
@@ -65,6 +65,171 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private AttributeContext(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.rpc.context.AttributeContext.Peer.Builder subBuilder = null;
+              if (source_ != null) {
+                subBuilder = source_.toBuilder();
+              }
+              source_ =
+                  input.readMessage(
+                      com.google.rpc.context.AttributeContext.Peer.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(source_);
+                source_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              com.google.rpc.context.AttributeContext.Peer.Builder subBuilder = null;
+              if (destination_ != null) {
+                subBuilder = destination_.toBuilder();
+              }
+              destination_ =
+                  input.readMessage(
+                      com.google.rpc.context.AttributeContext.Peer.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(destination_);
+                destination_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 26:
+            {
+              com.google.rpc.context.AttributeContext.Request.Builder subBuilder = null;
+              if (request_ != null) {
+                subBuilder = request_.toBuilder();
+              }
+              request_ =
+                  input.readMessage(
+                      com.google.rpc.context.AttributeContext.Request.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(request_);
+                request_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 34:
+            {
+              com.google.rpc.context.AttributeContext.Response.Builder subBuilder = null;
+              if (response_ != null) {
+                subBuilder = response_.toBuilder();
+              }
+              response_ =
+                  input.readMessage(
+                      com.google.rpc.context.AttributeContext.Response.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(response_);
+                response_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 42:
+            {
+              com.google.rpc.context.AttributeContext.Resource.Builder subBuilder = null;
+              if (resource_ != null) {
+                subBuilder = resource_.toBuilder();
+              }
+              resource_ =
+                  input.readMessage(
+                      com.google.rpc.context.AttributeContext.Resource.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(resource_);
+                resource_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 50:
+            {
+              com.google.rpc.context.AttributeContext.Api.Builder subBuilder = null;
+              if (api_ != null) {
+                subBuilder = api_.toBuilder();
+              }
+              api_ =
+                  input.readMessage(
+                      com.google.rpc.context.AttributeContext.Api.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(api_);
+                api_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 58:
+            {
+              com.google.rpc.context.AttributeContext.Peer.Builder subBuilder = null;
+              if (origin_ != null) {
+                subBuilder = origin_.toBuilder();
+              }
+              origin_ =
+                  input.readMessage(
+                      com.google.rpc.context.AttributeContext.Peer.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(origin_);
+                origin_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 66:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                extensions_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              extensions_.add(
+                  input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        extensions_ = java.util.Collections.unmodifiableList(extensions_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.context.AttributeContextProto
         .internal_static_google_rpc_context_AttributeContext_descriptor;
@@ -289,6 +454,87 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Peer(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                ip_ = s;
+                break;
+              }
+            case 16:
+              {
+                port_ = input.readInt64();
+                break;
+              }
+            case 50:
+              {
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  labels_ =
+                      com.google.protobuf.MapField.newMapField(
+                          LabelsDefaultEntryHolder.defaultEntry);
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                com.google.protobuf.MapEntry labels__ =
+                    input.readMessage(
+                        LabelsDefaultEntryHolder.defaultEntry.getParserForType(),
+                        extensionRegistry);
+                labels_.getMutableMap().put(labels__.getKey(), labels__.getValue());
+                break;
+              }
+            case 58:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                principal_ = s;
+                break;
+              }
+            case 66:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                regionCode_ = s;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.context.AttributeContextProto
           .internal_static_google_rpc_context_AttributeContext_Peer_descriptor;
@@ -627,7 +873,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(regionCode_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 8, regionCode_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -658,7 +904,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(regionCode_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, regionCode_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -679,7 +925,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!internalGetLabels().equals(other.internalGetLabels())) return false;
       if (!getPrincipal().equals(other.getPrincipal())) return false;
       if (!getRegionCode().equals(other.getRegionCode())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -702,7 +948,7 @@ public int hashCode() {
       hash = (53 * hash) + getPrincipal().hashCode();
       hash = (37 * hash) + REGION_CODE_FIELD_NUMBER;
       hash = (53 * hash) + getRegionCode().hashCode();
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -857,10 +1103,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       }
 
       // Construct using com.google.rpc.context.AttributeContext.Peer.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -976,7 +1229,7 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Peer other) {
           regionCode_ = other.regionCode_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -991,66 +1244,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.rpc.context.AttributeContext.Peer parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  ip_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 16:
-                {
-                  port_ = input.readInt64();
-
-                  break;
-                } // case 16
-              case 50:
-                {
-                  com.google.protobuf.MapEntry labels__ =
-                      input.readMessage(
-                          LabelsDefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableLabels()
-                      .getMutableMap()
-                      .put(labels__.getKey(), labels__.getValue());
-                  break;
-                } // case 50
-              case 58:
-                {
-                  principal_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 58
-              case 66:
-                {
-                  regionCode_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 66
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.rpc.context.AttributeContext.Peer) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1664,19 +1868,7 @@ public Peer parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Peer(input, extensionRegistry);
           }
         };
 
@@ -1857,6 +2049,73 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Api(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                service_ = s;
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                operation_ = s;
+                break;
+              }
+            case 26:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                protocol_ = s;
+                break;
+              }
+            case 34:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                version_ = s;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.context.AttributeContextProto
           .internal_static_google_rpc_context_AttributeContext_Api_descriptor;
@@ -2114,7 +2373,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(version_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 4, version_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -2135,7 +2394,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(version_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, version_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2155,7 +2414,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getOperation().equals(other.getOperation())) return false;
       if (!getProtocol().equals(other.getProtocol())) return false;
       if (!getVersion().equals(other.getVersion())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -2174,7 +2433,7 @@ public int hashCode() {
       hash = (53 * hash) + getProtocol().hashCode();
       hash = (37 * hash) + VERSION_FIELD_NUMBER;
       hash = (53 * hash) + getVersion().hashCode();
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2308,10 +2567,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.rpc.context.AttributeContext.Api.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -2423,7 +2689,7 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Api other) {
           version_ = other.version_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -2438,55 +2704,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.rpc.context.AttributeContext.Api parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  service_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  operation_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 18
-              case 26:
-                {
-                  protocol_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 26
-              case 34:
-                {
-                  version_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 34
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.rpc.context.AttributeContext.Api) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -2997,19 +3225,7 @@ public Api parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Api(input, extensionRegistry);
           }
         };
 
@@ -3385,6 +3601,100 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Auth(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                principal_ = s;
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  audiences_ = new com.google.protobuf.LazyStringArrayList();
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                audiences_.add(s);
+                break;
+              }
+            case 26:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                presenter_ = s;
+                break;
+              }
+            case 34:
+              {
+                com.google.protobuf.Struct.Builder subBuilder = null;
+                if (claims_ != null) {
+                  subBuilder = claims_.toBuilder();
+                }
+                claims_ = input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(claims_);
+                  claims_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 42:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+                if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                  accessLevels_ = new com.google.protobuf.LazyStringArrayList();
+                  mutable_bitField0_ |= 0x00000002;
+                }
+                accessLevels_.add(s);
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          audiences_ = audiences_.getUnmodifiableView();
+        }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          accessLevels_ = accessLevels_.getUnmodifiableView();
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.context.AttributeContextProto
           .internal_static_google_rpc_context_AttributeContext_Auth_descriptor;
@@ -3824,7 +4134,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       for (int i = 0; i < accessLevels_.size(); i++) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 5, accessLevels_.getRaw(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -3858,7 +4168,7 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getAccessLevelsList().size();
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3882,7 +4192,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getClaims().equals(other.getClaims())) return false;
       }
       if (!getAccessLevelsList().equals(other.getAccessLevelsList())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -3909,7 +4219,7 @@ public int hashCode() {
         hash = (37 * hash) + ACCESS_LEVELS_FIELD_NUMBER;
         hash = (53 * hash) + getAccessLevelsList().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4043,10 +4353,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.rpc.context.AttributeContext.Auth.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -4193,7 +4510,7 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Auth other) {
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -4208,63 +4525,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.rpc.context.AttributeContext.Auth parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  principal_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  java.lang.String s = input.readStringRequireUtf8();
-                  ensureAudiencesIsMutable();
-                  audiences_.add(s);
-                  break;
-                } // case 18
-              case 26:
-                {
-                  presenter_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 26
-              case 34:
-                {
-                  input.readMessage(getClaimsFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 34
-              case 42:
-                {
-                  java.lang.String s = input.readStringRequireUtf8();
-                  ensureAccessLevelsIsMutable();
-                  accessLevels_.add(s);
-                  break;
-                } // case 42
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.rpc.context.AttributeContext.Auth) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -5354,19 +5625,7 @@ public Auth parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Auth(input, extensionRegistry);
           }
         };
 
@@ -5824,6 +6083,153 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Request(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                id_ = s;
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                method_ = s;
+                break;
+              }
+            case 26:
+              {
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  headers_ =
+                      com.google.protobuf.MapField.newMapField(
+                          HeadersDefaultEntryHolder.defaultEntry);
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                com.google.protobuf.MapEntry headers__ =
+                    input.readMessage(
+                        HeadersDefaultEntryHolder.defaultEntry.getParserForType(),
+                        extensionRegistry);
+                headers_.getMutableMap().put(headers__.getKey(), headers__.getValue());
+                break;
+              }
+            case 34:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                path_ = s;
+                break;
+              }
+            case 42:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                host_ = s;
+                break;
+              }
+            case 50:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                scheme_ = s;
+                break;
+              }
+            case 58:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                query_ = s;
+                break;
+              }
+            case 74:
+              {
+                com.google.protobuf.Timestamp.Builder subBuilder = null;
+                if (time_ != null) {
+                  subBuilder = time_.toBuilder();
+                }
+                time_ =
+                    input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(time_);
+                  time_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 80:
+              {
+                size_ = input.readInt64();
+                break;
+              }
+            case 90:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                protocol_ = s;
+                break;
+              }
+            case 98:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                reason_ = s;
+                break;
+              }
+            case 106:
+              {
+                com.google.rpc.context.AttributeContext.Auth.Builder subBuilder = null;
+                if (auth_ != null) {
+                  subBuilder = auth_.toBuilder();
+                }
+                auth_ =
+                    input.readMessage(
+                        com.google.rpc.context.AttributeContext.Auth.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(auth_);
+                  auth_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.context.AttributeContextProto
           .internal_static_google_rpc_context_AttributeContext_Request_descriptor;
@@ -6558,7 +6964,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (auth_ != null) {
         output.writeMessage(13, getAuth());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -6610,7 +7016,7 @@ public int getSerializedSize() {
       if (auth_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(13, getAuth());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -6644,7 +7050,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasAuth()) {
         if (!getAuth().equals(other.getAuth())) return false;
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -6685,7 +7091,7 @@ public int hashCode() {
         hash = (37 * hash) + AUTH_FIELD_NUMBER;
         hash = (53 * hash) + getAuth().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6839,10 +7245,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       }
 
       // Construct using com.google.rpc.context.AttributeContext.Request.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -7022,7 +7435,7 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Request other)
         if (other.hasAuth()) {
           mergeAuth(other.getAuth());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -7037,108 +7450,18 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.rpc.context.AttributeContext.Request parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  id_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  method_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 18
-              case 26:
-                {
-                  com.google.protobuf.MapEntry headers__ =
-                      input.readMessage(
-                          HeadersDefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableHeaders()
-                      .getMutableMap()
-                      .put(headers__.getKey(), headers__.getValue());
-                  break;
-                } // case 26
-              case 34:
-                {
-                  path_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 34
-              case 42:
-                {
-                  host_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 42
-              case 50:
-                {
-                  scheme_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 50
-              case 58:
-                {
-                  query_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 58
-              case 74:
-                {
-                  input.readMessage(getTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 74
-              case 80:
-                {
-                  size_ = input.readInt64();
-
-                  break;
-                } // case 80
-              case 90:
-                {
-                  protocol_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 90
-              case 98:
-                {
-                  reason_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 98
-              case 106:
-                {
-                  input.readMessage(getAuthFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 106
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.rpc.context.AttributeContext.Request) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -8737,19 +9060,7 @@ public Request parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Request(input, extensionRegistry);
           }
         };
 
@@ -8994,6 +9305,101 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Response(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                code_ = input.readInt64();
+                break;
+              }
+            case 16:
+              {
+                size_ = input.readInt64();
+                break;
+              }
+            case 26:
+              {
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  headers_ =
+                      com.google.protobuf.MapField.newMapField(
+                          HeadersDefaultEntryHolder.defaultEntry);
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                com.google.protobuf.MapEntry headers__ =
+                    input.readMessage(
+                        HeadersDefaultEntryHolder.defaultEntry.getParserForType(),
+                        extensionRegistry);
+                headers_.getMutableMap().put(headers__.getKey(), headers__.getValue());
+                break;
+              }
+            case 34:
+              {
+                com.google.protobuf.Timestamp.Builder subBuilder = null;
+                if (time_ != null) {
+                  subBuilder = time_.toBuilder();
+                }
+                time_ =
+                    input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(time_);
+                  time_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 42:
+              {
+                com.google.protobuf.Duration.Builder subBuilder = null;
+                if (backendLatency_ != null) {
+                  subBuilder = backendLatency_.toBuilder();
+                }
+                backendLatency_ =
+                    input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(backendLatency_);
+                  backendLatency_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.context.AttributeContextProto
           .internal_static_google_rpc_context_AttributeContext_Response_descriptor;
@@ -9310,7 +9716,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (backendLatency_ != null) {
         output.writeMessage(5, getBackendLatency());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -9341,7 +9747,7 @@ public int getSerializedSize() {
       if (backendLatency_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getBackendLatency());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -9368,7 +9774,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasBackendLatency()) {
         if (!getBackendLatency().equals(other.getBackendLatency())) return false;
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -9395,7 +9801,7 @@ public int hashCode() {
         hash = (37 * hash) + BACKEND_LATENCY_FIELD_NUMBER;
         hash = (53 * hash) + getBackendLatency().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -9548,10 +9954,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       }
 
       // Construct using com.google.rpc.context.AttributeContext.Response.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -9681,7 +10094,7 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Response other)
         if (other.hasBackendLatency()) {
           mergeBackendLatency(other.getBackendLatency());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -9696,67 +10109,18 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.rpc.context.AttributeContext.Response parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 8:
-                {
-                  code_ = input.readInt64();
-
-                  break;
-                } // case 8
-              case 16:
-                {
-                  size_ = input.readInt64();
-
-                  break;
-                } // case 16
-              case 26:
-                {
-                  com.google.protobuf.MapEntry headers__ =
-                      input.readMessage(
-                          HeadersDefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableHeaders()
-                      .getMutableMap()
-                      .put(headers__.getKey(), headers__.getValue());
-                  break;
-                } // case 26
-              case 34:
-                {
-                  input.readMessage(getTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 34
-              case 42:
-                {
-                  input.readMessage(
-                      getBackendLatencyFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 42
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.rpc.context.AttributeContext.Response) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -10505,19 +10869,7 @@ public Response parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Response(input, extensionRegistry);
           }
         };
 
@@ -11095,6 +11447,170 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Resource(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                service_ = s;
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                name_ = s;
+                break;
+              }
+            case 26:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                type_ = s;
+                break;
+              }
+            case 34:
+              {
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  labels_ =
+                      com.google.protobuf.MapField.newMapField(
+                          LabelsDefaultEntryHolder.defaultEntry);
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                com.google.protobuf.MapEntry labels__ =
+                    input.readMessage(
+                        LabelsDefaultEntryHolder.defaultEntry.getParserForType(),
+                        extensionRegistry);
+                labels_.getMutableMap().put(labels__.getKey(), labels__.getValue());
+                break;
+              }
+            case 42:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                uid_ = s;
+                break;
+              }
+            case 50:
+              {
+                if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                  annotations_ =
+                      com.google.protobuf.MapField.newMapField(
+                          AnnotationsDefaultEntryHolder.defaultEntry);
+                  mutable_bitField0_ |= 0x00000002;
+                }
+                com.google.protobuf.MapEntry annotations__ =
+                    input.readMessage(
+                        AnnotationsDefaultEntryHolder.defaultEntry.getParserForType(),
+                        extensionRegistry);
+                annotations_.getMutableMap().put(annotations__.getKey(), annotations__.getValue());
+                break;
+              }
+            case 58:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                displayName_ = s;
+                break;
+              }
+            case 66:
+              {
+                com.google.protobuf.Timestamp.Builder subBuilder = null;
+                if (createTime_ != null) {
+                  subBuilder = createTime_.toBuilder();
+                }
+                createTime_ =
+                    input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(createTime_);
+                  createTime_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 74:
+              {
+                com.google.protobuf.Timestamp.Builder subBuilder = null;
+                if (updateTime_ != null) {
+                  subBuilder = updateTime_.toBuilder();
+                }
+                updateTime_ =
+                    input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(updateTime_);
+                  updateTime_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 82:
+              {
+                com.google.protobuf.Timestamp.Builder subBuilder = null;
+                if (deleteTime_ != null) {
+                  subBuilder = deleteTime_.toBuilder();
+                }
+                deleteTime_ =
+                    input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(deleteTime_);
+                  deleteTime_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 90:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                etag_ = s;
+                break;
+              }
+            case 98:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                location_ = s;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.rpc.context.AttributeContextProto
           .internal_static_google_rpc_context_AttributeContext_Resource_descriptor;
@@ -11969,7 +12485,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(location_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 12, location_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -12028,7 +12544,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(location_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, location_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -12065,7 +12581,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getEtag().equals(other.getEtag())) return false;
       if (!getLocation().equals(other.getLocation())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -12110,7 +12626,7 @@ public int hashCode() {
       hash = (53 * hash) + getEtag().hashCode();
       hash = (37 * hash) + LOCATION_FIELD_NUMBER;
       hash = (53 * hash) + getLocation().hashCode();
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -12268,10 +12784,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
       }
 
       // Construct using com.google.rpc.context.AttributeContext.Resource.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -12456,7 +12979,7 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext.Resource other)
           location_ = other.location_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -12471,113 +12994,18 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.rpc.context.AttributeContext.Resource parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  service_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  name_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 18
-              case 26:
-                {
-                  type_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 26
-              case 34:
-                {
-                  com.google.protobuf.MapEntry labels__ =
-                      input.readMessage(
-                          LabelsDefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableLabels()
-                      .getMutableMap()
-                      .put(labels__.getKey(), labels__.getValue());
-                  break;
-                } // case 34
-              case 42:
-                {
-                  uid_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 42
-              case 50:
-                {
-                  com.google.protobuf.MapEntry annotations__ =
-                      input.readMessage(
-                          AnnotationsDefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-                  internalGetMutableAnnotations()
-                      .getMutableMap()
-                      .put(annotations__.getKey(), annotations__.getValue());
-                  break;
-                } // case 50
-              case 58:
-                {
-                  displayName_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 58
-              case 66:
-                {
-                  input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 66
-              case 74:
-                {
-                  input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 74
-              case 82:
-                {
-                  input.readMessage(getDeleteTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 82
-              case 90:
-                {
-                  etag_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 90
-              case 98:
-                {
-                  location_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 98
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.rpc.context.AttributeContext.Resource) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -14513,19 +14941,7 @@ public Resource parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Resource(input, extensionRegistry);
           }
         };
 
@@ -15034,7 +15450,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < extensions_.size(); i++) {
       output.writeMessage(8, extensions_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -15067,7 +15483,7 @@ public int getSerializedSize() {
     for (int i = 0; i < extensions_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, extensions_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -15111,7 +15527,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getApi().equals(other.getApi())) return false;
     }
     if (!getExtensionsList().equals(other.getExtensionsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -15154,7 +15570,7 @@ public int hashCode() {
       hash = (37 * hash) + EXTENSIONS_FIELD_NUMBER;
       hash = (53 * hash) + getExtensionsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -15296,10 +15712,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.rpc.context.AttributeContext.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getExtensionsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -15349,11 +15774,10 @@ public Builder clear() {
       }
       if (extensionsBuilder_ == null) {
         extensions_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        extensions_ = null;
         extensionsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -15523,7 +15947,7 @@ public Builder mergeFrom(com.google.rpc.context.AttributeContext other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -15538,85 +15962,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.rpc.context.AttributeContext parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getSourceFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getDestinationFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(getRequestFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            case 34:
-              {
-                input.readMessage(getResponseFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 34
-            case 42:
-              {
-                input.readMessage(getResourceFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 42
-            case 50:
-              {
-                input.readMessage(getApiFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 50
-            case 58:
-              {
-                input.readMessage(getOriginFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 58
-            case 66:
-              {
-                com.google.protobuf.Any m =
-                    input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry);
-                if (extensionsBuilder_ == null) {
-                  ensureExtensionsIsMutable();
-                  extensions_.add(m);
-                } else {
-                  extensionsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 66
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.rpc.context.AttributeContext) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -17447,18 +17803,7 @@ public AttributeContext parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new AttributeContext(input, extensionRegistry);
         }
       };
 
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 e3cd6c09c2..1eaa5185cd 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
@@ -54,6 +54,92 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private AuditContext(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              auditLog_ = input.readBytes();
+              break;
+            }
+          case 18:
+            {
+              com.google.protobuf.Struct.Builder subBuilder = null;
+              if (scrubbedRequest_ != null) {
+                subBuilder = scrubbedRequest_.toBuilder();
+              }
+              scrubbedRequest_ =
+                  input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(scrubbedRequest_);
+                scrubbedRequest_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 26:
+            {
+              com.google.protobuf.Struct.Builder subBuilder = null;
+              if (scrubbedResponse_ != null) {
+                subBuilder = scrubbedResponse_.toBuilder();
+              }
+              scrubbedResponse_ =
+                  input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(scrubbedResponse_);
+                scrubbedResponse_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 32:
+            {
+              scrubbedResponseItemCount_ = input.readInt32();
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              targetResource_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.rpc.context.AuditContextProto
         .internal_static_google_rpc_context_AuditContext_descriptor;
@@ -307,7 +393,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(targetResource_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 5, targetResource_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -331,7 +417,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(targetResource_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, targetResource_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -357,7 +443,7 @@ public boolean equals(final java.lang.Object obj) {
     }
     if (getScrubbedResponseItemCount() != other.getScrubbedResponseItemCount()) return false;
     if (!getTargetResource().equals(other.getTargetResource())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -382,7 +468,7 @@ public int hashCode() {
     hash = (53 * hash) + getScrubbedResponseItemCount();
     hash = (37 * hash) + TARGET_RESOURCE_FIELD_NUMBER;
     hash = (53 * hash) + getTargetResource().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -511,10 +597,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.rpc.context.AuditContext.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -642,7 +735,7 @@ public Builder mergeFrom(com.google.rpc.context.AuditContext other) {
         targetResource_ = other.targetResource_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -657,62 +750,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.rpc.context.AuditContext parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                auditLog_ = input.readBytes();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getScrubbedRequestFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(
-                    getScrubbedResponseFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            case 32:
-              {
-                scrubbedResponseItemCount_ = input.readInt32();
-
-                break;
-              } // case 32
-            case 42:
-              {
-                targetResource_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 42
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.rpc.context.AuditContext) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1414,18 +1462,7 @@ public AuditContext parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new AuditContext(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Channel.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Channel.java
index 4a828a2c0f..fee72809ca 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Channel.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Channel.java
@@ -52,6 +52,45 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Channel(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.shopping.type.TypesProto
         .internal_static_google_shopping_type_Channel_descriptor;
@@ -239,7 +278,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -248,7 +287,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -263,7 +302,7 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.shopping.type.Channel other = (com.google.shopping.type.Channel) obj;
 
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -274,7 +313,7 @@ public int hashCode() {
     }
     int hash = 41;
     hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -404,10 +443,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.shopping.type.Channel.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -488,7 +534,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
     public Builder mergeFrom(com.google.shopping.type.Channel other) {
       if (other == com.google.shopping.type.Channel.getDefaultInstance()) return this;
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -503,31 +549,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.shopping.type.Channel parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.shopping.type.Channel) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -563,18 +595,7 @@ public Channel parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Channel(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/CustomAttribute.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/CustomAttribute.java
index 775405f427..5fca857767 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/CustomAttribute.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/CustomAttribute.java
@@ -56,6 +56,74 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CustomAttribute(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              bitField0_ |= 0x00000001;
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              bitField0_ |= 0x00000002;
+              value_ = s;
+              break;
+            }
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                groupValues_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              groupValues_.add(
+                  input.readMessage(
+                      com.google.shopping.type.CustomAttribute.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000004) != 0)) {
+        groupValues_ = java.util.Collections.unmodifiableList(groupValues_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.shopping.type.TypesProto
         .internal_static_google_shopping_type_CustomAttribute_descriptor;
@@ -311,7 +379,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < groupValues_.size(); i++) {
       output.writeMessage(3, groupValues_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -329,7 +397,7 @@ public int getSerializedSize() {
     for (int i = 0; i < groupValues_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, groupValues_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -353,7 +421,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getValue().equals(other.getValue())) return false;
     }
     if (!getGroupValuesList().equals(other.getGroupValuesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -376,7 +444,7 @@ public int hashCode() {
       hash = (37 * hash) + GROUP_VALUES_FIELD_NUMBER;
       hash = (53 * hash) + getGroupValuesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -507,10 +575,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.shopping.type.CustomAttribute.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getGroupValuesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -522,11 +599,10 @@ public Builder clear() {
       bitField0_ = (bitField0_ & ~0x00000002);
       if (groupValuesBuilder_ == null) {
         groupValues_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000004);
       } else {
-        groupValues_ = null;
         groupValuesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000004);
       return this;
     }
 
@@ -660,7 +736,7 @@ public Builder mergeFrom(com.google.shopping.type.CustomAttribute other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -675,56 +751,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.shopping.type.CustomAttribute parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
-                break;
-              } // case 10
-            case 18:
-              {
-                value_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
-                break;
-              } // case 18
-            case 26:
-              {
-                com.google.shopping.type.CustomAttribute m =
-                    input.readMessage(
-                        com.google.shopping.type.CustomAttribute.parser(), extensionRegistry);
-                if (groupValuesBuilder_ == null) {
-                  ensureGroupValuesIsMutable();
-                  groupValues_.add(m);
-                } else {
-                  groupValuesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.shopping.type.CustomAttribute) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1406,18 +1443,7 @@ public CustomAttribute parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new CustomAttribute(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Destination.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Destination.java
index 8ea0c18277..ced675bf0f 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Destination.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Destination.java
@@ -53,6 +53,45 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Destination(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.shopping.type.TypesProto
         .internal_static_google_shopping_type_Destination_descriptor;
@@ -339,7 +378,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -348,7 +387,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -363,7 +402,7 @@ public boolean equals(final java.lang.Object obj) {
     }
     com.google.shopping.type.Destination other = (com.google.shopping.type.Destination) obj;
 
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -374,7 +413,7 @@ public int hashCode() {
     }
     int hash = 41;
     hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -505,10 +544,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.shopping.type.Destination.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -589,7 +635,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
     public Builder mergeFrom(com.google.shopping.type.Destination other) {
       if (other == com.google.shopping.type.Destination.getDefaultInstance()) return this;
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -604,31 +650,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.shopping.type.Destination parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.shopping.type.Destination) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -664,18 +696,7 @@ public Destination parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Destination(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Price.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Price.java
index a09438327b..795ba38698 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Price.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Price.java
@@ -53,6 +53,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Price(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              bitField0_ |= 0x00000001;
+              amountMicros_ = input.readInt64();
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              bitField0_ |= 0x00000002;
+              currencyCode_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.shopping.type.TypesProto
         .internal_static_google_shopping_type_Price_descriptor;
@@ -197,7 +250,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (((bitField0_ & 0x00000002) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, currencyCode_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -212,7 +265,7 @@ public int getSerializedSize() {
     if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, currencyCode_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -235,7 +288,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasCurrencyCode()) {
       if (!getCurrencyCode().equals(other.getCurrencyCode())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -254,7 +307,7 @@ public int hashCode() {
       hash = (37 * hash) + CURRENCY_CODE_FIELD_NUMBER;
       hash = (53 * hash) + getCurrencyCode().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -382,10 +435,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.shopping.type.Price.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -489,7 +549,7 @@ public Builder mergeFrom(com.google.shopping.type.Price other) {
         currencyCode_ = other.currencyCode_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -504,43 +564,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.shopping.type.Price parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                amountMicros_ = input.readInt64();
-                bitField0_ |= 0x00000001;
-                break;
-              } // case 8
-            case 18:
-              {
-                currencyCode_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000002;
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.shopping.type.Price) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -789,18 +823,7 @@ public Price parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Price(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/ReportingContext.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/ReportingContext.java
index 2158892719..985ac2c148 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/ReportingContext.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/ReportingContext.java
@@ -56,6 +56,45 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ReportingContext(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.shopping.type.TypesProto
         .internal_static_google_shopping_type_ReportingContext_descriptor;
@@ -542,7 +581,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -551,7 +590,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -567,7 +606,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.shopping.type.ReportingContext other =
         (com.google.shopping.type.ReportingContext) obj;
 
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -578,7 +617,7 @@ public int hashCode() {
     }
     int hash = 41;
     hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -713,10 +752,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.shopping.type.ReportingContext.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -798,7 +844,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
     public Builder mergeFrom(com.google.shopping.type.ReportingContext other) {
       if (other == com.google.shopping.type.ReportingContext.getDefaultInstance()) return this;
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -813,31 +859,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.shopping.type.ReportingContext parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.shopping.type.ReportingContext) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -873,18 +905,7 @@ public ReportingContext parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ReportingContext(input, extensionRegistry);
         }
       };
 
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Weight.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Weight.java
index 6dcb52829e..b24d99e9aa 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Weight.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/shopping/type/Weight.java
@@ -53,6 +53,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Weight(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              bitField0_ |= 0x00000001;
+              amountMicros_ = input.readInt64();
+              break;
+            }
+          case 16:
+            {
+              int rawValue = input.readEnum();
+
+              unit_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.shopping.type.TypesProto
         .internal_static_google_shopping_type_Weight_descriptor;
@@ -330,7 +383,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (unit_ != com.google.shopping.type.Weight.WeightUnit.WEIGHT_UNIT_UNSPECIFIED.getNumber()) {
       output.writeEnum(2, unit_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -345,7 +398,7 @@ public int getSerializedSize() {
     if (unit_ != com.google.shopping.type.Weight.WeightUnit.WEIGHT_UNIT_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, unit_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -365,7 +418,7 @@ public boolean equals(final java.lang.Object obj) {
       if (getAmountMicros() != other.getAmountMicros()) return false;
     }
     if (unit_ != other.unit_) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -382,7 +435,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + UNIT_FIELD_NUMBER;
     hash = (53 * hash) + unit_;
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -510,10 +563,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.shopping.type.Weight.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -612,7 +672,7 @@ public Builder mergeFrom(com.google.shopping.type.Weight other) {
       if (other.unit_ != 0) {
         setUnitValue(other.getUnitValue());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -627,43 +687,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.shopping.type.Weight parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                amountMicros_ = input.readInt64();
-                bitField0_ |= 0x00000001;
-                break;
-              } // case 8
-            case 16:
-              {
-                unit_ = input.readEnum();
-
-                break;
-              } // case 16
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.shopping.type.Weight) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -889,18 +923,7 @@ public Weight parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Weight(input, extensionRegistry);
         }
       };
 
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 5b6235749e..09dba98830 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
@@ -157,6 +157,75 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Color(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 13:
+            {
+              red_ = input.readFloat();
+              break;
+            }
+          case 21:
+            {
+              green_ = input.readFloat();
+              break;
+            }
+          case 29:
+            {
+              blue_ = input.readFloat();
+              break;
+            }
+          case 34:
+            {
+              com.google.protobuf.FloatValue.Builder subBuilder = null;
+              if (alpha_ != null) {
+                subBuilder = alpha_.toBuilder();
+              }
+              alpha_ =
+                  input.readMessage(com.google.protobuf.FloatValue.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(alpha_);
+                alpha_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.ColorProto.internal_static_google_type_Color_descriptor;
   }
@@ -325,7 +394,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (alpha_ != null) {
       output.writeMessage(4, getAlpha());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -346,7 +415,7 @@ public int getSerializedSize() {
     if (alpha_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getAlpha());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -371,7 +440,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasAlpha()) {
       if (!getAlpha().equals(other.getAlpha())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -392,7 +461,7 @@ public int hashCode() {
       hash = (37 * hash) + ALPHA_FIELD_NUMBER;
       hash = (53 * hash) + getAlpha().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -624,10 +693,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.type.Color.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -739,7 +815,7 @@ public Builder mergeFrom(com.google.type.Color other) {
       if (other.hasAlpha()) {
         mergeAlpha(other.getAlpha());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -754,55 +830,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.type.Color parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 13:
-              {
-                red_ = input.readFloat();
-
-                break;
-              } // case 13
-            case 21:
-              {
-                green_ = input.readFloat();
-
-                break;
-              } // case 21
-            case 29:
-              {
-                blue_ = input.readFloat();
-
-                break;
-              } // case 29
-            case 34:
-              {
-                input.readMessage(getAlphaFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.type.Color) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1263,18 +1301,7 @@ public Color parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Color(input, extensionRegistry);
         }
       };
 
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 57a933f815..8fe981b61f 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
@@ -61,6 +61,60 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Date(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              year_ = input.readInt32();
+              break;
+            }
+          case 16:
+            {
+              month_ = input.readInt32();
+              break;
+            }
+          case 24:
+            {
+              day_ = input.readInt32();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.DateProto.internal_static_google_type_Date_descriptor;
   }
@@ -157,7 +211,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (day_ != 0) {
       output.writeInt32(3, day_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -175,7 +229,7 @@ public int getSerializedSize() {
     if (day_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(3, day_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -193,7 +247,7 @@ public boolean equals(final java.lang.Object obj) {
     if (getYear() != other.getYear()) return false;
     if (getMonth() != other.getMonth()) return false;
     if (getDay() != other.getDay()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -210,7 +264,7 @@ public int hashCode() {
     hash = (53 * hash) + getMonth();
     hash = (37 * hash) + DAY_FIELD_NUMBER;
     hash = (53 * hash) + getDay();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -346,10 +400,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.type.Date.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -447,7 +508,7 @@ public Builder mergeFrom(com.google.type.Date other) {
       if (other.getDay() != 0) {
         setDay(other.getDay());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -462,49 +523,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.type.Date parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                year_ = input.readInt32();
-
-                break;
-              } // case 8
-            case 16:
-              {
-                month_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 24:
-              {
-                day_ = input.readInt32();
-
-                break;
-              } // case 24
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.type.Date) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -717,18 +746,7 @@ public Date parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Date(input, extensionRegistry);
         }
       };
 
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 799e10a4a8..82caa53b85 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
@@ -68,6 +68,109 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DateTime(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              year_ = input.readInt32();
+              break;
+            }
+          case 16:
+            {
+              month_ = input.readInt32();
+              break;
+            }
+          case 24:
+            {
+              day_ = input.readInt32();
+              break;
+            }
+          case 32:
+            {
+              hours_ = input.readInt32();
+              break;
+            }
+          case 40:
+            {
+              minutes_ = input.readInt32();
+              break;
+            }
+          case 48:
+            {
+              seconds_ = input.readInt32();
+              break;
+            }
+          case 56:
+            {
+              nanos_ = input.readInt32();
+              break;
+            }
+          case 66:
+            {
+              com.google.protobuf.Duration.Builder subBuilder = null;
+              if (timeOffsetCase_ == 8) {
+                subBuilder = ((com.google.protobuf.Duration) timeOffset_).toBuilder();
+              }
+              timeOffset_ =
+                  input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.protobuf.Duration) timeOffset_);
+                timeOffset_ = subBuilder.buildPartial();
+              }
+              timeOffsetCase_ = 8;
+              break;
+            }
+          case 74:
+            {
+              com.google.type.TimeZone.Builder subBuilder = null;
+              if (timeOffsetCase_ == 9) {
+                subBuilder = ((com.google.type.TimeZone) timeOffset_).toBuilder();
+              }
+              timeOffset_ = input.readMessage(com.google.type.TimeZone.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.type.TimeZone) timeOffset_);
+                timeOffset_ = subBuilder.buildPartial();
+              }
+              timeOffsetCase_ = 9;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.DateTimeProto.internal_static_google_type_DateTime_descriptor;
   }
@@ -422,7 +525,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (timeOffsetCase_ == 9) {
       output.writeMessage(9, (com.google.type.TimeZone) timeOffset_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -462,7 +565,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               9, (com.google.type.TimeZone) timeOffset_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -495,7 +598,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -532,7 +635,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -675,10 +778,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.type.DateTime.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -698,12 +808,6 @@ public Builder clear() {
 
       nanos_ = 0;
 
-      if (utcOffsetBuilder_ != null) {
-        utcOffsetBuilder_.clear();
-      }
-      if (timeZoneBuilder_ != null) {
-        timeZoneBuilder_.clear();
-      }
       timeOffsetCase_ = 0;
       timeOffset_ = null;
       return this;
@@ -839,7 +943,7 @@ public Builder mergeFrom(com.google.type.DateTime other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -854,85 +958,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.type.DateTime parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                year_ = input.readInt32();
-
-                break;
-              } // case 8
-            case 16:
-              {
-                month_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 24:
-              {
-                day_ = input.readInt32();
-
-                break;
-              } // case 24
-            case 32:
-              {
-                hours_ = input.readInt32();
-
-                break;
-              } // case 32
-            case 40:
-              {
-                minutes_ = input.readInt32();
-
-                break;
-              } // case 40
-            case 48:
-              {
-                seconds_ = input.readInt32();
-
-                break;
-              } // case 48
-            case 56:
-              {
-                nanos_ = input.readInt32();
-
-                break;
-              } // case 56
-            case 66:
-              {
-                input.readMessage(getUtcOffsetFieldBuilder().getBuilder(), extensionRegistry);
-                timeOffsetCase_ = 8;
-                break;
-              } // case 66
-            case 74:
-              {
-                input.readMessage(getTimeZoneFieldBuilder().getBuilder(), extensionRegistry);
-                timeOffsetCase_ = 9;
-                break;
-              } // case 74
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.type.DateTime) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1832,18 +1868,7 @@ public DateTime parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DateTime(input, extensionRegistry);
         }
       };
 
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 0085130f71..f8abe68d60 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
@@ -58,6 +58,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Decimal(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              value_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.DecimalProto.internal_static_google_type_Decimal_descriptor;
   }
@@ -224,7 +270,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(value_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, value_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -236,7 +282,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(value_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, value_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -252,7 +298,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.type.Decimal other = (com.google.type.Decimal) obj;
 
     if (!getValue().equals(other.getValue())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -265,7 +311,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + VALUE_FIELD_NUMBER;
     hash = (53 * hash) + getValue().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -396,10 +442,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.type.Decimal.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -486,7 +539,7 @@ public Builder mergeFrom(com.google.type.Decimal other) {
         value_ = other.value_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -501,37 +554,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.type.Decimal parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                value_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.type.Decimal) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -893,18 +926,7 @@ public Decimal parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Decimal(input, extensionRegistry);
         }
       };
 
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 b471df02e5..8d649c4bf2 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
@@ -77,6 +77,73 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Expr(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              expression_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              title_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              description_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              location_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.ExprProto.internal_static_google_type_Expr_descriptor;
   }
@@ -329,7 +396,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(location_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, location_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -350,7 +417,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(location_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, location_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -369,7 +436,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getTitle().equals(other.getTitle())) return false;
     if (!getDescription().equals(other.getDescription())) return false;
     if (!getLocation().equals(other.getLocation())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -388,7 +455,7 @@ public int hashCode() {
     hash = (53 * hash) + getDescription().hashCode();
     hash = (37 * hash) + LOCATION_FIELD_NUMBER;
     hash = (53 * hash) + getLocation().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -535,10 +602,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.type.Expr.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -646,7 +720,7 @@ public Builder mergeFrom(com.google.type.Expr other) {
         location_ = other.location_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -661,55 +735,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.type.Expr parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                expression_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                title_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                description_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                location_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.type.Expr) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1214,18 +1250,7 @@ public Expr parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Expr(input, extensionRegistry);
         }
       };
 
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 d25ec8d849..84c8f188ba 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
@@ -51,6 +51,55 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Fraction(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              numerator_ = input.readInt64();
+              break;
+            }
+          case 16:
+            {
+              denominator_ = input.readInt64();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.FractionProto.internal_static_google_type_Fraction_descriptor;
   }
@@ -122,7 +171,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (denominator_ != 0L) {
       output.writeInt64(2, denominator_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -137,7 +186,7 @@ public int getSerializedSize() {
     if (denominator_ != 0L) {
       size += com.google.protobuf.CodedOutputStream.computeInt64Size(2, denominator_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -154,7 +203,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (getNumerator() != other.getNumerator()) return false;
     if (getDenominator() != other.getDenominator()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -169,7 +218,7 @@ public int hashCode() {
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getNumerator());
     hash = (37 * hash) + DENOMINATOR_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getDenominator());
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -295,10 +344,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.type.Fraction.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -390,7 +446,7 @@ public Builder mergeFrom(com.google.type.Fraction other) {
       if (other.getDenominator() != 0L) {
         setDenominator(other.getDenominator());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -405,43 +461,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.type.Fraction parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                numerator_ = input.readInt64();
-
-                break;
-              } // case 8
-            case 16:
-              {
-                denominator_ = input.readInt64();
-
-                break;
-              } // case 16
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.type.Fraction) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -590,18 +620,7 @@ public Fraction parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Fraction(input, extensionRegistry);
         }
       };
 
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 54fe2391ed..3ce5cadcee 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
@@ -55,6 +55,75 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Interval(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (startTime_ != null) {
+                subBuilder = startTime_.toBuilder();
+              }
+              startTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(startTime_);
+                startTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (endTime_ != null) {
+                subBuilder = endTime_.toBuilder();
+              }
+              endTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(endTime_);
+                endTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.IntervalProto.internal_static_google_type_Interval_descriptor;
   }
@@ -197,7 +266,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (endTime_ != null) {
       output.writeMessage(2, getEndTime());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -212,7 +281,7 @@ public int getSerializedSize() {
     if (endTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getEndTime());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -235,7 +304,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasEndTime()) {
       if (!getEndTime().equals(other.getEndTime())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -254,7 +323,7 @@ public int hashCode() {
       hash = (37 * hash) + END_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getEndTime().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -384,10 +453,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.type.Interval.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -495,7 +571,7 @@ public Builder mergeFrom(com.google.type.Interval other) {
       if (other.hasEndTime()) {
         mergeEndTime(other.getEndTime());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -510,43 +586,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.type.Interval parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.type.Interval) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -994,18 +1044,7 @@ public Interval parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Interval(input, extensionRegistry);
         }
       };
 
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 d291afa98b..24da4a9a64 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
@@ -55,6 +55,55 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private LatLng(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 9:
+            {
+              latitude_ = input.readDouble();
+              break;
+            }
+          case 17:
+            {
+              longitude_ = input.readDouble();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.LatLngProto.internal_static_google_type_LatLng_descriptor;
   }
@@ -125,7 +174,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (java.lang.Double.doubleToRawLongBits(longitude_) != 0) {
       output.writeDouble(2, longitude_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -140,7 +189,7 @@ public int getSerializedSize() {
     if (java.lang.Double.doubleToRawLongBits(longitude_) != 0) {
       size += com.google.protobuf.CodedOutputStream.computeDoubleSize(2, longitude_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -159,7 +208,7 @@ public boolean equals(final java.lang.Object obj) {
         != java.lang.Double.doubleToLongBits(other.getLatitude())) return false;
     if (java.lang.Double.doubleToLongBits(getLongitude())
         != java.lang.Double.doubleToLongBits(other.getLongitude())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -180,7 +229,7 @@ public int hashCode() {
         (53 * hash)
             + com.google.protobuf.Internal.hashLong(
                 java.lang.Double.doubleToLongBits(getLongitude()));
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -310,10 +359,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.type.LatLng.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -405,7 +461,7 @@ public Builder mergeFrom(com.google.type.LatLng other) {
       if (other.getLongitude() != 0D) {
         setLongitude(other.getLongitude());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -420,43 +476,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.type.LatLng parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 9:
-              {
-                latitude_ = input.readDouble();
-
-                break;
-              } // case 9
-            case 17:
-              {
-                longitude_ = input.readDouble();
-
-                break;
-              } // case 17
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.type.LatLng) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -602,18 +632,7 @@ public LatLng parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new LatLng(input, extensionRegistry);
         }
       };
 
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 6a0d759941..919e278e74 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
@@ -54,6 +54,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private LocalizedText(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              text_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              languageCode_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.LocalizedTextProto.internal_static_google_type_LocalizedText_descriptor;
   }
@@ -193,7 +246,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(languageCode_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, languageCode_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -208,7 +261,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(languageCode_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, languageCode_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -225,7 +278,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getText().equals(other.getText())) return false;
     if (!getLanguageCode().equals(other.getLanguageCode())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -240,7 +293,7 @@ public int hashCode() {
     hash = (53 * hash) + getText().hashCode();
     hash = (37 * hash) + LANGUAGE_CODE_FIELD_NUMBER;
     hash = (53 * hash) + getLanguageCode().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -368,10 +421,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.type.LocalizedText.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -466,7 +526,7 @@ public Builder mergeFrom(com.google.type.LocalizedText other) {
         languageCode_ = other.languageCode_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -481,43 +541,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.type.LocalizedText parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                text_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                languageCode_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.type.LocalizedText) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -785,18 +819,7 @@ public LocalizedText parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new LocalizedText(input, extensionRegistry);
         }
       };
 
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 490e752dcf..0cc5b30386 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
@@ -53,6 +53,62 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Money(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              currencyCode_ = s;
+              break;
+            }
+          case 16:
+            {
+              units_ = input.readInt64();
+              break;
+            }
+          case 24:
+            {
+              nanos_ = input.readInt32();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.MoneyProto.internal_static_google_type_Money_descriptor;
   }
@@ -183,7 +239,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (nanos_ != 0) {
       output.writeInt32(3, nanos_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -201,7 +257,7 @@ public int getSerializedSize() {
     if (nanos_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(3, nanos_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -219,7 +275,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getCurrencyCode().equals(other.getCurrencyCode())) return false;
     if (getUnits() != other.getUnits()) return false;
     if (getNanos() != other.getNanos()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -236,7 +292,7 @@ public int hashCode() {
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getUnits());
     hash = (37 * hash) + NANOS_FIELD_NUMBER;
     hash = (53 * hash) + getNanos();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -362,10 +418,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.type.Money.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -464,7 +527,7 @@ public Builder mergeFrom(com.google.type.Money other) {
       if (other.getNanos() != 0) {
         setNanos(other.getNanos());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -479,49 +542,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.type.Money parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                currencyCode_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                units_ = input.readInt64();
-
-                break;
-              } // case 16
-            case 24:
-              {
-                nanos_ = input.readInt32();
-
-                break;
-              } // case 24
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.type.Money) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -796,18 +827,7 @@ public Money parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Money(input, extensionRegistry);
         }
       };
 
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 75e2e25a36..8e9bcb02b4 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
@@ -71,6 +71,75 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PhoneNumber(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              kindCase_ = 1;
+              kind_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.type.PhoneNumber.ShortCode.Builder subBuilder = null;
+              if (kindCase_ == 2) {
+                subBuilder = ((com.google.type.PhoneNumber.ShortCode) kind_).toBuilder();
+              }
+              kind_ =
+                  input.readMessage(
+                      com.google.type.PhoneNumber.ShortCode.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.type.PhoneNumber.ShortCode) kind_);
+                kind_ = subBuilder.buildPartial();
+              }
+              kindCase_ = 2;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              extension_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.PhoneNumberProto.internal_static_google_type_PhoneNumber_descriptor;
   }
@@ -193,6 +262,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private ShortCode(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                regionCode_ = s;
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                number_ = s;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.type.PhoneNumberProto
           .internal_static_google_type_PhoneNumber_ShortCode_descriptor;
@@ -338,7 +460,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(number_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, number_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -353,7 +475,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(number_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, number_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -370,7 +492,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getRegionCode().equals(other.getRegionCode())) return false;
       if (!getNumber().equals(other.getNumber())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -385,7 +507,7 @@ public int hashCode() {
       hash = (53 * hash) + getRegionCode().hashCode();
       hash = (37 * hash) + NUMBER_FIELD_NUMBER;
       hash = (53 * hash) + getNumber().hashCode();
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -524,10 +646,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.type.PhoneNumber.ShortCode.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -625,7 +754,7 @@ public Builder mergeFrom(com.google.type.PhoneNumber.ShortCode other) {
           number_ = other.number_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -640,43 +769,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.type.PhoneNumber.ShortCode parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  regionCode_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  number_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 18
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.type.PhoneNumber.ShortCode) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -955,19 +1058,7 @@ public ShortCode parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new ShortCode(input, extensionRegistry);
           }
         };
 
@@ -1291,7 +1382,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(extension_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, extension_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1311,7 +1402,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(extension_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, extension_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1338,7 +1429,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1363,7 +1454,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1508,18 +1599,22 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.type.PhoneNumber.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (shortCodeBuilder_ != null) {
-        shortCodeBuilder_.clear();
-      }
       extension_ = "";
 
       kindCase_ = 0;
@@ -1632,7 +1727,7 @@ public Builder mergeFrom(com.google.type.PhoneNumber other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1647,50 +1742,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.type.PhoneNumber parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                kindCase_ = 1;
-                kind_ = s;
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getShortCodeFieldBuilder().getBuilder(), extensionRegistry);
-                kindCase_ = 2;
-                break;
-              } // case 18
-            case 26:
-              {
-                extension_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.type.PhoneNumber) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2330,18 +2392,7 @@ public PhoneNumber parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PhoneNumber(input, extensionRegistry);
         }
       };
 
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 4edfe8ec39..fc0cbf3b4b 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
@@ -75,6 +75,133 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PostalAddress(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              revision_ = input.readInt32();
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              regionCode_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              languageCode_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              postalCode_ = s;
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              sortingCode_ = s;
+              break;
+            }
+          case 50:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              administrativeArea_ = s;
+              break;
+            }
+          case 58:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              locality_ = s;
+              break;
+            }
+          case 66:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              sublocality_ = s;
+              break;
+            }
+          case 74:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                addressLines_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              addressLines_.add(s);
+              break;
+            }
+          case 82:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                recipients_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              recipients_.add(s);
+              break;
+            }
+          case 90:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              organization_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        addressLines_ = addressLines_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        recipients_ = recipients_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.PostalAddressProto.internal_static_google_type_PostalAddress_descriptor;
   }
@@ -834,7 +961,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(organization_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 11, organization_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -886,7 +1013,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(organization_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, organization_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -912,7 +1039,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getAddressLinesList().equals(other.getAddressLinesList())) return false;
     if (!getRecipientsList().equals(other.getRecipientsList())) return false;
     if (!getOrganization().equals(other.getOrganization())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -949,7 +1076,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + ORGANIZATION_FIELD_NUMBER;
     hash = (53 * hash) + getOrganization().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1090,10 +1217,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.type.PostalAddress.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1271,7 +1405,7 @@ public Builder mergeFrom(com.google.type.PostalAddress other) {
         organization_ = other.organization_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1286,99 +1420,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.type.PostalAddress parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                revision_ = input.readInt32();
-
-                break;
-              } // case 8
-            case 18:
-              {
-                regionCode_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                languageCode_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                postalCode_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            case 42:
-              {
-                sortingCode_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 42
-            case 50:
-              {
-                administrativeArea_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 50
-            case 58:
-              {
-                locality_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 58
-            case 66:
-              {
-                sublocality_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 66
-            case 74:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureAddressLinesIsMutable();
-                addressLines_.add(s);
-                break;
-              } // case 74
-            case 82:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureRecipientsIsMutable();
-                recipients_.add(s);
-                break;
-              } // case 82
-            case 90:
-              {
-                organization_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 90
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.type.PostalAddress) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -3049,18 +3101,7 @@ public PostalAddress parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PostalAddress(input, extensionRegistry);
         }
       };
 
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 e0b9ee9980..9d06afc35b 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
@@ -93,6 +93,65 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Quaternion(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 9:
+            {
+              x_ = input.readDouble();
+              break;
+            }
+          case 17:
+            {
+              y_ = input.readDouble();
+              break;
+            }
+          case 25:
+            {
+              z_ = input.readDouble();
+              break;
+            }
+          case 33:
+            {
+              w_ = input.readDouble();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.QuaternionProto.internal_static_google_type_Quaternion_descriptor;
   }
@@ -207,7 +266,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (java.lang.Double.doubleToRawLongBits(w_) != 0) {
       output.writeDouble(4, w_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -228,7 +287,7 @@ public int getSerializedSize() {
     if (java.lang.Double.doubleToRawLongBits(w_) != 0) {
       size += com.google.protobuf.CodedOutputStream.computeDoubleSize(4, w_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -251,7 +310,7 @@ public boolean equals(final java.lang.Object obj) {
         != java.lang.Double.doubleToLongBits(other.getZ())) return false;
     if (java.lang.Double.doubleToLongBits(getW())
         != java.lang.Double.doubleToLongBits(other.getW())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -278,7 +337,7 @@ public int hashCode() {
     hash =
         (53 * hash)
             + com.google.protobuf.Internal.hashLong(java.lang.Double.doubleToLongBits(getW()));
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -447,10 +506,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.type.Quaternion.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -554,7 +620,7 @@ public Builder mergeFrom(com.google.type.Quaternion other) {
       if (other.getW() != 0D) {
         setW(other.getW());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -569,55 +635,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.type.Quaternion parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 9:
-              {
-                x_ = input.readDouble();
-
-                break;
-              } // case 9
-            case 17:
-              {
-                y_ = input.readDouble();
-
-                break;
-              } // case 17
-            case 25:
-              {
-                z_ = input.readDouble();
-
-                break;
-              } // case 25
-            case 33:
-              {
-                w_ = input.readDouble();
-
-                break;
-              } // case 33
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.type.Quaternion) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -873,18 +901,7 @@ public Quaternion parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Quaternion(input, extensionRegistry);
         }
       };
 
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 40ca8a2c9e..37bdaa8442 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
@@ -54,6 +54,65 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private TimeOfDay(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              hours_ = input.readInt32();
+              break;
+            }
+          case 16:
+            {
+              minutes_ = input.readInt32();
+              break;
+            }
+          case 24:
+            {
+              seconds_ = input.readInt32();
+              break;
+            }
+          case 32:
+            {
+              nanos_ = input.readInt32();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.TimeOfDayProto.internal_static_google_type_TimeOfDay_descriptor;
   }
@@ -170,7 +229,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (nanos_ != 0) {
       output.writeInt32(4, nanos_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -191,7 +250,7 @@ public int getSerializedSize() {
     if (nanos_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(4, nanos_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -210,7 +269,7 @@ public boolean equals(final java.lang.Object obj) {
     if (getMinutes() != other.getMinutes()) return false;
     if (getSeconds() != other.getSeconds()) return false;
     if (getNanos() != other.getNanos()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -229,7 +288,7 @@ public int hashCode() {
     hash = (53 * hash) + getSeconds();
     hash = (37 * hash) + NANOS_FIELD_NUMBER;
     hash = (53 * hash) + getNanos();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -358,10 +417,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.type.TimeOfDay.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -465,7 +531,7 @@ public Builder mergeFrom(com.google.type.TimeOfDay other) {
       if (other.getNanos() != 0) {
         setNanos(other.getNanos());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -480,55 +546,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.type.TimeOfDay parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                hours_ = input.readInt32();
-
-                break;
-              } // case 8
-            case 16:
-              {
-                minutes_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 24:
-              {
-                seconds_ = input.readInt32();
-
-                break;
-              } // case 24
-            case 32:
-              {
-                nanos_ = input.readInt32();
-
-                break;
-              } // case 32
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.type.TimeOfDay) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -790,18 +818,7 @@ public TimeOfDay parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new TimeOfDay(input, extensionRegistry);
         }
       };
 
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 8ab2cb3144..dd0db57058 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
@@ -55,6 +55,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private TimeZone(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              id_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              version_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.type.DateTimeProto.internal_static_google_type_TimeZone_descriptor;
   }
@@ -189,7 +242,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(version_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, version_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -204,7 +257,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(version_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, version_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -221,7 +274,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getId().equals(other.getId())) return false;
     if (!getVersion().equals(other.getVersion())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -236,7 +289,7 @@ public int hashCode() {
     hash = (53 * hash) + getId().hashCode();
     hash = (37 * hash) + VERSION_FIELD_NUMBER;
     hash = (53 * hash) + getVersion().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -363,10 +416,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.type.TimeZone.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -460,7 +520,7 @@ public Builder mergeFrom(com.google.type.TimeZone other) {
         version_ = other.version_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -475,43 +535,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.type.TimeZone parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                id_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                version_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.type.TimeZone) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -769,18 +803,7 @@ public TimeZone parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new TimeZone(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfig.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfig.java
index 613fb3e03e..a8aaf67c92 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfig.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfig.java
@@ -100,6 +100,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private AuditConfig(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              service_ = s;
+              break;
+            }
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                auditLogConfigs_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              auditLogConfigs_.add(
+                  input.readMessage(com.google.iam.v1.AuditLogConfig.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        auditLogConfigs_ = java.util.Collections.unmodifiableList(auditLogConfigs_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v1.PolicyProto.internal_static_google_iam_v1_AuditConfig_descriptor;
   }
@@ -262,7 +322,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < auditLogConfigs_.size(); i++) {
       output.writeMessage(3, auditLogConfigs_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -277,7 +337,7 @@ public int getSerializedSize() {
     for (int i = 0; i < auditLogConfigs_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, auditLogConfigs_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -294,7 +354,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getService().equals(other.getService())) return false;
     if (!getAuditLogConfigsList().equals(other.getAuditLogConfigsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -311,7 +371,7 @@ public int hashCode() {
       hash = (37 * hash) + AUDIT_LOG_CONFIGS_FIELD_NUMBER;
       hash = (53 * hash) + getAuditLogConfigsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -484,10 +544,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.AuditConfig.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getAuditLogConfigsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -497,11 +566,10 @@ public Builder clear() {
 
       if (auditLogConfigsBuilder_ == null) {
         auditLogConfigs_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        auditLogConfigs_ = null;
         auditLogConfigsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -618,7 +686,7 @@ public Builder mergeFrom(com.google.iam.v1.AuditConfig other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -633,49 +701,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v1.AuditConfig parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                service_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 26:
-              {
-                com.google.iam.v1.AuditLogConfig m =
-                    input.readMessage(com.google.iam.v1.AuditLogConfig.parser(), extensionRegistry);
-                if (auditLogConfigsBuilder_ == null) {
-                  ensureAuditLogConfigsIsMutable();
-                  auditLogConfigs_.add(m);
-                } else {
-                  auditLogConfigsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v1.AuditConfig) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1204,18 +1240,7 @@ public AuditConfig parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new AuditConfig(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDelta.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDelta.java
index 8c5321ae89..f3fe515ccb 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDelta.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDelta.java
@@ -57,6 +57,73 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private AuditConfigDelta(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              int rawValue = input.readEnum();
+
+              action_ = rawValue;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              service_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              exemptedMember_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              logType_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v1.PolicyProto.internal_static_google_iam_v1_AuditConfigDelta_descriptor;
   }
@@ -463,7 +530,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(logType_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, logType_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -484,7 +551,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(logType_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, logType_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -503,7 +570,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getService().equals(other.getService())) return false;
     if (!getExemptedMember().equals(other.getExemptedMember())) return false;
     if (!getLogType().equals(other.getLogType())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -522,7 +589,7 @@ public int hashCode() {
     hash = (53 * hash) + getExemptedMember().hashCode();
     hash = (37 * hash) + LOG_TYPE_FIELD_NUMBER;
     hash = (53 * hash) + getLogType().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -652,10 +719,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.AuditConfigDelta.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -763,7 +837,7 @@ public Builder mergeFrom(com.google.iam.v1.AuditConfigDelta other) {
         logType_ = other.logType_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -778,55 +852,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v1.AuditConfigDelta parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                action_ = input.readEnum();
-
-                break;
-              } // case 8
-            case 18:
-              {
-                service_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                exemptedMember_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                logType_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v1.AuditConfigDelta) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1331,18 +1367,7 @@ public AuditConfigDelta parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new AuditConfigDelta(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfig.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfig.java
index 295ed3300d..f35372d33b 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfig.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfig.java
@@ -70,6 +70,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private AuditLogConfig(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              int rawValue = input.readEnum();
+
+              logType_ = rawValue;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                exemptedMembers_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              exemptedMembers_.add(s);
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        exemptedMembers_ = exemptedMembers_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v1.PolicyProto.internal_static_google_iam_v1_AuditLogConfig_descriptor;
   }
@@ -401,7 +461,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < exemptedMembers_.size(); i++) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, exemptedMembers_.getRaw(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -421,7 +481,7 @@ public int getSerializedSize() {
       size += dataSize;
       size += 1 * getExemptedMembersList().size();
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -438,7 +498,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (logType_ != other.logType_) return false;
     if (!getExemptedMembersList().equals(other.getExemptedMembersList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -455,7 +515,7 @@ public int hashCode() {
       hash = (37 * hash) + EXEMPTED_MEMBERS_FIELD_NUMBER;
       hash = (53 * hash) + getExemptedMembersList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -599,10 +659,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.AuditLogConfig.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -706,7 +773,7 @@ public Builder mergeFrom(com.google.iam.v1.AuditLogConfig other) {
         }
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -721,44 +788,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v1.AuditLogConfig parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                logType_ = input.readEnum();
-
-                break;
-              } // case 8
-            case 18:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureExemptedMembersIsMutable();
-                exemptedMembers_.add(s);
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v1.AuditLogConfig) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1096,18 +1136,7 @@ public AuditLogConfig parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new AuditLogConfig(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Binding.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Binding.java
index 5c95b47dc3..c21ac54640 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Binding.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Binding.java
@@ -54,6 +54,80 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Binding(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              role_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                members_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              members_.add(s);
+              break;
+            }
+          case 26:
+            {
+              com.google.type.Expr.Builder subBuilder = null;
+              if (condition_ != null) {
+                subBuilder = condition_.toBuilder();
+              }
+              condition_ = input.readMessage(com.google.type.Expr.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(condition_);
+                condition_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        members_ = members_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v1.PolicyProto.internal_static_google_iam_v1_Binding_descriptor;
   }
@@ -400,7 +474,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (condition_ != null) {
       output.writeMessage(3, getCondition());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -423,7 +497,7 @@ public int getSerializedSize() {
     if (condition_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getCondition());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -444,7 +518,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasCondition()) {
       if (!getCondition().equals(other.getCondition())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -465,7 +539,7 @@ public int hashCode() {
       hash = (37 * hash) + CONDITION_FIELD_NUMBER;
       hash = (53 * hash) + getCondition().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -591,10 +665,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.Binding.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -713,7 +794,7 @@ public Builder mergeFrom(com.google.iam.v1.Binding other) {
       if (other.hasCondition()) {
         mergeCondition(other.getCondition());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -728,50 +809,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v1.Binding parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                role_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureMembersIsMutable();
-                members_.add(s);
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(getConditionFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v1.Binding) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1625,18 +1673,7 @@ public Binding parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Binding(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDelta.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDelta.java
index 42fe29a056..31bc832a9b 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDelta.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDelta.java
@@ -56,6 +56,80 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private BindingDelta(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              int rawValue = input.readEnum();
+
+              action_ = rawValue;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              role_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              member_ = s;
+              break;
+            }
+          case 34:
+            {
+              com.google.type.Expr.Builder subBuilder = null;
+              if (condition_ != null) {
+                subBuilder = condition_.toBuilder();
+              }
+              condition_ = input.readMessage(com.google.type.Expr.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(condition_);
+                condition_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v1.PolicyProto.internal_static_google_iam_v1_BindingDelta_descriptor;
   }
@@ -453,7 +527,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (condition_ != null) {
       output.writeMessage(4, getCondition());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -474,7 +548,7 @@ public int getSerializedSize() {
     if (condition_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getCondition());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -496,7 +570,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasCondition()) {
       if (!getCondition().equals(other.getCondition())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -517,7 +591,7 @@ public int hashCode() {
       hash = (37 * hash) + CONDITION_FIELD_NUMBER;
       hash = (53 * hash) + getCondition().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -645,10 +719,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.BindingDelta.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -762,7 +843,7 @@ public Builder mergeFrom(com.google.iam.v1.BindingDelta other) {
       if (other.hasCondition()) {
         mergeCondition(other.getCondition());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -777,55 +858,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v1.BindingDelta parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                action_ = input.readEnum();
-
-                break;
-              } // case 8
-            case 18:
-              {
-                role_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                member_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                input.readMessage(getConditionFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v1.BindingDelta) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1385,18 +1428,7 @@ public BindingDelta parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new BindingDelta(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequest.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequest.java
index a59dd47b79..da28e79e19 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequest.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequest.java
@@ -53,6 +53,67 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private GetIamPolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              resource_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.iam.v1.GetPolicyOptions.Builder subBuilder = null;
+              if (options_ != null) {
+                subBuilder = options_.toBuilder();
+              }
+              options_ =
+                  input.readMessage(com.google.iam.v1.GetPolicyOptions.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(options_);
+                options_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v1.IamPolicyProto
         .internal_static_google_iam_v1_GetIamPolicyRequest_descriptor;
@@ -197,7 +258,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (options_ != null) {
       output.writeMessage(2, getOptions());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -212,7 +273,7 @@ public int getSerializedSize() {
     if (options_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getOptions());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -232,7 +293,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasOptions()) {
       if (!getOptions().equals(other.getOptions())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -249,7 +310,7 @@ public int hashCode() {
       hash = (37 * hash) + OPTIONS_FIELD_NUMBER;
       hash = (53 * hash) + getOptions().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -378,10 +439,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.GetIamPolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -484,7 +552,7 @@ public Builder mergeFrom(com.google.iam.v1.GetIamPolicyRequest other) {
       if (other.hasOptions()) {
         mergeOptions(other.getOptions());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -499,43 +567,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v1.GetIamPolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                resource_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getOptionsFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v1.GetIamPolicyRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -900,18 +942,7 @@ public GetIamPolicyRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new GetIamPolicyRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptions.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptions.java
index 4ceb48708f..122360966e 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptions.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptions.java
@@ -51,6 +51,50 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private GetPolicyOptions(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              requestedPolicyVersion_ = input.readInt32();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v1.OptionsProto.internal_static_google_iam_v1_GetPolicyOptions_descriptor;
   }
@@ -114,7 +158,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (requestedPolicyVersion_ != 0) {
       output.writeInt32(1, requestedPolicyVersion_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -126,7 +170,7 @@ public int getSerializedSize() {
     if (requestedPolicyVersion_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, requestedPolicyVersion_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -142,7 +186,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.iam.v1.GetPolicyOptions other = (com.google.iam.v1.GetPolicyOptions) obj;
 
     if (getRequestedPolicyVersion() != other.getRequestedPolicyVersion()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -155,7 +199,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + REQUESTED_POLICY_VERSION_FIELD_NUMBER;
     hash = (53 * hash) + getRequestedPolicyVersion();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -284,10 +328,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.GetPolicyOptions.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -374,7 +425,7 @@ public Builder mergeFrom(com.google.iam.v1.GetPolicyOptions other) {
       if (other.getRequestedPolicyVersion() != 0) {
         setRequestedPolicyVersion(other.getRequestedPolicyVersion());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -389,37 +440,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v1.GetPolicyOptions parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                requestedPolicyVersion_ = input.readInt32();
-
-                break;
-              } // case 8
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v1.GetPolicyOptions) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -549,18 +580,7 @@ public GetPolicyOptions parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new GetPolicyOptions(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Policy.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Policy.java
index ded48b6846..5ee0df2e91 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Policy.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Policy.java
@@ -119,6 +119,82 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Policy(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              version_ = input.readInt32();
+              break;
+            }
+          case 26:
+            {
+              etag_ = input.readBytes();
+              break;
+            }
+          case 34:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                bindings_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              bindings_.add(
+                  input.readMessage(com.google.iam.v1.Binding.parser(), extensionRegistry));
+              break;
+            }
+          case 50:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                auditConfigs_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              auditConfigs_.add(
+                  input.readMessage(com.google.iam.v1.AuditConfig.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        bindings_ = java.util.Collections.unmodifiableList(bindings_);
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        auditConfigs_ = java.util.Collections.unmodifiableList(auditConfigs_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v1.PolicyProto.internal_static_google_iam_v1_Policy_descriptor;
   }
@@ -410,7 +486,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < auditConfigs_.size(); i++) {
       output.writeMessage(6, auditConfigs_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -431,7 +507,7 @@ public int getSerializedSize() {
     for (int i = 0; i < auditConfigs_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, auditConfigs_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -450,7 +526,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getBindingsList().equals(other.getBindingsList())) return false;
     if (!getAuditConfigsList().equals(other.getAuditConfigsList())) return false;
     if (!getEtag().equals(other.getEtag())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -473,7 +549,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + ETAG_FIELD_NUMBER;
     hash = (53 * hash) + getEtag().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -663,10 +739,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.Policy.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getBindingsFieldBuilder();
+        getAuditConfigsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -676,18 +762,16 @@ public Builder clear() {
 
       if (bindingsBuilder_ == null) {
         bindings_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        bindings_ = null;
         bindingsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       if (auditConfigsBuilder_ == null) {
         auditConfigs_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
-        auditConfigs_ = null;
         auditConfigsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
       etag_ = com.google.protobuf.ByteString.EMPTY;
 
       return this;
@@ -845,7 +929,7 @@ public Builder mergeFrom(com.google.iam.v1.Policy other) {
       if (other.getEtag() != com.google.protobuf.ByteString.EMPTY) {
         setEtag(other.getEtag());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -860,67 +944,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v1.Policy parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                version_ = input.readInt32();
-
-                break;
-              } // case 8
-            case 26:
-              {
-                etag_ = input.readBytes();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                com.google.iam.v1.Binding m =
-                    input.readMessage(com.google.iam.v1.Binding.parser(), extensionRegistry);
-                if (bindingsBuilder_ == null) {
-                  ensureBindingsIsMutable();
-                  bindings_.add(m);
-                } else {
-                  bindingsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 34
-            case 50:
-              {
-                com.google.iam.v1.AuditConfig m =
-                    input.readMessage(com.google.iam.v1.AuditConfig.parser(), extensionRegistry);
-                if (auditConfigsBuilder_ == null) {
-                  ensureAuditConfigsIsMutable();
-                  auditConfigs_.add(m);
-                } else {
-                  auditConfigsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 50
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v1.Policy) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2023,18 +2057,7 @@ public Policy parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Policy(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDelta.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDelta.java
index 7faf5c852a..78b2c61e0f 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDelta.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDelta.java
@@ -54,6 +54,73 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PolicyDelta(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                bindingDeltas_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              bindingDeltas_.add(
+                  input.readMessage(com.google.iam.v1.BindingDelta.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                auditConfigDeltas_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              auditConfigDeltas_.add(
+                  input.readMessage(
+                      com.google.iam.v1.AuditConfigDelta.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        bindingDeltas_ = java.util.Collections.unmodifiableList(bindingDeltas_);
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        auditConfigDeltas_ = java.util.Collections.unmodifiableList(auditConfigDeltas_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v1.PolicyProto.internal_static_google_iam_v1_PolicyDelta_descriptor;
   }
@@ -235,7 +302,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < auditConfigDeltas_.size(); i++) {
       output.writeMessage(2, auditConfigDeltas_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -251,7 +318,7 @@ public int getSerializedSize() {
       size +=
           com.google.protobuf.CodedOutputStream.computeMessageSize(2, auditConfigDeltas_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -268,7 +335,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getBindingDeltasList().equals(other.getBindingDeltasList())) return false;
     if (!getAuditConfigDeltasList().equals(other.getAuditConfigDeltasList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -287,7 +354,7 @@ public int hashCode() {
       hash = (37 * hash) + AUDIT_CONFIG_DELTAS_FIELD_NUMBER;
       hash = (53 * hash) + getAuditConfigDeltasList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -414,10 +481,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.PolicyDelta.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getBindingDeltasFieldBuilder();
+        getAuditConfigDeltasFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -425,18 +502,16 @@ public Builder clear() {
       super.clear();
       if (bindingDeltasBuilder_ == null) {
         bindingDeltas_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        bindingDeltas_ = null;
         bindingDeltasBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       if (auditConfigDeltasBuilder_ == null) {
         auditConfigDeltas_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
-        auditConfigDeltas_ = null;
         auditConfigDeltasBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -584,7 +659,7 @@ public Builder mergeFrom(com.google.iam.v1.PolicyDelta other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -599,56 +674,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v1.PolicyDelta parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.iam.v1.BindingDelta m =
-                    input.readMessage(com.google.iam.v1.BindingDelta.parser(), extensionRegistry);
-                if (bindingDeltasBuilder_ == null) {
-                  ensureBindingDeltasIsMutable();
-                  bindingDeltas_.add(m);
-                } else {
-                  bindingDeltasBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.iam.v1.AuditConfigDelta m =
-                    input.readMessage(
-                        com.google.iam.v1.AuditConfigDelta.parser(), extensionRegistry);
-                if (auditConfigDeltasBuilder_ == null) {
-                  ensureAuditConfigDeltasIsMutable();
-                  auditConfigDeltas_.add(m);
-                } else {
-                  auditConfigDeltasBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v1.PolicyDelta) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1425,18 +1461,7 @@ public PolicyDelta parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PolicyDelta(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/ResourcePolicyMember.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/ResourcePolicyMember.java
index 89c7b5ea09..21e8cba55d 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/ResourcePolicyMember.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/ResourcePolicyMember.java
@@ -55,6 +55,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ResourcePolicyMember(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              iamPolicyNamePrincipal_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              iamPolicyUidPrincipal_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v1.ResourcePolicyMemberProto
         .internal_static_google_iam_v1_ResourcePolicyMember_descriptor;
@@ -212,7 +265,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(iamPolicyUidPrincipal_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, iamPolicyUidPrincipal_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -227,7 +280,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(iamPolicyUidPrincipal_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, iamPolicyUidPrincipal_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -244,7 +297,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getIamPolicyNamePrincipal().equals(other.getIamPolicyNamePrincipal())) return false;
     if (!getIamPolicyUidPrincipal().equals(other.getIamPolicyUidPrincipal())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -259,7 +312,7 @@ public int hashCode() {
     hash = (53 * hash) + getIamPolicyNamePrincipal().hashCode();
     hash = (37 * hash) + IAM_POLICY_UID_PRINCIPAL_FIELD_NUMBER;
     hash = (53 * hash) + getIamPolicyUidPrincipal().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -390,10 +443,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.ResourcePolicyMember.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -489,7 +549,7 @@ public Builder mergeFrom(com.google.iam.v1.ResourcePolicyMember other) {
         iamPolicyUidPrincipal_ = other.iamPolicyUidPrincipal_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -504,43 +564,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v1.ResourcePolicyMember parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                iamPolicyNamePrincipal_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                iamPolicyUidPrincipal_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v1.ResourcePolicyMember) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -858,18 +892,7 @@ public ResourcePolicyMember parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ResourcePolicyMember(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/SetIamPolicyRequest.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/SetIamPolicyRequest.java
index ce9b6db2d9..6050cf5744 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/SetIamPolicyRequest.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/SetIamPolicyRequest.java
@@ -53,6 +53,81 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SetIamPolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              resource_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.iam.v1.Policy.Builder subBuilder = null;
+              if (policy_ != null) {
+                subBuilder = policy_.toBuilder();
+              }
+              policy_ = input.readMessage(com.google.iam.v1.Policy.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(policy_);
+                policy_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 26:
+            {
+              com.google.protobuf.FieldMask.Builder subBuilder = null;
+              if (updateMask_ != null) {
+                subBuilder = updateMask_.toBuilder();
+              }
+              updateMask_ =
+                  input.readMessage(com.google.protobuf.FieldMask.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateMask_);
+                updateMask_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v1.IamPolicyProto
         .internal_static_google_iam_v1_SetIamPolicyRequest_descriptor;
@@ -264,7 +339,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (updateMask_ != null) {
       output.writeMessage(3, getUpdateMask());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -282,7 +357,7 @@ public int getSerializedSize() {
     if (updateMask_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getUpdateMask());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -306,7 +381,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasUpdateMask()) {
       if (!getUpdateMask().equals(other.getUpdateMask())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -327,7 +402,7 @@ public int hashCode() {
       hash = (37 * hash) + UPDATE_MASK_FIELD_NUMBER;
       hash = (53 * hash) + getUpdateMask().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -456,10 +531,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.SetIamPolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -576,7 +658,7 @@ public Builder mergeFrom(com.google.iam.v1.SetIamPolicyRequest other) {
       if (other.hasUpdateMask()) {
         mergeUpdateMask(other.getUpdateMask());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -591,49 +673,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v1.SetIamPolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                resource_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getPolicyFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v1.SetIamPolicyRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1227,18 +1277,7 @@ public SetIamPolicyRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new SetIamPolicyRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsRequest.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsRequest.java
index f15c65312f..9e5f7213ad 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsRequest.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsRequest.java
@@ -54,6 +54,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private TestIamPermissionsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              resource_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                permissions_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              permissions_.add(s);
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        permissions_ = permissions_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v1.IamPolicyProto
         .internal_static_google_iam_v1_TestIamPermissionsRequest_descriptor;
@@ -223,7 +283,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < permissions_.size(); i++) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, permissions_.getRaw(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -243,7 +303,7 @@ public int getSerializedSize() {
       size += dataSize;
       size += 1 * getPermissionsList().size();
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -261,7 +321,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getResource().equals(other.getResource())) return false;
     if (!getPermissionsList().equals(other.getPermissionsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -278,7 +338,7 @@ public int hashCode() {
       hash = (37 * hash) + PERMISSIONS_FIELD_NUMBER;
       hash = (53 * hash) + getPermissionsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -408,10 +468,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.TestIamPermissionsRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -518,7 +585,7 @@ public Builder mergeFrom(com.google.iam.v1.TestIamPermissionsRequest other) {
         }
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -533,44 +600,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v1.TestIamPermissionsRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                resource_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensurePermissionsIsMutable();
-                permissions_.add(s);
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v1.TestIamPermissionsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -938,18 +978,7 @@ public TestIamPermissionsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new TestIamPermissionsRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsResponse.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsResponse.java
index d11516f17f..17cf7e5fa2 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsResponse.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/TestIamPermissionsResponse.java
@@ -53,6 +53,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private TestIamPermissionsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                permissions_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              permissions_.add(s);
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        permissions_ = permissions_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v1.IamPolicyProto
         .internal_static_google_iam_v1_TestIamPermissionsResponse_descriptor;
@@ -154,7 +207,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < permissions_.size(); i++) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, permissions_.getRaw(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -171,7 +224,7 @@ public int getSerializedSize() {
       size += dataSize;
       size += 1 * getPermissionsList().size();
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -188,7 +241,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.iam.v1.TestIamPermissionsResponse) obj;
 
     if (!getPermissionsList().equals(other.getPermissionsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -203,7 +256,7 @@ public int hashCode() {
       hash = (37 * hash) + PERMISSIONS_FIELD_NUMBER;
       hash = (53 * hash) + getPermissionsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -333,10 +386,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.TestIamPermissionsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -436,7 +496,7 @@ public Builder mergeFrom(com.google.iam.v1.TestIamPermissionsResponse other) {
         }
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -451,38 +511,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v1.TestIamPermissionsResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensurePermissionsIsMutable();
-                permissions_.add(s);
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v1.TestIamPermissionsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -706,18 +745,7 @@ public TestIamPermissionsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new TestIamPermissionsResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditData.java b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditData.java
index 41ed1aaa39..6bad2ada81 100644
--- a/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditData.java
+++ b/java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/logging/AuditData.java
@@ -53,6 +53,60 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private AuditData(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 18:
+            {
+              com.google.iam.v1.PolicyDelta.Builder subBuilder = null;
+              if (policyDelta_ != null) {
+                subBuilder = policyDelta_.toBuilder();
+              }
+              policyDelta_ =
+                  input.readMessage(com.google.iam.v1.PolicyDelta.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(policyDelta_);
+                policyDelta_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v1.logging.AuditDataProto
         .internal_static_google_iam_v1_logging_AuditData_descriptor;
@@ -134,7 +188,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (policyDelta_ != null) {
       output.writeMessage(2, getPolicyDelta());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -146,7 +200,7 @@ public int getSerializedSize() {
     if (policyDelta_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getPolicyDelta());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -165,7 +219,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasPolicyDelta()) {
       if (!getPolicyDelta().equals(other.getPolicyDelta())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -180,7 +234,7 @@ public int hashCode() {
       hash = (37 * hash) + POLICY_DELTA_FIELD_NUMBER;
       hash = (53 * hash) + getPolicyDelta().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -311,10 +365,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v1.logging.AuditData.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -409,7 +470,7 @@ public Builder mergeFrom(com.google.iam.v1.logging.AuditData other) {
       if (other.hasPolicyDelta()) {
         mergePolicyDelta(other.getPolicyDelta());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -424,37 +485,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v1.logging.AuditData parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 18:
-              {
-                input.readMessage(getPolicyDeltaFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v1.logging.AuditData) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -684,18 +725,7 @@ public AuditData parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new AuditData(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/CreatePolicyRequest.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/CreatePolicyRequest.java
index 7daa5ab842..98899fcf69 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/CreatePolicyRequest.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/CreatePolicyRequest.java
@@ -54,6 +54,73 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CreatePolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.iam.v2.Policy.Builder subBuilder = null;
+              if (policy_ != null) {
+                subBuilder = policy_.toBuilder();
+              }
+              policy_ = input.readMessage(com.google.iam.v2.Policy.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(policy_);
+                policy_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              policyId_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2.PolicyProto
         .internal_static_google_iam_v2_CreatePolicyRequest_descriptor;
@@ -263,7 +330,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policyId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, policyId_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -281,7 +348,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policyId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, policyId_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -302,7 +369,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getPolicy().equals(other.getPolicy())) return false;
     }
     if (!getPolicyId().equals(other.getPolicyId())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -321,7 +388,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + POLICY_ID_FIELD_NUMBER;
     hash = (53 * hash) + getPolicyId().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -450,10 +517,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2.CreatePolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -563,7 +637,7 @@ public Builder mergeFrom(com.google.iam.v2.CreatePolicyRequest other) {
         policyId_ = other.policyId_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -578,49 +652,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2.CreatePolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getPolicyFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            case 26:
-              {
-                policyId_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2.CreatePolicyRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1114,18 +1156,7 @@ public CreatePolicyRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new CreatePolicyRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DeletePolicyRequest.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DeletePolicyRequest.java
index 8a00eefd2e..c0e8966793 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DeletePolicyRequest.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DeletePolicyRequest.java
@@ -54,6 +54,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DeletePolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              etag_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2.PolicyProto
         .internal_static_google_iam_v2_DeletePolicyRequest_descriptor;
@@ -211,7 +264,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(etag_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, etag_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -226,7 +279,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(etag_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, etag_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -243,7 +296,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getName().equals(other.getName())) return false;
     if (!getEtag().equals(other.getEtag())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -258,7 +311,7 @@ public int hashCode() {
     hash = (53 * hash) + getName().hashCode();
     hash = (37 * hash) + ETAG_FIELD_NUMBER;
     hash = (53 * hash) + getEtag().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -387,10 +440,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2.DeletePolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -486,7 +546,7 @@ public Builder mergeFrom(com.google.iam.v2.DeletePolicyRequest other) {
         etag_ = other.etag_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -501,43 +561,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2.DeletePolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                etag_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2.DeletePolicyRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -845,18 +879,7 @@ public DeletePolicyRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DeletePolicyRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRule.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRule.java
index aa3ca9e158..d9e1782015 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRule.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/DenyRule.java
@@ -56,6 +56,113 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DenyRule(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                deniedPrincipals_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              deniedPrincipals_.add(s);
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                exceptionPrincipals_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              exceptionPrincipals_.add(s);
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                deniedPermissions_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              deniedPermissions_.add(s);
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                exceptionPermissions_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              exceptionPermissions_.add(s);
+              break;
+            }
+          case 42:
+            {
+              com.google.type.Expr.Builder subBuilder = null;
+              if (denialCondition_ != null) {
+                subBuilder = denialCondition_.toBuilder();
+              }
+              denialCondition_ =
+                  input.readMessage(com.google.type.Expr.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(denialCondition_);
+                denialCondition_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        deniedPrincipals_ = deniedPrincipals_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        exceptionPrincipals_ = exceptionPrincipals_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000004) != 0)) {
+        deniedPermissions_ = deniedPermissions_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000008) != 0)) {
+        exceptionPermissions_ = exceptionPermissions_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2.DenyRuleProto.internal_static_google_iam_v2_DenyRule_descriptor;
   }
@@ -611,7 +718,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (denialCondition_ != null) {
       output.writeMessage(5, getDenialCondition());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -655,7 +762,7 @@ public int getSerializedSize() {
     if (denialCondition_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getDenialCondition());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -678,7 +785,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasDenialCondition()) {
       if (!getDenialCondition().equals(other.getDenialCondition())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -709,7 +816,7 @@ public int hashCode() {
       hash = (37 * hash) + DENIAL_CONDITION_FIELD_NUMBER;
       hash = (53 * hash) + getDenialCondition().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -836,10 +943,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2.DenyRule.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1002,7 +1116,7 @@ public Builder mergeFrom(com.google.iam.v2.DenyRule other) {
       if (other.hasDenialCondition()) {
         mergeDenialCondition(other.getDenialCondition());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1017,65 +1131,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2.DenyRule parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureDeniedPrincipalsIsMutable();
-                deniedPrincipals_.add(s);
-                break;
-              } // case 10
-            case 18:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureExceptionPrincipalsIsMutable();
-                exceptionPrincipals_.add(s);
-                break;
-              } // case 18
-            case 26:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureDeniedPermissionsIsMutable();
-                deniedPermissions_.add(s);
-                break;
-              } // case 26
-            case 34:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureExceptionPermissionsIsMutable();
-                exceptionPermissions_.add(s);
-                break;
-              } // case 34
-            case 42:
-              {
-                input.readMessage(getDenialConditionFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 42
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2.DenyRule) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2484,18 +2550,7 @@ public DenyRule parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DenyRule(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/GetPolicyRequest.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/GetPolicyRequest.java
index 80f001a67e..366e0cb875 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/GetPolicyRequest.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/GetPolicyRequest.java
@@ -53,6 +53,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private GetPolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2.PolicyProto.internal_static_google_iam_v2_GetPolicyRequest_descriptor;
   }
@@ -147,7 +193,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -159,7 +205,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -175,7 +221,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.iam.v2.GetPolicyRequest other = (com.google.iam.v2.GetPolicyRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -188,7 +234,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -317,10 +363,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2.GetPolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -408,7 +461,7 @@ public Builder mergeFrom(com.google.iam.v2.GetPolicyRequest other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -423,37 +476,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2.GetPolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2.GetPolicyRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -630,18 +663,7 @@ public GetPolicyRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new GetPolicyRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesRequest.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesRequest.java
index 1bba88f5ce..4e45001b7e 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesRequest.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesRequest.java
@@ -54,6 +54,64 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListPoliciesRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          case 16:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2.PolicyProto
         .internal_static_google_iam_v2_ListPoliciesRequest_descriptor;
@@ -232,7 +290,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -250,7 +308,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -268,7 +326,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getParent().equals(other.getParent())) return false;
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -285,7 +343,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageSize();
     hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -414,10 +472,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2.ListPoliciesRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -519,7 +584,7 @@ public Builder mergeFrom(com.google.iam.v2.ListPoliciesRequest other) {
         pageToken_ = other.pageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -534,49 +599,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2.ListPoliciesRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2.ListPoliciesRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -937,18 +970,7 @@ public ListPoliciesRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListPoliciesRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesResponse.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesResponse.java
index eb2f0178ac..993f2ce193 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesResponse.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/ListPoliciesResponse.java
@@ -54,6 +54,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListPoliciesResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                policies_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              policies_.add(
+                  input.readMessage(com.google.iam.v2.Policy.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        policies_ = java.util.Collections.unmodifiableList(policies_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2.PolicyProto
         .internal_static_google_iam_v2_ListPoliciesResponse_descriptor;
@@ -215,7 +275,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -230,7 +290,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -247,7 +307,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getPoliciesList().equals(other.getPoliciesList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -264,7 +324,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -394,10 +454,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2.ListPoliciesResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPoliciesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -405,11 +474,10 @@ public Builder clear() {
       super.clear();
       if (policiesBuilder_ == null) {
         policies_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        policies_ = null;
         policiesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -530,7 +598,7 @@ public Builder mergeFrom(com.google.iam.v2.ListPoliciesResponse other) {
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -545,49 +613,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2.ListPoliciesResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.iam.v2.Policy m =
-                    input.readMessage(com.google.iam.v2.Policy.parser(), extensionRegistry);
-                if (policiesBuilder_ == null) {
-                  ensurePoliciesIsMutable();
-                  policies_.add(m);
-                } else {
-                  policiesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2.ListPoliciesResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1100,18 +1136,7 @@ public ListPoliciesResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListPoliciesResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/Policy.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/Policy.java
index 9d708a159c..48e395580e 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/Policy.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/Policy.java
@@ -59,6 +59,161 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Policy(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              uid_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              kind_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              displayName_ = s;
+              break;
+            }
+          case 42:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                annotations_ =
+                    com.google.protobuf.MapField.newMapField(
+                        AnnotationsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry annotations__ =
+                  input.readMessage(
+                      AnnotationsDefaultEntryHolder.defaultEntry.getParserForType(),
+                      extensionRegistry);
+              annotations_.getMutableMap().put(annotations__.getKey(), annotations__.getValue());
+              break;
+            }
+          case 50:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              etag_ = s;
+              break;
+            }
+          case 58:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (createTime_ != null) {
+                subBuilder = createTime_.toBuilder();
+              }
+              createTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(createTime_);
+                createTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 66:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (updateTime_ != null) {
+                subBuilder = updateTime_.toBuilder();
+              }
+              updateTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateTime_);
+                updateTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 74:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (deleteTime_ != null) {
+                subBuilder = deleteTime_.toBuilder();
+              }
+              deleteTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(deleteTime_);
+                deleteTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 82:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                rules_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              rules_.add(
+                  input.readMessage(com.google.iam.v2.PolicyRule.parser(), extensionRegistry));
+              break;
+            }
+          case 90:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              managingAuthority_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        rules_ = java.util.Collections.unmodifiableList(rules_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2.PolicyProto.internal_static_google_iam_v2_Policy_descriptor;
   }
@@ -807,7 +962,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(managingAuthority_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 11, managingAuthority_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -856,7 +1011,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(managingAuthority_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, managingAuthority_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -891,7 +1046,7 @@ public boolean equals(final java.lang.Object obj) {
     }
     if (!getRulesList().equals(other.getRulesList())) return false;
     if (!getManagingAuthority().equals(other.getManagingAuthority())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -934,7 +1089,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + MANAGING_AUTHORITY_FIELD_NUMBER;
     hash = (53 * hash) + getManagingAuthority().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1080,10 +1235,19 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.iam.v2.Policy.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getRulesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -1120,11 +1284,10 @@ public Builder clear() {
       }
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
-        rules_ = null;
         rulesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
       managingAuthority_ = "";
 
       return this;
@@ -1295,7 +1458,7 @@ public Builder mergeFrom(com.google.iam.v2.Policy other) {
         managingAuthority_ = other.managingAuthority_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1310,108 +1473,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2.Policy parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                uid_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                kind_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                displayName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            case 42:
-              {
-                com.google.protobuf.MapEntry annotations__ =
-                    input.readMessage(
-                        AnnotationsDefaultEntryHolder.defaultEntry.getParserForType(),
-                        extensionRegistry);
-                internalGetMutableAnnotations()
-                    .getMutableMap()
-                    .put(annotations__.getKey(), annotations__.getValue());
-                break;
-              } // case 42
-            case 50:
-              {
-                etag_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 50
-            case 58:
-              {
-                input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 58
-            case 66:
-              {
-                input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 66
-            case 74:
-              {
-                input.readMessage(getDeleteTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 74
-            case 82:
-              {
-                com.google.iam.v2.PolicyRule m =
-                    input.readMessage(com.google.iam.v2.PolicyRule.parser(), extensionRegistry);
-                if (rulesBuilder_ == null) {
-                  ensureRulesIsMutable();
-                  rules_.add(m);
-                } else {
-                  rulesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 82
-            case 90:
-              {
-                managingAuthority_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 90
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2.Policy) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -3374,18 +3446,7 @@ public Policy parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Policy(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOperationMetadata.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOperationMetadata.java
index b6eac3bb8b..f17c3db326 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOperationMetadata.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyOperationMetadata.java
@@ -51,6 +51,60 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PolicyOperationMetadata(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (createTime_ != null) {
+                subBuilder = createTime_.toBuilder();
+              }
+              createTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(createTime_);
+                createTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2.PolicyProto
         .internal_static_google_iam_v2_PolicyOperationMetadata_descriptor;
@@ -132,7 +186,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (createTime_ != null) {
       output.writeMessage(1, getCreateTime());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -144,7 +198,7 @@ public int getSerializedSize() {
     if (createTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCreateTime());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -164,7 +218,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasCreateTime()) {
       if (!getCreateTime().equals(other.getCreateTime())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -179,7 +233,7 @@ public int hashCode() {
       hash = (37 * hash) + CREATE_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getCreateTime().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -309,10 +363,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2.PolicyOperationMetadata.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -408,7 +469,7 @@ public Builder mergeFrom(com.google.iam.v2.PolicyOperationMetadata other) {
       if (other.hasCreateTime()) {
         mergeCreateTime(other.getCreateTime());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -423,37 +484,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2.PolicyOperationMetadata parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2.PolicyOperationMetadata) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -681,18 +722,7 @@ public PolicyOperationMetadata parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PolicyOperationMetadata(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyRule.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyRule.java
index 821a743f8d..aa941a99e5 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyRule.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/PolicyRule.java
@@ -53,6 +53,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PolicyRule(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              description_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.iam.v2.DenyRule.Builder subBuilder = null;
+              if (kindCase_ == 2) {
+                subBuilder = ((com.google.iam.v2.DenyRule) kind_).toBuilder();
+              }
+              kind_ = input.readMessage(com.google.iam.v2.DenyRule.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.iam.v2.DenyRule) kind_);
+                kind_ = subBuilder.buildPartial();
+              }
+              kindCase_ = 2;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2.PolicyProto.internal_static_google_iam_v2_PolicyRule_descriptor;
   }
@@ -237,7 +297,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (kindCase_ == 2) {
       output.writeMessage(2, (com.google.iam.v2.DenyRule) kind_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -254,7 +314,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               2, (com.google.iam.v2.DenyRule) kind_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -278,7 +338,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -299,7 +359,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -426,18 +486,22 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2.PolicyRule.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (denyRuleBuilder_ != null) {
-        denyRuleBuilder_.clear();
-      }
       description_ = "";
 
       kindCase_ = 0;
@@ -540,7 +604,7 @@ public Builder mergeFrom(com.google.iam.v2.PolicyRule other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -555,43 +619,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2.PolicyRule parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                description_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getDenyRuleFieldBuilder().getBuilder(), extensionRegistry);
-                kindCase_ = 2;
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2.PolicyRule) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -971,18 +1009,7 @@ public PolicyRule parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PolicyRule(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/UpdatePolicyRequest.java b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/UpdatePolicyRequest.java
index c260b88c3e..920b1f5634 100644
--- a/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/UpdatePolicyRequest.java
+++ b/java-iam/proto-google-iam-v2/src/main/java/com/google/iam/v2/UpdatePolicyRequest.java
@@ -51,6 +51,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private UpdatePolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.iam.v2.Policy.Builder subBuilder = null;
+              if (policy_ != null) {
+                subBuilder = policy_.toBuilder();
+              }
+              policy_ = input.readMessage(com.google.iam.v2.Policy.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(policy_);
+                policy_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2.PolicyProto
         .internal_static_google_iam_v2_UpdatePolicyRequest_descriptor;
@@ -141,7 +194,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (policy_ != null) {
       output.writeMessage(1, getPolicy());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -153,7 +206,7 @@ public int getSerializedSize() {
     if (policy_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getPolicy());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -172,7 +225,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasPolicy()) {
       if (!getPolicy().equals(other.getPolicy())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -187,7 +240,7 @@ public int hashCode() {
       hash = (37 * hash) + POLICY_FIELD_NUMBER;
       hash = (53 * hash) + getPolicy().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -316,10 +369,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2.UpdatePolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -415,7 +475,7 @@ public Builder mergeFrom(com.google.iam.v2.UpdatePolicyRequest other) {
       if (other.hasPolicy()) {
         mergePolicy(other.getPolicy());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -430,37 +490,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2.UpdatePolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getPolicyFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2.UpdatePolicyRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -709,18 +749,7 @@ public UpdatePolicyRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new UpdatePolicyRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/CreatePolicyRequest.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/CreatePolicyRequest.java
index ef7ee120f6..d2f5e9f009 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/CreatePolicyRequest.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/CreatePolicyRequest.java
@@ -54,6 +54,73 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CreatePolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.iam.v2beta.Policy.Builder subBuilder = null;
+              if (policy_ != null) {
+                subBuilder = policy_.toBuilder();
+              }
+              policy_ = input.readMessage(com.google.iam.v2beta.Policy.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(policy_);
+                policy_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              policyId_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2beta.PolicyProto
         .internal_static_google_iam_v2beta_CreatePolicyRequest_descriptor;
@@ -263,7 +330,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policyId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, policyId_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -281,7 +348,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policyId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, policyId_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -303,7 +370,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getPolicy().equals(other.getPolicy())) return false;
     }
     if (!getPolicyId().equals(other.getPolicyId())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -322,7 +389,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + POLICY_ID_FIELD_NUMBER;
     hash = (53 * hash) + getPolicyId().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -452,10 +519,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2beta.CreatePolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -565,7 +639,7 @@ public Builder mergeFrom(com.google.iam.v2beta.CreatePolicyRequest other) {
         policyId_ = other.policyId_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -580,49 +654,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2beta.CreatePolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getPolicyFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            case 26:
-              {
-                policyId_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2beta.CreatePolicyRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1118,18 +1160,7 @@ public CreatePolicyRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new CreatePolicyRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DeletePolicyRequest.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DeletePolicyRequest.java
index b3a769bac7..9d9d08faa2 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DeletePolicyRequest.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DeletePolicyRequest.java
@@ -54,6 +54,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DeletePolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              etag_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2beta.PolicyProto
         .internal_static_google_iam_v2beta_DeletePolicyRequest_descriptor;
@@ -211,7 +264,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(etag_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, etag_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -226,7 +279,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(etag_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, etag_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -244,7 +297,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getName().equals(other.getName())) return false;
     if (!getEtag().equals(other.getEtag())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -259,7 +312,7 @@ public int hashCode() {
     hash = (53 * hash) + getName().hashCode();
     hash = (37 * hash) + ETAG_FIELD_NUMBER;
     hash = (53 * hash) + getEtag().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -389,10 +442,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2beta.DeletePolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -488,7 +548,7 @@ public Builder mergeFrom(com.google.iam.v2beta.DeletePolicyRequest other) {
         etag_ = other.etag_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -503,43 +563,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2beta.DeletePolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                etag_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2beta.DeletePolicyRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -847,18 +881,7 @@ public DeletePolicyRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DeletePolicyRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRule.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRule.java
index c84cde411f..647a2ef656 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRule.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/DenyRule.java
@@ -56,6 +56,113 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DenyRule(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                deniedPrincipals_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              deniedPrincipals_.add(s);
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                exceptionPrincipals_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              exceptionPrincipals_.add(s);
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                deniedPermissions_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              deniedPermissions_.add(s);
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                exceptionPermissions_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              exceptionPermissions_.add(s);
+              break;
+            }
+          case 42:
+            {
+              com.google.type.Expr.Builder subBuilder = null;
+              if (denialCondition_ != null) {
+                subBuilder = denialCondition_.toBuilder();
+              }
+              denialCondition_ =
+                  input.readMessage(com.google.type.Expr.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(denialCondition_);
+                denialCondition_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        deniedPrincipals_ = deniedPrincipals_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        exceptionPrincipals_ = exceptionPrincipals_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000004) != 0)) {
+        deniedPermissions_ = deniedPermissions_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000008) != 0)) {
+        exceptionPermissions_ = exceptionPermissions_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2beta.DenyRuleProto
         .internal_static_google_iam_v2beta_DenyRule_descriptor;
@@ -613,7 +720,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (denialCondition_ != null) {
       output.writeMessage(5, getDenialCondition());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -657,7 +764,7 @@ public int getSerializedSize() {
     if (denialCondition_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getDenialCondition());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -680,7 +787,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasDenialCondition()) {
       if (!getDenialCondition().equals(other.getDenialCondition())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -711,7 +818,7 @@ public int hashCode() {
       hash = (37 * hash) + DENIAL_CONDITION_FIELD_NUMBER;
       hash = (53 * hash) + getDenialCondition().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -839,10 +946,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2beta.DenyRule.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1006,7 +1120,7 @@ public Builder mergeFrom(com.google.iam.v2beta.DenyRule other) {
       if (other.hasDenialCondition()) {
         mergeDenialCondition(other.getDenialCondition());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1021,65 +1135,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2beta.DenyRule parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureDeniedPrincipalsIsMutable();
-                deniedPrincipals_.add(s);
-                break;
-              } // case 10
-            case 18:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureExceptionPrincipalsIsMutable();
-                exceptionPrincipals_.add(s);
-                break;
-              } // case 18
-            case 26:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureDeniedPermissionsIsMutable();
-                deniedPermissions_.add(s);
-                break;
-              } // case 26
-            case 34:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureExceptionPermissionsIsMutable();
-                exceptionPermissions_.add(s);
-                break;
-              } // case 34
-            case 42:
-              {
-                input.readMessage(getDenialConditionFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 42
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2beta.DenyRule) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2488,18 +2554,7 @@ public DenyRule parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DenyRule(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/GetPolicyRequest.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/GetPolicyRequest.java
index 6374d5c704..646fc7c8b7 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/GetPolicyRequest.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/GetPolicyRequest.java
@@ -53,6 +53,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private GetPolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2beta.PolicyProto
         .internal_static_google_iam_v2beta_GetPolicyRequest_descriptor;
@@ -148,7 +194,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -160,7 +206,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -176,7 +222,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.iam.v2beta.GetPolicyRequest other = (com.google.iam.v2beta.GetPolicyRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -189,7 +235,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -319,10 +365,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2beta.GetPolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -411,7 +464,7 @@ public Builder mergeFrom(com.google.iam.v2beta.GetPolicyRequest other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -426,37 +479,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2beta.GetPolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2beta.GetPolicyRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -633,18 +666,7 @@ public GetPolicyRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new GetPolicyRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesRequest.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesRequest.java
index 7bf25e6f17..cb9156ab98 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesRequest.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesRequest.java
@@ -54,6 +54,64 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListPoliciesRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          case 16:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2beta.PolicyProto
         .internal_static_google_iam_v2beta_ListPoliciesRequest_descriptor;
@@ -232,7 +290,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -250,7 +308,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -269,7 +327,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getParent().equals(other.getParent())) return false;
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -286,7 +344,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageSize();
     hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -416,10 +474,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2beta.ListPoliciesRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -521,7 +586,7 @@ public Builder mergeFrom(com.google.iam.v2beta.ListPoliciesRequest other) {
         pageToken_ = other.pageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -536,49 +601,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2beta.ListPoliciesRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2beta.ListPoliciesRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -939,18 +972,7 @@ public ListPoliciesRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListPoliciesRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesResponse.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesResponse.java
index e8c9fa875e..1aa4c77cdd 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesResponse.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/ListPoliciesResponse.java
@@ -54,6 +54,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListPoliciesResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                policies_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              policies_.add(
+                  input.readMessage(com.google.iam.v2beta.Policy.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        policies_ = java.util.Collections.unmodifiableList(policies_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2beta.PolicyProto
         .internal_static_google_iam_v2beta_ListPoliciesResponse_descriptor;
@@ -216,7 +276,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -231,7 +291,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -249,7 +309,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getPoliciesList().equals(other.getPoliciesList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -266,7 +326,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -396,10 +456,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2beta.ListPoliciesResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPoliciesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -407,11 +476,10 @@ public Builder clear() {
       super.clear();
       if (policiesBuilder_ == null) {
         policies_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        policies_ = null;
         policiesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -532,7 +600,7 @@ public Builder mergeFrom(com.google.iam.v2beta.ListPoliciesResponse other) {
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -547,49 +615,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2beta.ListPoliciesResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.iam.v2beta.Policy m =
-                    input.readMessage(com.google.iam.v2beta.Policy.parser(), extensionRegistry);
-                if (policiesBuilder_ == null) {
-                  ensurePoliciesIsMutable();
-                  policies_.add(m);
-                } else {
-                  policiesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2beta.ListPoliciesResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1106,18 +1142,7 @@ public ListPoliciesResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListPoliciesResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/Policy.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/Policy.java
index a3b7b6ec85..02bef0623b 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/Policy.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/Policy.java
@@ -58,6 +58,154 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Policy(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              uid_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              kind_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              displayName_ = s;
+              break;
+            }
+          case 42:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                annotations_ =
+                    com.google.protobuf.MapField.newMapField(
+                        AnnotationsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry annotations__ =
+                  input.readMessage(
+                      AnnotationsDefaultEntryHolder.defaultEntry.getParserForType(),
+                      extensionRegistry);
+              annotations_.getMutableMap().put(annotations__.getKey(), annotations__.getValue());
+              break;
+            }
+          case 50:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              etag_ = s;
+              break;
+            }
+          case 58:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (createTime_ != null) {
+                subBuilder = createTime_.toBuilder();
+              }
+              createTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(createTime_);
+                createTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 66:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (updateTime_ != null) {
+                subBuilder = updateTime_.toBuilder();
+              }
+              updateTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateTime_);
+                updateTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 74:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (deleteTime_ != null) {
+                subBuilder = deleteTime_.toBuilder();
+              }
+              deleteTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(deleteTime_);
+                deleteTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 82:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                rules_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              rules_.add(
+                  input.readMessage(com.google.iam.v2beta.PolicyRule.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        rules_ = java.util.Collections.unmodifiableList(rules_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2beta.PolicyProto.internal_static_google_iam_v2beta_Policy_descriptor;
   }
@@ -752,7 +900,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < rules_.size(); i++) {
       output.writeMessage(10, rules_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -798,7 +946,7 @@ public int getSerializedSize() {
     for (int i = 0; i < rules_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, rules_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -832,7 +980,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getDeleteTime().equals(other.getDeleteTime())) return false;
     }
     if (!getRulesList().equals(other.getRulesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -873,7 +1021,7 @@ public int hashCode() {
       hash = (37 * hash) + RULES_FIELD_NUMBER;
       hash = (53 * hash) + getRulesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1020,10 +1168,19 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.iam.v2beta.Policy.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getRulesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -1060,11 +1217,10 @@ public Builder clear() {
       }
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
-        rules_ = null;
         rulesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -1228,7 +1384,7 @@ public Builder mergeFrom(com.google.iam.v2beta.Policy other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1243,102 +1399,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2beta.Policy parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                uid_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                kind_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                displayName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            case 42:
-              {
-                com.google.protobuf.MapEntry annotations__ =
-                    input.readMessage(
-                        AnnotationsDefaultEntryHolder.defaultEntry.getParserForType(),
-                        extensionRegistry);
-                internalGetMutableAnnotations()
-                    .getMutableMap()
-                    .put(annotations__.getKey(), annotations__.getValue());
-                break;
-              } // case 42
-            case 50:
-              {
-                etag_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 50
-            case 58:
-              {
-                input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 58
-            case 66:
-              {
-                input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 66
-            case 74:
-              {
-                input.readMessage(getDeleteTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 74
-            case 82:
-              {
-                com.google.iam.v2beta.PolicyRule m =
-                    input.readMessage(com.google.iam.v2beta.PolicyRule.parser(), extensionRegistry);
-                if (rulesBuilder_ == null) {
-                  ensureRulesIsMutable();
-                  rules_.add(m);
-                } else {
-                  rulesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 82
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2beta.Policy) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -3189,18 +3260,7 @@ public Policy parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Policy(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOperationMetadata.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOperationMetadata.java
index ea1246fe85..0cca1c4ef8 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOperationMetadata.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyOperationMetadata.java
@@ -51,6 +51,60 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PolicyOperationMetadata(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (createTime_ != null) {
+                subBuilder = createTime_.toBuilder();
+              }
+              createTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(createTime_);
+                createTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2beta.PolicyProto
         .internal_static_google_iam_v2beta_PolicyOperationMetadata_descriptor;
@@ -132,7 +186,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (createTime_ != null) {
       output.writeMessage(1, getCreateTime());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -144,7 +198,7 @@ public int getSerializedSize() {
     if (createTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCreateTime());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -164,7 +218,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasCreateTime()) {
       if (!getCreateTime().equals(other.getCreateTime())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -179,7 +233,7 @@ public int hashCode() {
       hash = (37 * hash) + CREATE_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getCreateTime().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -309,10 +363,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2beta.PolicyOperationMetadata.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -408,7 +469,7 @@ public Builder mergeFrom(com.google.iam.v2beta.PolicyOperationMetadata other) {
       if (other.hasCreateTime()) {
         mergeCreateTime(other.getCreateTime());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -423,37 +484,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2beta.PolicyOperationMetadata parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2beta.PolicyOperationMetadata) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -681,18 +722,7 @@ public PolicyOperationMetadata parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PolicyOperationMetadata(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyRule.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyRule.java
index 75d23f327a..4dfd07cddc 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyRule.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/PolicyRule.java
@@ -53,6 +53,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PolicyRule(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              description_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.iam.v2beta.DenyRule.Builder subBuilder = null;
+              if (kindCase_ == 2) {
+                subBuilder = ((com.google.iam.v2beta.DenyRule) kind_).toBuilder();
+              }
+              kind_ = input.readMessage(com.google.iam.v2beta.DenyRule.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.iam.v2beta.DenyRule) kind_);
+                kind_ = subBuilder.buildPartial();
+              }
+              kindCase_ = 2;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2beta.PolicyProto
         .internal_static_google_iam_v2beta_PolicyRule_descriptor;
@@ -239,7 +299,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (kindCase_ == 2) {
       output.writeMessage(2, (com.google.iam.v2beta.DenyRule) kind_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -256,7 +316,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               2, (com.google.iam.v2beta.DenyRule) kind_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -280,7 +340,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -301,7 +361,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -430,18 +490,22 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2beta.PolicyRule.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (denyRuleBuilder_ != null) {
-        denyRuleBuilder_.clear();
-      }
       description_ = "";
 
       kindCase_ = 0;
@@ -545,7 +609,7 @@ public Builder mergeFrom(com.google.iam.v2beta.PolicyRule other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -560,43 +624,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2beta.PolicyRule parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                description_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getDenyRuleFieldBuilder().getBuilder(), extensionRegistry);
-                kindCase_ = 2;
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2beta.PolicyRule) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -976,18 +1014,7 @@ public PolicyRule parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PolicyRule(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/UpdatePolicyRequest.java b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/UpdatePolicyRequest.java
index 61beef8a21..bbb2b0b945 100644
--- a/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/UpdatePolicyRequest.java
+++ b/java-iam/proto-google-iam-v2beta/src/main/java/com/google/iam/v2beta/UpdatePolicyRequest.java
@@ -51,6 +51,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private UpdatePolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.iam.v2beta.Policy.Builder subBuilder = null;
+              if (policy_ != null) {
+                subBuilder = policy_.toBuilder();
+              }
+              policy_ = input.readMessage(com.google.iam.v2beta.Policy.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(policy_);
+                policy_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v2beta.PolicyProto
         .internal_static_google_iam_v2beta_UpdatePolicyRequest_descriptor;
@@ -141,7 +194,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (policy_ != null) {
       output.writeMessage(1, getPolicy());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -153,7 +206,7 @@ public int getSerializedSize() {
     if (policy_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getPolicy());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -173,7 +226,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasPolicy()) {
       if (!getPolicy().equals(other.getPolicy())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -188,7 +241,7 @@ public int hashCode() {
       hash = (37 * hash) + POLICY_FIELD_NUMBER;
       hash = (53 * hash) + getPolicy().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -318,10 +371,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v2beta.UpdatePolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -417,7 +477,7 @@ public Builder mergeFrom(com.google.iam.v2beta.UpdatePolicyRequest other) {
       if (other.hasPolicy()) {
         mergePolicy(other.getPolicy());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -432,37 +492,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v2beta.UpdatePolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getPolicyFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v2beta.UpdatePolicyRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -713,18 +753,7 @@ public UpdatePolicyRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new UpdatePolicyRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePolicyBindingRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePolicyBindingRequest.java
index 2c3f3eaca1..8d84219542 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePolicyBindingRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePolicyBindingRequest.java
@@ -54,6 +54,79 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CreatePolicyBindingRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              policyBindingId_ = s;
+              break;
+            }
+          case 26:
+            {
+              com.google.iam.v3.PolicyBinding.Builder subBuilder = null;
+              if (policyBinding_ != null) {
+                subBuilder = policyBinding_.toBuilder();
+              }
+              policyBinding_ =
+                  input.readMessage(com.google.iam.v3.PolicyBinding.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(policyBinding_);
+                policyBinding_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 32:
+            {
+              validateOnly_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PolicyBindingsServiceProto
         .internal_static_google_iam_v3_CreatePolicyBindingRequest_descriptor;
@@ -300,7 +373,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (validateOnly_ != false) {
       output.writeBool(4, validateOnly_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -321,7 +394,7 @@ public int getSerializedSize() {
     if (validateOnly_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(4, validateOnly_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -344,7 +417,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getPolicyBinding().equals(other.getPolicyBinding())) return false;
     }
     if (getValidateOnly() != other.getValidateOnly()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -365,7 +438,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + VALIDATE_ONLY_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getValidateOnly());
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -495,10 +568,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.CreatePolicyBindingRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -614,7 +694,7 @@ public Builder mergeFrom(com.google.iam.v3.CreatePolicyBindingRequest other) {
       if (other.getValidateOnly() != false) {
         setValidateOnly(other.getValidateOnly());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -629,55 +709,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.CreatePolicyBindingRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                policyBindingId_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(getPolicyBindingFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            case 32:
-              {
-                validateOnly_ = input.readBool();
-
-                break;
-              } // case 32
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v3.CreatePolicyBindingRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1270,18 +1312,7 @@ public CreatePolicyBindingRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new CreatePolicyBindingRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePrincipalAccessBoundaryPolicyRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePrincipalAccessBoundaryPolicyRequest.java
index ae90c3ed40..fdc43ef633 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePrincipalAccessBoundaryPolicyRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/CreatePrincipalAccessBoundaryPolicyRequest.java
@@ -56,6 +56,80 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CreatePrincipalAccessBoundaryPolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              principalAccessBoundaryPolicyId_ = s;
+              break;
+            }
+          case 26:
+            {
+              com.google.iam.v3.PrincipalAccessBoundaryPolicy.Builder subBuilder = null;
+              if (principalAccessBoundaryPolicy_ != null) {
+                subBuilder = principalAccessBoundaryPolicy_.toBuilder();
+              }
+              principalAccessBoundaryPolicy_ =
+                  input.readMessage(
+                      com.google.iam.v3.PrincipalAccessBoundaryPolicy.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(principalAccessBoundaryPolicy_);
+                principalAccessBoundaryPolicy_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 32:
+            {
+              validateOnly_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3_CreatePrincipalAccessBoundaryPolicyRequest_descriptor;
@@ -300,7 +374,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (validateOnly_ != false) {
       output.writeBool(4, validateOnly_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -325,7 +399,7 @@ public int getSerializedSize() {
     if (validateOnly_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(4, validateOnly_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -351,7 +425,7 @@ public boolean equals(final java.lang.Object obj) {
         return false;
     }
     if (getValidateOnly() != other.getValidateOnly()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -372,7 +446,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + VALIDATE_ONLY_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getValidateOnly());
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -503,10 +577,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.CreatePrincipalAccessBoundaryPolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -625,7 +706,7 @@ public Builder mergeFrom(com.google.iam.v3.CreatePrincipalAccessBoundaryPolicyRe
       if (other.getValidateOnly() != false) {
         setValidateOnly(other.getValidateOnly());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -640,56 +721,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.CreatePrincipalAccessBoundaryPolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                principalAccessBoundaryPolicyId_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(
-                    getPrincipalAccessBoundaryPolicyFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            case 32:
-              {
-                validateOnly_ = input.readBool();
-
-                break;
-              } // case 32
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3.CreatePrincipalAccessBoundaryPolicyRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1286,19 +1329,7 @@ public CreatePrincipalAccessBoundaryPolicyRequest parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new CreatePrincipalAccessBoundaryPolicyRequest(input, extensionRegistry);
             }
           };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePolicyBindingRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePolicyBindingRequest.java
index c0d9b2bb7d..f61201cf60 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePolicyBindingRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePolicyBindingRequest.java
@@ -54,6 +54,64 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DeletePolicyBindingRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              etag_ = s;
+              break;
+            }
+          case 24:
+            {
+              validateOnly_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PolicyBindingsServiceProto
         .internal_static_google_iam_v3_DeletePolicyBindingRequest_descriptor;
@@ -230,7 +288,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (validateOnly_ != false) {
       output.writeBool(3, validateOnly_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -248,7 +306,7 @@ public int getSerializedSize() {
     if (validateOnly_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(3, validateOnly_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -267,7 +325,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getName().equals(other.getName())) return false;
     if (!getEtag().equals(other.getEtag())) return false;
     if (getValidateOnly() != other.getValidateOnly()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -284,7 +342,7 @@ public int hashCode() {
     hash = (53 * hash) + getEtag().hashCode();
     hash = (37 * hash) + VALIDATE_ONLY_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getValidateOnly());
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -414,10 +472,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.DeletePolicyBindingRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -519,7 +584,7 @@ public Builder mergeFrom(com.google.iam.v3.DeletePolicyBindingRequest other) {
       if (other.getValidateOnly() != false) {
         setValidateOnly(other.getValidateOnly());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -534,49 +599,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.DeletePolicyBindingRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                etag_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 24:
-              {
-                validateOnly_ = input.readBool();
-
-                break;
-              } // case 24
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v3.DeletePolicyBindingRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -932,18 +965,7 @@ public DeletePolicyBindingRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DeletePolicyBindingRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePrincipalAccessBoundaryPolicyRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePrincipalAccessBoundaryPolicyRequest.java
index f65428b556..8c76e3afd4 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePrincipalAccessBoundaryPolicyRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/DeletePrincipalAccessBoundaryPolicyRequest.java
@@ -56,6 +56,69 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DeletePrincipalAccessBoundaryPolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              etag_ = s;
+              break;
+            }
+          case 24:
+            {
+              validateOnly_ = input.readBool();
+              break;
+            }
+          case 32:
+            {
+              force_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3_DeletePrincipalAccessBoundaryPolicyRequest_descriptor;
@@ -249,7 +312,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (force_ != false) {
       output.writeBool(4, force_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -270,7 +333,7 @@ public int getSerializedSize() {
     if (force_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(4, force_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -290,7 +353,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getEtag().equals(other.getEtag())) return false;
     if (getValidateOnly() != other.getValidateOnly()) return false;
     if (getForce() != other.getForce()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -309,7 +372,7 @@ public int hashCode() {
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getValidateOnly());
     hash = (37 * hash) + FORCE_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getForce());
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -440,10 +503,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.DeletePrincipalAccessBoundaryPolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -554,7 +624,7 @@ public Builder mergeFrom(com.google.iam.v3.DeletePrincipalAccessBoundaryPolicyRe
       if (other.getForce() != false) {
         setForce(other.getForce());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -569,55 +639,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.DeletePrincipalAccessBoundaryPolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                etag_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 24:
-              {
-                validateOnly_ = input.readBool();
-
-                break;
-              } // case 24
-            case 32:
-              {
-                force_ = input.readBool();
-
-                break;
-              } // case 32
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3.DeletePrincipalAccessBoundaryPolicyRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1018,19 +1051,7 @@ public DeletePrincipalAccessBoundaryPolicyRequest parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new DeletePrincipalAccessBoundaryPolicyRequest(input, extensionRegistry);
             }
           };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPolicyBindingRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPolicyBindingRequest.java
index 5cf9e9f3dd..ada6389618 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPolicyBindingRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPolicyBindingRequest.java
@@ -53,6 +53,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private GetPolicyBindingRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PolicyBindingsServiceProto
         .internal_static_google_iam_v3_GetPolicyBindingRequest_descriptor;
@@ -150,7 +196,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -162,7 +208,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -179,7 +225,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.iam.v3.GetPolicyBindingRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -192,7 +238,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -322,10 +368,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.GetPolicyBindingRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -414,7 +467,7 @@ public Builder mergeFrom(com.google.iam.v3.GetPolicyBindingRequest other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -429,37 +482,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.GetPolicyBindingRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v3.GetPolicyBindingRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -641,18 +674,7 @@ public GetPolicyBindingRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new GetPolicyBindingRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPrincipalAccessBoundaryPolicyRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPrincipalAccessBoundaryPolicyRequest.java
index 748d6f4fc3..cb201eaa93 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPrincipalAccessBoundaryPolicyRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/GetPrincipalAccessBoundaryPolicyRequest.java
@@ -55,6 +55,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private GetPrincipalAccessBoundaryPolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3_GetPrincipalAccessBoundaryPolicyRequest_descriptor;
@@ -146,7 +192,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -158,7 +204,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -175,7 +221,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.iam.v3.GetPrincipalAccessBoundaryPolicyRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -188,7 +234,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -319,10 +365,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.GetPrincipalAccessBoundaryPolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -412,7 +465,7 @@ public Builder mergeFrom(com.google.iam.v3.GetPrincipalAccessBoundaryPolicyReque
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -427,37 +480,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.GetPrincipalAccessBoundaryPolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3.GetPrincipalAccessBoundaryPolicyRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -624,18 +658,7 @@ public GetPrincipalAccessBoundaryPolicyRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new GetPrincipalAccessBoundaryPolicyRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsRequest.java
index 9188e22830..44641b8666 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsRequest.java
@@ -55,6 +55,71 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListPolicyBindingsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          case 16:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              filter_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PolicyBindingsServiceProto
         .internal_static_google_iam_v3_ListPolicyBindingsRequest_descriptor;
@@ -307,7 +372,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, filter_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -328,7 +393,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, filter_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -348,7 +413,7 @@ public boolean equals(final java.lang.Object obj) {
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
     if (!getFilter().equals(other.getFilter())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -367,7 +432,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageToken().hashCode();
     hash = (37 * hash) + FILTER_FIELD_NUMBER;
     hash = (53 * hash) + getFilter().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -497,10 +562,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.ListPolicyBindingsRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -609,7 +681,7 @@ public Builder mergeFrom(com.google.iam.v3.ListPolicyBindingsRequest other) {
         filter_ = other.filter_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -624,55 +696,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.ListPolicyBindingsRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                filter_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v3.ListPolicyBindingsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1195,18 +1229,7 @@ public ListPolicyBindingsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListPolicyBindingsRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsResponse.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsResponse.java
index 4b142f5fca..9178ae3167 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsResponse.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPolicyBindingsResponse.java
@@ -54,6 +54,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListPolicyBindingsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                policyBindings_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              policyBindings_.add(
+                  input.readMessage(com.google.iam.v3.PolicyBinding.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        policyBindings_ = java.util.Collections.unmodifiableList(policyBindings_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PolicyBindingsServiceProto
         .internal_static_google_iam_v3_ListPolicyBindingsResponse_descriptor;
@@ -216,7 +276,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -231,7 +291,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -249,7 +309,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getPolicyBindingsList().equals(other.getPolicyBindingsList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -266,7 +326,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -396,10 +456,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.ListPolicyBindingsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPolicyBindingsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -407,11 +476,10 @@ public Builder clear() {
       super.clear();
       if (policyBindingsBuilder_ == null) {
         policyBindings_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        policyBindings_ = null;
         policyBindingsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -532,7 +600,7 @@ public Builder mergeFrom(com.google.iam.v3.ListPolicyBindingsResponse other) {
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -547,49 +615,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.ListPolicyBindingsResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.iam.v3.PolicyBinding m =
-                    input.readMessage(com.google.iam.v3.PolicyBinding.parser(), extensionRegistry);
-                if (policyBindingsBuilder_ == null) {
-                  ensurePolicyBindingsIsMutable();
-                  policyBindings_.add(m);
-                } else {
-                  policyBindingsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v3.ListPolicyBindingsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1111,18 +1147,7 @@ public ListPolicyBindingsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListPolicyBindingsResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesRequest.java
index e4e2e000e5..14905c425a 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesRequest.java
@@ -56,6 +56,64 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListPrincipalAccessBoundaryPoliciesRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          case 16:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3_ListPrincipalAccessBoundaryPoliciesRequest_descriptor;
@@ -239,7 +297,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -257,7 +315,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -276,7 +334,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getParent().equals(other.getParent())) return false;
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -293,7 +351,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageSize();
     hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -424,10 +482,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -532,7 +597,7 @@ public Builder mergeFrom(com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesRe
         pageToken_ = other.pageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -547,49 +612,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -966,19 +1000,7 @@ public ListPrincipalAccessBoundaryPoliciesRequest parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new ListPrincipalAccessBoundaryPoliciesRequest(input, extensionRegistry);
             }
           };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesResponse.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesResponse.java
index b502315fdf..3b2e6dd13f 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesResponse.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/ListPrincipalAccessBoundaryPoliciesResponse.java
@@ -56,6 +56,69 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListPrincipalAccessBoundaryPoliciesResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                principalAccessBoundaryPolicies_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              principalAccessBoundaryPolicies_.add(
+                  input.readMessage(
+                      com.google.iam.v3.PrincipalAccessBoundaryPolicy.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        principalAccessBoundaryPolicies_ =
+            java.util.Collections.unmodifiableList(principalAccessBoundaryPolicies_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3_ListPrincipalAccessBoundaryPoliciesResponse_descriptor;
@@ -232,7 +295,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -249,7 +312,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -268,7 +331,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getPrincipalAccessBoundaryPoliciesList()
         .equals(other.getPrincipalAccessBoundaryPoliciesList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -285,7 +348,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -416,10 +479,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPrincipalAccessBoundaryPoliciesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -427,11 +499,10 @@ public Builder clear() {
       super.clear();
       if (principalAccessBoundaryPoliciesBuilder_ == null) {
         principalAccessBoundaryPolicies_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        principalAccessBoundaryPolicies_ = null;
         principalAccessBoundaryPoliciesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -557,7 +628,7 @@ public Builder mergeFrom(com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesRe
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -572,51 +643,19 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.iam.v3.PrincipalAccessBoundaryPolicy m =
-                    input.readMessage(
-                        com.google.iam.v3.PrincipalAccessBoundaryPolicy.parser(),
-                        extensionRegistry);
-                if (principalAccessBoundaryPoliciesBuilder_ == null) {
-                  ensurePrincipalAccessBoundaryPoliciesIsMutable();
-                  principalAccessBoundaryPolicies_.add(m);
-                } else {
-                  principalAccessBoundaryPoliciesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3.ListPrincipalAccessBoundaryPoliciesResponse)
+                e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1190,19 +1229,7 @@ public ListPrincipalAccessBoundaryPoliciesResponse parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new ListPrincipalAccessBoundaryPoliciesResponse(input, extensionRegistry);
             }
           };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/OperationMetadata.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/OperationMetadata.java
index c932b40873..fb4cabbba4 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/OperationMetadata.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/OperationMetadata.java
@@ -56,6 +56,108 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private OperationMetadata(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (createTime_ != null) {
+                subBuilder = createTime_.toBuilder();
+              }
+              createTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(createTime_);
+                createTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (endTime_ != null) {
+                subBuilder = endTime_.toBuilder();
+              }
+              endTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(endTime_);
+                endTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              target_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              verb_ = s;
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              statusMessage_ = s;
+              break;
+            }
+          case 48:
+            {
+              requestedCancellation_ = input.readBool();
+              break;
+            }
+          case 58:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              apiVersion_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.OperationMetadataProto
         .internal_static_google_iam_v3_OperationMetadata_descriptor;
@@ -437,7 +539,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(apiVersion_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 7, apiVersion_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -467,7 +569,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(apiVersion_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, apiVersion_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -495,7 +597,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getStatusMessage().equals(other.getStatusMessage())) return false;
     if (getRequestedCancellation() != other.getRequestedCancellation()) return false;
     if (!getApiVersion().equals(other.getApiVersion())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -524,7 +626,7 @@ public int hashCode() {
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getRequestedCancellation());
     hash = (37 * hash) + API_VERSION_FIELD_NUMBER;
     hash = (53 * hash) + getApiVersion().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -653,10 +755,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.OperationMetadata.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -799,7 +908,7 @@ public Builder mergeFrom(com.google.iam.v3.OperationMetadata other) {
         apiVersion_ = other.apiVersion_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -814,73 +923,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.OperationMetadata parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            case 26:
-              {
-                target_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                verb_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            case 42:
-              {
-                statusMessage_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 42
-            case 48:
-              {
-                requestedCancellation_ = input.readBool();
-
-                break;
-              } // case 48
-            case 58:
-              {
-                apiVersion_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 58
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v3.OperationMetadata) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1834,18 +1887,7 @@ public OperationMetadata parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new OperationMetadata(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBinding.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBinding.java
index 250dd956c3..0c1c93573c 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBinding.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PolicyBinding.java
@@ -59,6 +59,170 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PolicyBinding(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              uid_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              etag_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              displayName_ = s;
+              break;
+            }
+          case 42:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                annotations_ =
+                    com.google.protobuf.MapField.newMapField(
+                        AnnotationsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry annotations__ =
+                  input.readMessage(
+                      AnnotationsDefaultEntryHolder.defaultEntry.getParserForType(),
+                      extensionRegistry);
+              annotations_.getMutableMap().put(annotations__.getKey(), annotations__.getValue());
+              break;
+            }
+          case 50:
+            {
+              com.google.iam.v3.PolicyBinding.Target.Builder subBuilder = null;
+              if (target_ != null) {
+                subBuilder = target_.toBuilder();
+              }
+              target_ =
+                  input.readMessage(
+                      com.google.iam.v3.PolicyBinding.Target.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(target_);
+                target_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 58:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              policy_ = s;
+              break;
+            }
+          case 66:
+            {
+              com.google.type.Expr.Builder subBuilder = null;
+              if (condition_ != null) {
+                subBuilder = condition_.toBuilder();
+              }
+              condition_ = input.readMessage(com.google.type.Expr.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(condition_);
+                condition_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 74:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (createTime_ != null) {
+                subBuilder = createTime_.toBuilder();
+              }
+              createTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(createTime_);
+                createTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 82:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (updateTime_ != null) {
+                subBuilder = updateTime_.toBuilder();
+              }
+              updateTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateTime_);
+                updateTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 88:
+            {
+              int rawValue = input.readEnum();
+
+              policyKind_ = rawValue;
+              break;
+            }
+          case 98:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              policyUid_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PolicyBindingResourcesProto
         .internal_static_google_iam_v3_PolicyBinding_descriptor;
@@ -361,6 +525,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Target(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+                targetCase_ = 1;
+                target_ = s;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.iam.v3.PolicyBindingResourcesProto
           .internal_static_google_iam_v3_PolicyBinding_Target_descriptor;
@@ -571,7 +781,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (targetCase_ == 1) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, target_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -583,7 +793,7 @@ public int getSerializedSize() {
       if (targetCase_ == 1) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, target_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -606,7 +816,7 @@ public boolean equals(final java.lang.Object obj) {
         case 0:
         default:
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -625,7 +835,7 @@ public int hashCode() {
         case 0:
         default:
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -758,10 +968,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.iam.v3.PolicyBinding.Target.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -864,7 +1081,7 @@ public Builder mergeFrom(com.google.iam.v3.PolicyBinding.Target other) {
               break;
             }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -879,38 +1096,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.iam.v3.PolicyBinding.Target parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  java.lang.String s = input.readStringRequireUtf8();
-                  targetCase_ = 1;
-                  target_ = s;
-                  break;
-                } // case 10
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.iam.v3.PolicyBinding.Target) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1220,19 +1416,7 @@ public Target parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Target(input, extensionRegistry);
           }
         };
 
@@ -2096,7 +2280,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policyUid_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 12, policyUid_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -2149,7 +2333,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policyUid_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, policyUid_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -2188,7 +2372,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasUpdateTime()) {
       if (!getUpdateTime().equals(other.getUpdateTime())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -2233,7 +2417,7 @@ public int hashCode() {
       hash = (37 * hash) + UPDATE_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getUpdateTime().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -2381,10 +2565,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.iam.v3.PolicyBinding.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -2574,7 +2765,7 @@ public Builder mergeFrom(com.google.iam.v3.PolicyBinding other) {
       if (other.hasUpdateTime()) {
         mergeUpdateTime(other.getUpdateTime());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2589,108 +2780,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.PolicyBinding parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                uid_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                etag_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                displayName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            case 42:
-              {
-                com.google.protobuf.MapEntry annotations__ =
-                    input.readMessage(
-                        AnnotationsDefaultEntryHolder.defaultEntry.getParserForType(),
-                        extensionRegistry);
-                internalGetMutableAnnotations()
-                    .getMutableMap()
-                    .put(annotations__.getKey(), annotations__.getValue());
-                break;
-              } // case 42
-            case 50:
-              {
-                input.readMessage(getTargetFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 50
-            case 58:
-              {
-                policy_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 58
-            case 66:
-              {
-                input.readMessage(getConditionFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 66
-            case 74:
-              {
-                input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 74
-            case 82:
-              {
-                input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 82
-            case 88:
-              {
-                policyKind_ = input.readEnum();
-
-                break;
-              } // case 88
-            case 98:
-              {
-                policyUid_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 98
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v3.PolicyBinding) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -4851,18 +4951,7 @@ public PolicyBinding parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PolicyBinding(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicy.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicy.java
index ea005c18a7..6c30ffbdc7 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicy.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicy.java
@@ -56,6 +56,136 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PrincipalAccessBoundaryPolicy(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              uid_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              etag_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              displayName_ = s;
+              break;
+            }
+          case 42:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                annotations_ =
+                    com.google.protobuf.MapField.newMapField(
+                        AnnotationsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry annotations__ =
+                  input.readMessage(
+                      AnnotationsDefaultEntryHolder.defaultEntry.getParserForType(),
+                      extensionRegistry);
+              annotations_.getMutableMap().put(annotations__.getKey(), annotations__.getValue());
+              break;
+            }
+          case 50:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (createTime_ != null) {
+                subBuilder = createTime_.toBuilder();
+              }
+              createTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(createTime_);
+                createTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 58:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (updateTime_ != null) {
+                subBuilder = updateTime_.toBuilder();
+              }
+              updateTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateTime_);
+                updateTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 66:
+            {
+              com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails.Builder subBuilder = null;
+              if (details_ != null) {
+                subBuilder = details_.toBuilder();
+              }
+              details_ =
+                  input.readMessage(
+                      com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails.parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(details_);
+                details_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PrincipalAccessBoundaryPolicyResourcesProto
         .internal_static_google_iam_v3_PrincipalAccessBoundaryPolicy_descriptor;
@@ -621,7 +751,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (details_ != null) {
       output.writeMessage(8, getDetails());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -661,7 +791,7 @@ public int getSerializedSize() {
     if (details_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getDetails());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -694,7 +824,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasDetails()) {
       if (!getDetails().equals(other.getDetails())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -729,7 +859,7 @@ public int hashCode() {
       hash = (37 * hash) + DETAILS_FIELD_NUMBER;
       hash = (53 * hash) + getDetails().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -879,10 +1009,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.iam.v3.PrincipalAccessBoundaryPolicy.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1040,7 +1177,7 @@ public Builder mergeFrom(com.google.iam.v3.PrincipalAccessBoundaryPolicy other)
       if (other.hasDetails()) {
         mergeDetails(other.getDetails());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1055,84 +1192,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.PrincipalAccessBoundaryPolicy parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                uid_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                etag_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                displayName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            case 42:
-              {
-                com.google.protobuf.MapEntry annotations__ =
-                    input.readMessage(
-                        AnnotationsDefaultEntryHolder.defaultEntry.getParserForType(),
-                        extensionRegistry);
-                internalGetMutableAnnotations()
-                    .getMutableMap()
-                    .put(annotations__.getKey(), annotations__.getValue());
-                break;
-              } // case 42
-            case 50:
-              {
-                input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 50
-            case 58:
-              {
-                input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 58
-            case 66:
-              {
-                input.readMessage(getDetailsFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 66
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v3.PrincipalAccessBoundaryPolicy) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2491,18 +2561,7 @@ public PrincipalAccessBoundaryPolicy parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PrincipalAccessBoundaryPolicy(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyDetails.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyDetails.java
index 3e9cb49071..e3c6210e87 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyDetails.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyDetails.java
@@ -56,6 +56,69 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PrincipalAccessBoundaryPolicyDetails(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                rules_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              rules_.add(
+                  input.readMessage(
+                      com.google.iam.v3.PrincipalAccessBoundaryPolicyRule.parser(),
+                      extensionRegistry));
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              enforcementVersion_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        rules_ = java.util.Collections.unmodifiableList(rules_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PrincipalAccessBoundaryPolicyResourcesProto
         .internal_static_google_iam_v3_PrincipalAccessBoundaryPolicyDetails_descriptor;
@@ -239,7 +302,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(enforcementVersion_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, enforcementVersion_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -254,7 +317,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(enforcementVersion_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, enforcementVersion_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -272,7 +335,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getRulesList().equals(other.getRulesList())) return false;
     if (!getEnforcementVersion().equals(other.getEnforcementVersion())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -289,7 +352,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + ENFORCEMENT_VERSION_FIELD_NUMBER;
     hash = (53 * hash) + getEnforcementVersion().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -420,10 +483,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getRulesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -431,11 +503,10 @@ public Builder clear() {
       super.clear();
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        rules_ = null;
         rulesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       enforcementVersion_ = "";
 
       return this;
@@ -557,7 +628,7 @@ public Builder mergeFrom(com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails
         enforcementVersion_ = other.enforcementVersion_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -572,51 +643,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.iam.v3.PrincipalAccessBoundaryPolicyRule m =
-                    input.readMessage(
-                        com.google.iam.v3.PrincipalAccessBoundaryPolicyRule.parser(),
-                        extensionRegistry);
-                if (rulesBuilder_ == null) {
-                  ensureRulesIsMutable();
-                  rules_.add(m);
-                } else {
-                  rulesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 34:
-              {
-                enforcementVersion_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3.PrincipalAccessBoundaryPolicyDetails) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1209,18 +1247,7 @@ public PrincipalAccessBoundaryPolicyDetails parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PrincipalAccessBoundaryPolicyDetails(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyRule.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyRule.java
index c74b38535a..788fbf5c23 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyRule.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPolicyRule.java
@@ -56,6 +56,73 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PrincipalAccessBoundaryPolicyRule(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              description_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                resources_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              resources_.add(s);
+              break;
+            }
+          case 24:
+            {
+              int rawValue = input.readEnum();
+
+              effect_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        resources_ = resources_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PrincipalAccessBoundaryPolicyResourcesProto
         .internal_static_google_iam_v3_PrincipalAccessBoundaryPolicyRule_descriptor;
@@ -434,7 +501,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
             .getNumber()) {
       output.writeEnum(3, effect_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -459,7 +526,7 @@ public int getSerializedSize() {
             .getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(3, effect_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -478,7 +545,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getDescription().equals(other.getDescription())) return false;
     if (!getResourcesList().equals(other.getResourcesList())) return false;
     if (effect_ != other.effect_) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -497,7 +564,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + EFFECT_FIELD_NUMBER;
     hash = (53 * hash) + effect_;
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -627,10 +694,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.PrincipalAccessBoundaryPolicyRule.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -744,7 +818,7 @@ public Builder mergeFrom(com.google.iam.v3.PrincipalAccessBoundaryPolicyRule oth
       if (other.effect_ != 0) {
         setEffectValue(other.getEffectValue());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -759,50 +833,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.PrincipalAccessBoundaryPolicyRule parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                description_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureResourcesIsMutable();
-                resources_.add(s);
-                break;
-              } // case 18
-            case 24:
-              {
-                effect_ = input.readEnum();
-
-                break;
-              } // case 24
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3.PrincipalAccessBoundaryPolicyRule) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1327,18 +1369,7 @@ public PrincipalAccessBoundaryPolicyRule parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PrincipalAccessBoundaryPolicyRule(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsRequest.java
index 5a0187cdd6..61455c2f0b 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsRequest.java
@@ -56,6 +56,64 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SearchPrincipalAccessBoundaryPolicyBindingsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 24:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3_SearchPrincipalAccessBoundaryPolicyBindingsRequest_descriptor;
@@ -236,7 +294,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, pageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -254,7 +312,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, pageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -273,7 +331,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getName().equals(other.getName())) return false;
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -290,7 +348,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageSize();
     hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -423,10 +481,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     // Construct using
     // com.google.iam.v3.SearchPrincipalAccessBoundaryPolicyBindingsRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -534,7 +599,7 @@ public Builder mergeFrom(
         pageToken_ = other.pageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -549,49 +614,19 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.SearchPrincipalAccessBoundaryPolicyBindingsRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 24:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 24
-            case 34:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3.SearchPrincipalAccessBoundaryPolicyBindingsRequest)
+                e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -963,19 +998,8 @@ public SearchPrincipalAccessBoundaryPolicyBindingsRequest parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new SearchPrincipalAccessBoundaryPolicyBindingsRequest(
+                  input, extensionRegistry);
             }
           };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsResponse.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsResponse.java
index cef51d414a..b98a52fd53 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsResponse.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchPrincipalAccessBoundaryPolicyBindingsResponse.java
@@ -56,6 +56,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SearchPrincipalAccessBoundaryPolicyBindingsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                policyBindings_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              policyBindings_.add(
+                  input.readMessage(com.google.iam.v3.PolicyBinding.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        policyBindings_ = java.util.Collections.unmodifiableList(policyBindings_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3_SearchPrincipalAccessBoundaryPolicyBindingsResponse_descriptor;
@@ -218,7 +278,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -233,7 +293,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -251,7 +311,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getPolicyBindingsList().equals(other.getPolicyBindingsList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -268,7 +328,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -401,10 +461,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     // Construct using
     // com.google.iam.v3.SearchPrincipalAccessBoundaryPolicyBindingsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPolicyBindingsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -412,11 +481,10 @@ public Builder clear() {
       super.clear();
       if (policyBindingsBuilder_ == null) {
         policyBindings_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        policyBindings_ = null;
         policyBindingsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -543,7 +611,7 @@ public Builder mergeFrom(
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -558,49 +626,19 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.SearchPrincipalAccessBoundaryPolicyBindingsResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.iam.v3.PolicyBinding m =
-                    input.readMessage(com.google.iam.v3.PolicyBinding.parser(), extensionRegistry);
-                if (policyBindingsBuilder_ == null) {
-                  ensurePolicyBindingsIsMutable();
-                  policyBindings_.add(m);
-                } else {
-                  policyBindingsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3.SearchPrincipalAccessBoundaryPolicyBindingsResponse)
+                e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1127,19 +1165,8 @@ public SearchPrincipalAccessBoundaryPolicyBindingsResponse parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new SearchPrincipalAccessBoundaryPolicyBindingsResponse(
+                  input, extensionRegistry);
             }
           };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsRequest.java
index 6c2372e77b..d7fb407073 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsRequest.java
@@ -56,6 +56,71 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SearchTargetPolicyBindingsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              target_ = s;
+              break;
+            }
+          case 16:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PolicyBindingsServiceProto
         .internal_static_google_iam_v3_SearchTargetPolicyBindingsRequest_descriptor;
@@ -314,7 +379,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 5, parent_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -335,7 +400,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, parent_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -355,7 +420,7 @@ public boolean equals(final java.lang.Object obj) {
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
     if (!getParent().equals(other.getParent())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -374,7 +439,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageToken().hashCode();
     hash = (37 * hash) + PARENT_FIELD_NUMBER;
     hash = (53 * hash) + getParent().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -504,10 +569,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.SearchTargetPolicyBindingsRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -617,7 +689,7 @@ public Builder mergeFrom(com.google.iam.v3.SearchTargetPolicyBindingsRequest oth
         parent_ = other.parent_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -632,55 +704,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.SearchTargetPolicyBindingsRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                target_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 42:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 42
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3.SearchTargetPolicyBindingsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1218,18 +1253,7 @@ public SearchTargetPolicyBindingsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new SearchTargetPolicyBindingsRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsResponse.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsResponse.java
index 7b46d6a636..bf2b935a14 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsResponse.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/SearchTargetPolicyBindingsResponse.java
@@ -55,6 +55,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SearchTargetPolicyBindingsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                policyBindings_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              policyBindings_.add(
+                  input.readMessage(com.google.iam.v3.PolicyBinding.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        policyBindings_ = java.util.Collections.unmodifiableList(policyBindings_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PolicyBindingsServiceProto
         .internal_static_google_iam_v3_SearchTargetPolicyBindingsResponse_descriptor;
@@ -217,7 +277,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -232,7 +292,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -250,7 +310,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getPolicyBindingsList().equals(other.getPolicyBindingsList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -267,7 +327,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -397,10 +457,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.SearchTargetPolicyBindingsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPolicyBindingsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -408,11 +477,10 @@ public Builder clear() {
       super.clear();
       if (policyBindingsBuilder_ == null) {
         policyBindings_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        policyBindings_ = null;
         policyBindingsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -534,7 +602,7 @@ public Builder mergeFrom(com.google.iam.v3.SearchTargetPolicyBindingsResponse ot
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -549,49 +617,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.SearchTargetPolicyBindingsResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.iam.v3.PolicyBinding m =
-                    input.readMessage(com.google.iam.v3.PolicyBinding.parser(), extensionRegistry);
-                if (policyBindingsBuilder_ == null) {
-                  ensurePolicyBindingsIsMutable();
-                  policyBindings_.add(m);
-                } else {
-                  policyBindingsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3.SearchTargetPolicyBindingsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1113,18 +1150,7 @@ public SearchTargetPolicyBindingsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new SearchTargetPolicyBindingsResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePolicyBindingRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePolicyBindingRequest.java
index 1d1c74f116..19c0626f41 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePolicyBindingRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePolicyBindingRequest.java
@@ -51,6 +51,80 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private UpdatePolicyBindingRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.iam.v3.PolicyBinding.Builder subBuilder = null;
+              if (policyBinding_ != null) {
+                subBuilder = policyBinding_.toBuilder();
+              }
+              policyBinding_ =
+                  input.readMessage(com.google.iam.v3.PolicyBinding.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(policyBinding_);
+                policyBinding_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 16:
+            {
+              validateOnly_ = input.readBool();
+              break;
+            }
+          case 26:
+            {
+              com.google.protobuf.FieldMask.Builder subBuilder = null;
+              if (updateMask_ != null) {
+                subBuilder = updateMask_.toBuilder();
+              }
+              updateMask_ =
+                  input.readMessage(com.google.protobuf.FieldMask.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateMask_);
+                updateMask_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PolicyBindingsServiceProto
         .internal_static_google_iam_v3_UpdatePolicyBindingRequest_descriptor;
@@ -224,7 +298,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (updateMask_ != null) {
       output.writeMessage(3, getUpdateMask());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -242,7 +316,7 @@ public int getSerializedSize() {
     if (updateMask_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getUpdateMask());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -267,7 +341,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasUpdateMask()) {
       if (!getUpdateMask().equals(other.getUpdateMask())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -288,7 +362,7 @@ public int hashCode() {
       hash = (37 * hash) + UPDATE_MASK_FIELD_NUMBER;
       hash = (53 * hash) + getUpdateMask().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -418,10 +492,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.UpdatePolicyBindingRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -537,7 +618,7 @@ public Builder mergeFrom(com.google.iam.v3.UpdatePolicyBindingRequest other) {
       if (other.hasUpdateMask()) {
         mergeUpdateMask(other.getUpdateMask());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -552,49 +633,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.UpdatePolicyBindingRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getPolicyBindingFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 16:
-              {
-                validateOnly_ = input.readBool();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v3.UpdatePolicyBindingRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1119,18 +1168,7 @@ public UpdatePolicyBindingRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new UpdatePolicyBindingRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePrincipalAccessBoundaryPolicyRequest.java b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePrincipalAccessBoundaryPolicyRequest.java
index 3a71f44716..a390456de1 100644
--- a/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePrincipalAccessBoundaryPolicyRequest.java
+++ b/java-iam/proto-google-iam-v3/src/main/java/com/google/iam/v3/UpdatePrincipalAccessBoundaryPolicyRequest.java
@@ -53,6 +53,81 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private UpdatePrincipalAccessBoundaryPolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.iam.v3.PrincipalAccessBoundaryPolicy.Builder subBuilder = null;
+              if (principalAccessBoundaryPolicy_ != null) {
+                subBuilder = principalAccessBoundaryPolicy_.toBuilder();
+              }
+              principalAccessBoundaryPolicy_ =
+                  input.readMessage(
+                      com.google.iam.v3.PrincipalAccessBoundaryPolicy.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(principalAccessBoundaryPolicy_);
+                principalAccessBoundaryPolicy_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 16:
+            {
+              validateOnly_ = input.readBool();
+              break;
+            }
+          case 26:
+            {
+              com.google.protobuf.FieldMask.Builder subBuilder = null;
+              if (updateMask_ != null) {
+                subBuilder = updateMask_.toBuilder();
+              }
+              updateMask_ =
+                  input.readMessage(com.google.protobuf.FieldMask.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateMask_);
+                updateMask_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3_UpdatePrincipalAccessBoundaryPolicyRequest_descriptor;
@@ -227,7 +302,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (updateMask_ != null) {
       output.writeMessage(3, getUpdateMask());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -247,7 +322,7 @@ public int getSerializedSize() {
     if (updateMask_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getUpdateMask());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -274,7 +349,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasUpdateMask()) {
       if (!getUpdateMask().equals(other.getUpdateMask())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -295,7 +370,7 @@ public int hashCode() {
       hash = (37 * hash) + UPDATE_MASK_FIELD_NUMBER;
       hash = (53 * hash) + getUpdateMask().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -426,10 +501,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3.UpdatePrincipalAccessBoundaryPolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -548,7 +630,7 @@ public Builder mergeFrom(com.google.iam.v3.UpdatePrincipalAccessBoundaryPolicyRe
       if (other.hasUpdateMask()) {
         mergeUpdateMask(other.getUpdateMask());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -563,50 +645,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3.UpdatePrincipalAccessBoundaryPolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(
-                    getPrincipalAccessBoundaryPolicyFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 16:
-              {
-                validateOnly_ = input.readBool();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3.UpdatePrincipalAccessBoundaryPolicyRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1140,19 +1190,7 @@ public UpdatePrincipalAccessBoundaryPolicyRequest parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new UpdatePrincipalAccessBoundaryPolicyRequest(input, extensionRegistry);
             }
           };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePolicyBindingRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePolicyBindingRequest.java
index 5a30312668..1df4b619ec 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePolicyBindingRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePolicyBindingRequest.java
@@ -54,6 +54,80 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CreatePolicyBindingRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              policyBindingId_ = s;
+              break;
+            }
+          case 26:
+            {
+              com.google.iam.v3beta.PolicyBinding.Builder subBuilder = null;
+              if (policyBinding_ != null) {
+                subBuilder = policyBinding_.toBuilder();
+              }
+              policyBinding_ =
+                  input.readMessage(
+                      com.google.iam.v3beta.PolicyBinding.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(policyBinding_);
+                policyBinding_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 32:
+            {
+              validateOnly_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PolicyBindingsServiceProto
         .internal_static_google_iam_v3beta_CreatePolicyBindingRequest_descriptor;
@@ -300,7 +374,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (validateOnly_ != false) {
       output.writeBool(4, validateOnly_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -321,7 +395,7 @@ public int getSerializedSize() {
     if (validateOnly_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(4, validateOnly_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -344,7 +418,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getPolicyBinding().equals(other.getPolicyBinding())) return false;
     }
     if (getValidateOnly() != other.getValidateOnly()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -365,7 +439,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + VALIDATE_ONLY_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getValidateOnly());
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -495,10 +569,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.CreatePolicyBindingRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -615,7 +696,7 @@ public Builder mergeFrom(com.google.iam.v3beta.CreatePolicyBindingRequest other)
       if (other.getValidateOnly() != false) {
         setValidateOnly(other.getValidateOnly());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -630,55 +711,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.CreatePolicyBindingRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                policyBindingId_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(getPolicyBindingFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            case 32:
-              {
-                validateOnly_ = input.readBool();
-
-                break;
-              } // case 32
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v3beta.CreatePolicyBindingRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1271,18 +1314,7 @@ public CreatePolicyBindingRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new CreatePolicyBindingRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePrincipalAccessBoundaryPolicyRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePrincipalAccessBoundaryPolicyRequest.java
index 13e377051f..323f01a1f6 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePrincipalAccessBoundaryPolicyRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/CreatePrincipalAccessBoundaryPolicyRequest.java
@@ -56,6 +56,81 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CreatePrincipalAccessBoundaryPolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              principalAccessBoundaryPolicyId_ = s;
+              break;
+            }
+          case 26:
+            {
+              com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.Builder subBuilder = null;
+              if (principalAccessBoundaryPolicy_ != null) {
+                subBuilder = principalAccessBoundaryPolicy_.toBuilder();
+              }
+              principalAccessBoundaryPolicy_ =
+                  input.readMessage(
+                      com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(principalAccessBoundaryPolicy_);
+                principalAccessBoundaryPolicy_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 32:
+            {
+              validateOnly_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3beta_CreatePrincipalAccessBoundaryPolicyRequest_descriptor;
@@ -300,7 +375,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (validateOnly_ != false) {
       output.writeBool(4, validateOnly_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -325,7 +400,7 @@ public int getSerializedSize() {
     if (validateOnly_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(4, validateOnly_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -351,7 +426,7 @@ public boolean equals(final java.lang.Object obj) {
         return false;
     }
     if (getValidateOnly() != other.getValidateOnly()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -372,7 +447,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + VALIDATE_ONLY_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getValidateOnly());
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -503,10 +578,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.CreatePrincipalAccessBoundaryPolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -626,7 +708,7 @@ public Builder mergeFrom(
       if (other.getValidateOnly() != false) {
         setValidateOnly(other.getValidateOnly());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -641,56 +723,19 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.CreatePrincipalAccessBoundaryPolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                principalAccessBoundaryPolicyId_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(
-                    getPrincipalAccessBoundaryPolicyFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            case 32:
-              {
-                validateOnly_ = input.readBool();
-
-                break;
-              } // case 32
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3beta.CreatePrincipalAccessBoundaryPolicyRequest)
+                e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1288,19 +1333,7 @@ public CreatePrincipalAccessBoundaryPolicyRequest parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new CreatePrincipalAccessBoundaryPolicyRequest(input, extensionRegistry);
             }
           };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePolicyBindingRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePolicyBindingRequest.java
index 43e2363e53..0de6aa65ea 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePolicyBindingRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePolicyBindingRequest.java
@@ -54,6 +54,64 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DeletePolicyBindingRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              etag_ = s;
+              break;
+            }
+          case 24:
+            {
+              validateOnly_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PolicyBindingsServiceProto
         .internal_static_google_iam_v3beta_DeletePolicyBindingRequest_descriptor;
@@ -230,7 +288,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (validateOnly_ != false) {
       output.writeBool(3, validateOnly_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -248,7 +306,7 @@ public int getSerializedSize() {
     if (validateOnly_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(3, validateOnly_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -267,7 +325,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getName().equals(other.getName())) return false;
     if (!getEtag().equals(other.getEtag())) return false;
     if (getValidateOnly() != other.getValidateOnly()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -284,7 +342,7 @@ public int hashCode() {
     hash = (53 * hash) + getEtag().hashCode();
     hash = (37 * hash) + VALIDATE_ONLY_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getValidateOnly());
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -414,10 +472,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.DeletePolicyBindingRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -520,7 +585,7 @@ public Builder mergeFrom(com.google.iam.v3beta.DeletePolicyBindingRequest other)
       if (other.getValidateOnly() != false) {
         setValidateOnly(other.getValidateOnly());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -535,49 +600,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.DeletePolicyBindingRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                etag_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 24:
-              {
-                validateOnly_ = input.readBool();
-
-                break;
-              } // case 24
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v3beta.DeletePolicyBindingRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -933,18 +966,7 @@ public DeletePolicyBindingRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DeletePolicyBindingRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePrincipalAccessBoundaryPolicyRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePrincipalAccessBoundaryPolicyRequest.java
index 031b2defec..3cfbfa3efd 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePrincipalAccessBoundaryPolicyRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/DeletePrincipalAccessBoundaryPolicyRequest.java
@@ -56,6 +56,69 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DeletePrincipalAccessBoundaryPolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              etag_ = s;
+              break;
+            }
+          case 24:
+            {
+              validateOnly_ = input.readBool();
+              break;
+            }
+          case 32:
+            {
+              force_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3beta_DeletePrincipalAccessBoundaryPolicyRequest_descriptor;
@@ -249,7 +312,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (force_ != false) {
       output.writeBool(4, force_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -270,7 +333,7 @@ public int getSerializedSize() {
     if (force_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(4, force_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -290,7 +353,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getEtag().equals(other.getEtag())) return false;
     if (getValidateOnly() != other.getValidateOnly()) return false;
     if (getForce() != other.getForce()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -309,7 +372,7 @@ public int hashCode() {
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getValidateOnly());
     hash = (37 * hash) + FORCE_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getForce());
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -440,10 +503,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.DeletePrincipalAccessBoundaryPolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -555,7 +625,7 @@ public Builder mergeFrom(
       if (other.getForce() != false) {
         setForce(other.getForce());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -570,55 +640,19 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.DeletePrincipalAccessBoundaryPolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                etag_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 24:
-              {
-                validateOnly_ = input.readBool();
-
-                break;
-              } // case 24
-            case 32:
-              {
-                force_ = input.readBool();
-
-                break;
-              } // case 32
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3beta.DeletePrincipalAccessBoundaryPolicyRequest)
+                e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1020,19 +1054,7 @@ public DeletePrincipalAccessBoundaryPolicyRequest parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new DeletePrincipalAccessBoundaryPolicyRequest(input, extensionRegistry);
             }
           };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPolicyBindingRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPolicyBindingRequest.java
index bcce3e73a0..65dfce3630 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPolicyBindingRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPolicyBindingRequest.java
@@ -53,6 +53,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private GetPolicyBindingRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PolicyBindingsServiceProto
         .internal_static_google_iam_v3beta_GetPolicyBindingRequest_descriptor;
@@ -150,7 +196,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -162,7 +208,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -179,7 +225,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.iam.v3beta.GetPolicyBindingRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -192,7 +238,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -322,10 +368,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.GetPolicyBindingRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -414,7 +467,7 @@ public Builder mergeFrom(com.google.iam.v3beta.GetPolicyBindingRequest other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -429,37 +482,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.GetPolicyBindingRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v3beta.GetPolicyBindingRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -641,18 +674,7 @@ public GetPolicyBindingRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new GetPolicyBindingRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPrincipalAccessBoundaryPolicyRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPrincipalAccessBoundaryPolicyRequest.java
index 9e69a1c428..c23e57ffe5 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPrincipalAccessBoundaryPolicyRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/GetPrincipalAccessBoundaryPolicyRequest.java
@@ -55,6 +55,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private GetPrincipalAccessBoundaryPolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3beta_GetPrincipalAccessBoundaryPolicyRequest_descriptor;
@@ -146,7 +192,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -158,7 +204,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -175,7 +221,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.iam.v3beta.GetPrincipalAccessBoundaryPolicyRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -188,7 +234,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -319,10 +365,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.GetPrincipalAccessBoundaryPolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -414,7 +467,7 @@ public Builder mergeFrom(com.google.iam.v3beta.GetPrincipalAccessBoundaryPolicyR
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -429,37 +482,19 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.GetPrincipalAccessBoundaryPolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3beta.GetPrincipalAccessBoundaryPolicyRequest)
+                e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -627,18 +662,7 @@ public GetPrincipalAccessBoundaryPolicyRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new GetPrincipalAccessBoundaryPolicyRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsRequest.java
index 03b7b560fe..4b2d2a9892 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsRequest.java
@@ -55,6 +55,71 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListPolicyBindingsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          case 16:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              filter_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PolicyBindingsServiceProto
         .internal_static_google_iam_v3beta_ListPolicyBindingsRequest_descriptor;
@@ -307,7 +372,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, filter_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -328,7 +393,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, filter_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -348,7 +413,7 @@ public boolean equals(final java.lang.Object obj) {
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
     if (!getFilter().equals(other.getFilter())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -367,7 +432,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageToken().hashCode();
     hash = (37 * hash) + FILTER_FIELD_NUMBER;
     hash = (53 * hash) + getFilter().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -497,10 +562,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.ListPolicyBindingsRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -610,7 +682,7 @@ public Builder mergeFrom(com.google.iam.v3beta.ListPolicyBindingsRequest other)
         filter_ = other.filter_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -625,55 +697,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.ListPolicyBindingsRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                filter_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v3beta.ListPolicyBindingsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1196,18 +1230,7 @@ public ListPolicyBindingsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListPolicyBindingsRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsResponse.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsResponse.java
index 85505dbc11..87f2508649 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsResponse.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPolicyBindingsResponse.java
@@ -54,6 +54,67 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListPolicyBindingsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                policyBindings_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              policyBindings_.add(
+                  input.readMessage(
+                      com.google.iam.v3beta.PolicyBinding.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        policyBindings_ = java.util.Collections.unmodifiableList(policyBindings_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PolicyBindingsServiceProto
         .internal_static_google_iam_v3beta_ListPolicyBindingsResponse_descriptor;
@@ -216,7 +277,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -231,7 +292,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -249,7 +310,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getPolicyBindingsList().equals(other.getPolicyBindingsList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -266,7 +327,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -396,10 +457,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.ListPolicyBindingsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPolicyBindingsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -407,11 +477,10 @@ public Builder clear() {
       super.clear();
       if (policyBindingsBuilder_ == null) {
         policyBindings_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        policyBindings_ = null;
         policyBindingsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -533,7 +602,7 @@ public Builder mergeFrom(com.google.iam.v3beta.ListPolicyBindingsResponse other)
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -548,50 +617,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.ListPolicyBindingsResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.iam.v3beta.PolicyBinding m =
-                    input.readMessage(
-                        com.google.iam.v3beta.PolicyBinding.parser(), extensionRegistry);
-                if (policyBindingsBuilder_ == null) {
-                  ensurePolicyBindingsIsMutable();
-                  policyBindings_.add(m);
-                } else {
-                  policyBindingsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v3beta.ListPolicyBindingsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1115,18 +1151,7 @@ public ListPolicyBindingsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListPolicyBindingsResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesRequest.java
index 3d3b5dd67f..9a33c9812e 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesRequest.java
@@ -56,6 +56,64 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListPrincipalAccessBoundaryPoliciesRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          case 16:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3beta_ListPrincipalAccessBoundaryPoliciesRequest_descriptor;
@@ -239,7 +297,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -257,7 +315,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -276,7 +334,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getParent().equals(other.getParent())) return false;
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -293,7 +351,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageSize();
     hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -424,10 +482,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.ListPrincipalAccessBoundaryPoliciesRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -533,7 +598,7 @@ public Builder mergeFrom(
         pageToken_ = other.pageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -548,49 +613,19 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.ListPrincipalAccessBoundaryPoliciesRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3beta.ListPrincipalAccessBoundaryPoliciesRequest)
+                e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -968,19 +1003,7 @@ public ListPrincipalAccessBoundaryPoliciesRequest parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new ListPrincipalAccessBoundaryPoliciesRequest(input, extensionRegistry);
             }
           };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesResponse.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesResponse.java
index 0a5ced2d79..a60907dd23 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesResponse.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/ListPrincipalAccessBoundaryPoliciesResponse.java
@@ -56,6 +56,70 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListPrincipalAccessBoundaryPoliciesResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                principalAccessBoundaryPolicies_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              principalAccessBoundaryPolicies_.add(
+                  input.readMessage(
+                      com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.parser(),
+                      extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        principalAccessBoundaryPolicies_ =
+            java.util.Collections.unmodifiableList(principalAccessBoundaryPolicies_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3beta_ListPrincipalAccessBoundaryPoliciesResponse_descriptor;
@@ -232,7 +296,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -249,7 +313,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -268,7 +332,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getPrincipalAccessBoundaryPoliciesList()
         .equals(other.getPrincipalAccessBoundaryPoliciesList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -285,7 +349,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -418,10 +482,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     // Construct using
     // com.google.iam.v3beta.ListPrincipalAccessBoundaryPoliciesResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPrincipalAccessBoundaryPoliciesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -429,11 +502,10 @@ public Builder clear() {
       super.clear();
       if (principalAccessBoundaryPoliciesBuilder_ == null) {
         principalAccessBoundaryPolicies_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        principalAccessBoundaryPolicies_ = null;
         principalAccessBoundaryPoliciesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -560,7 +632,7 @@ public Builder mergeFrom(
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -575,51 +647,19 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.ListPrincipalAccessBoundaryPoliciesResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.iam.v3beta.PrincipalAccessBoundaryPolicy m =
-                    input.readMessage(
-                        com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.parser(),
-                        extensionRegistry);
-                if (principalAccessBoundaryPoliciesBuilder_ == null) {
-                  ensurePrincipalAccessBoundaryPoliciesIsMutable();
-                  principalAccessBoundaryPolicies_.add(m);
-                } else {
-                  principalAccessBoundaryPoliciesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3beta.ListPrincipalAccessBoundaryPoliciesResponse)
+                e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1195,19 +1235,7 @@ public ListPrincipalAccessBoundaryPoliciesResponse parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new ListPrincipalAccessBoundaryPoliciesResponse(input, extensionRegistry);
             }
           };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/OperationMetadata.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/OperationMetadata.java
index bb16a697b1..e4bd1f875a 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/OperationMetadata.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/OperationMetadata.java
@@ -56,6 +56,108 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private OperationMetadata(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (createTime_ != null) {
+                subBuilder = createTime_.toBuilder();
+              }
+              createTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(createTime_);
+                createTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (endTime_ != null) {
+                subBuilder = endTime_.toBuilder();
+              }
+              endTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(endTime_);
+                endTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              target_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              verb_ = s;
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              statusMessage_ = s;
+              break;
+            }
+          case 48:
+            {
+              requestedCancellation_ = input.readBool();
+              break;
+            }
+          case 58:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              apiVersion_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.OperationMetadataProto
         .internal_static_google_iam_v3beta_OperationMetadata_descriptor;
@@ -437,7 +539,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(apiVersion_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 7, apiVersion_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -467,7 +569,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(apiVersion_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, apiVersion_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -495,7 +597,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getStatusMessage().equals(other.getStatusMessage())) return false;
     if (getRequestedCancellation() != other.getRequestedCancellation()) return false;
     if (!getApiVersion().equals(other.getApiVersion())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -524,7 +626,7 @@ public int hashCode() {
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getRequestedCancellation());
     hash = (37 * hash) + API_VERSION_FIELD_NUMBER;
     hash = (53 * hash) + getApiVersion().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -654,10 +756,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.OperationMetadata.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -801,7 +910,7 @@ public Builder mergeFrom(com.google.iam.v3beta.OperationMetadata other) {
         apiVersion_ = other.apiVersion_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -816,73 +925,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.OperationMetadata parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            case 26:
-              {
-                target_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                verb_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            case 42:
-              {
-                statusMessage_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 42
-            case 48:
-              {
-                requestedCancellation_ = input.readBool();
-
-                break;
-              } // case 48
-            case 58:
-              {
-                apiVersion_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 58
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v3beta.OperationMetadata) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1836,18 +1889,7 @@ public OperationMetadata parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new OperationMetadata(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBinding.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBinding.java
index 7361798047..797008c718 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBinding.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PolicyBinding.java
@@ -59,6 +59,170 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PolicyBinding(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              uid_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              etag_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              displayName_ = s;
+              break;
+            }
+          case 42:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                annotations_ =
+                    com.google.protobuf.MapField.newMapField(
+                        AnnotationsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry annotations__ =
+                  input.readMessage(
+                      AnnotationsDefaultEntryHolder.defaultEntry.getParserForType(),
+                      extensionRegistry);
+              annotations_.getMutableMap().put(annotations__.getKey(), annotations__.getValue());
+              break;
+            }
+          case 50:
+            {
+              com.google.iam.v3beta.PolicyBinding.Target.Builder subBuilder = null;
+              if (target_ != null) {
+                subBuilder = target_.toBuilder();
+              }
+              target_ =
+                  input.readMessage(
+                      com.google.iam.v3beta.PolicyBinding.Target.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(target_);
+                target_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 58:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              policy_ = s;
+              break;
+            }
+          case 66:
+            {
+              com.google.type.Expr.Builder subBuilder = null;
+              if (condition_ != null) {
+                subBuilder = condition_.toBuilder();
+              }
+              condition_ = input.readMessage(com.google.type.Expr.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(condition_);
+                condition_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 74:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (createTime_ != null) {
+                subBuilder = createTime_.toBuilder();
+              }
+              createTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(createTime_);
+                createTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 82:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (updateTime_ != null) {
+                subBuilder = updateTime_.toBuilder();
+              }
+              updateTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateTime_);
+                updateTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 88:
+            {
+              int rawValue = input.readEnum();
+
+              policyKind_ = rawValue;
+              break;
+            }
+          case 98:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              policyUid_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PolicyBindingResourcesProto
         .internal_static_google_iam_v3beta_PolicyBinding_descriptor;
@@ -362,6 +526,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Target(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+                targetCase_ = 1;
+                target_ = s;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.iam.v3beta.PolicyBindingResourcesProto
           .internal_static_google_iam_v3beta_PolicyBinding_Target_descriptor;
@@ -572,7 +782,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (targetCase_ == 1) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, target_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -584,7 +794,7 @@ public int getSerializedSize() {
       if (targetCase_ == 1) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, target_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -608,7 +818,7 @@ public boolean equals(final java.lang.Object obj) {
         case 0:
         default:
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -627,7 +837,7 @@ public int hashCode() {
         case 0:
         default:
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -760,10 +970,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.iam.v3beta.PolicyBinding.Target.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -866,7 +1083,7 @@ public Builder mergeFrom(com.google.iam.v3beta.PolicyBinding.Target other) {
               break;
             }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -881,38 +1098,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.iam.v3beta.PolicyBinding.Target parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  java.lang.String s = input.readStringRequireUtf8();
-                  targetCase_ = 1;
-                  target_ = s;
-                  break;
-                } // case 10
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.iam.v3beta.PolicyBinding.Target) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1222,19 +1418,7 @@ public Target parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Target(input, extensionRegistry);
           }
         };
 
@@ -2100,7 +2284,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policyUid_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 12, policyUid_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -2153,7 +2337,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(policyUid_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, policyUid_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -2192,7 +2376,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasUpdateTime()) {
       if (!getUpdateTime().equals(other.getUpdateTime())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -2237,7 +2421,7 @@ public int hashCode() {
       hash = (37 * hash) + UPDATE_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getUpdateTime().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -2386,10 +2570,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.iam.v3beta.PolicyBinding.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -2579,7 +2770,7 @@ public Builder mergeFrom(com.google.iam.v3beta.PolicyBinding other) {
       if (other.hasUpdateTime()) {
         mergeUpdateTime(other.getUpdateTime());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2594,108 +2785,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.PolicyBinding parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                uid_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                etag_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                displayName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            case 42:
-              {
-                com.google.protobuf.MapEntry annotations__ =
-                    input.readMessage(
-                        AnnotationsDefaultEntryHolder.defaultEntry.getParserForType(),
-                        extensionRegistry);
-                internalGetMutableAnnotations()
-                    .getMutableMap()
-                    .put(annotations__.getKey(), annotations__.getValue());
-                break;
-              } // case 42
-            case 50:
-              {
-                input.readMessage(getTargetFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 50
-            case 58:
-              {
-                policy_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 58
-            case 66:
-              {
-                input.readMessage(getConditionFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 66
-            case 74:
-              {
-                input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 74
-            case 82:
-              {
-                input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 82
-            case 88:
-              {
-                policyKind_ = input.readEnum();
-
-                break;
-              } // case 88
-            case 98:
-              {
-                policyUid_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 98
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v3beta.PolicyBinding) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -4856,18 +4956,7 @@ public PolicyBinding parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PolicyBinding(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicy.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicy.java
index d9522754d9..329a572212 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicy.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicy.java
@@ -56,6 +56,136 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PrincipalAccessBoundaryPolicy(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              uid_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              etag_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              displayName_ = s;
+              break;
+            }
+          case 42:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                annotations_ =
+                    com.google.protobuf.MapField.newMapField(
+                        AnnotationsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry annotations__ =
+                  input.readMessage(
+                      AnnotationsDefaultEntryHolder.defaultEntry.getParserForType(),
+                      extensionRegistry);
+              annotations_.getMutableMap().put(annotations__.getKey(), annotations__.getValue());
+              break;
+            }
+          case 50:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (createTime_ != null) {
+                subBuilder = createTime_.toBuilder();
+              }
+              createTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(createTime_);
+                createTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 58:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (updateTime_ != null) {
+                subBuilder = updateTime_.toBuilder();
+              }
+              updateTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateTime_);
+                updateTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 66:
+            {
+              com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails.Builder subBuilder = null;
+              if (details_ != null) {
+                subBuilder = details_.toBuilder();
+              }
+              details_ =
+                  input.readMessage(
+                      com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails.parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(details_);
+                details_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PrincipalAccessBoundaryPolicyResourcesProto
         .internal_static_google_iam_v3beta_PrincipalAccessBoundaryPolicy_descriptor;
@@ -621,7 +751,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (details_ != null) {
       output.writeMessage(8, getDetails());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -661,7 +791,7 @@ public int getSerializedSize() {
     if (details_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getDetails());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -694,7 +824,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasDetails()) {
       if (!getDetails().equals(other.getDetails())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -729,7 +859,7 @@ public int hashCode() {
       hash = (37 * hash) + DETAILS_FIELD_NUMBER;
       hash = (53 * hash) + getDetails().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -879,10 +1009,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1040,7 +1177,7 @@ public Builder mergeFrom(com.google.iam.v3beta.PrincipalAccessBoundaryPolicy oth
       if (other.hasDetails()) {
         mergeDetails(other.getDetails());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1055,84 +1192,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.PrincipalAccessBoundaryPolicy parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                uid_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                etag_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                displayName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            case 42:
-              {
-                com.google.protobuf.MapEntry annotations__ =
-                    input.readMessage(
-                        AnnotationsDefaultEntryHolder.defaultEntry.getParserForType(),
-                        extensionRegistry);
-                internalGetMutableAnnotations()
-                    .getMutableMap()
-                    .put(annotations__.getKey(), annotations__.getValue());
-                break;
-              } // case 42
-            case 50:
-              {
-                input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 50
-            case 58:
-              {
-                input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 58
-            case 66:
-              {
-                input.readMessage(getDetailsFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 66
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3beta.PrincipalAccessBoundaryPolicy) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2492,18 +2563,7 @@ public PrincipalAccessBoundaryPolicy parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PrincipalAccessBoundaryPolicy(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyDetails.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyDetails.java
index 9c79fd5fe5..fd80b458c7 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyDetails.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyDetails.java
@@ -56,6 +56,70 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PrincipalAccessBoundaryPolicyDetails(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                rules_ =
+                    new java.util.ArrayList<
+                        com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              rules_.add(
+                  input.readMessage(
+                      com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule.parser(),
+                      extensionRegistry));
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              enforcementVersion_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        rules_ = java.util.Collections.unmodifiableList(rules_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PrincipalAccessBoundaryPolicyResourcesProto
         .internal_static_google_iam_v3beta_PrincipalAccessBoundaryPolicyDetails_descriptor;
@@ -240,7 +304,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(enforcementVersion_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, enforcementVersion_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -255,7 +319,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(enforcementVersion_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, enforcementVersion_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -273,7 +337,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getRulesList().equals(other.getRulesList())) return false;
     if (!getEnforcementVersion().equals(other.getEnforcementVersion())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -290,7 +354,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + ENFORCEMENT_VERSION_FIELD_NUMBER;
     hash = (53 * hash) + getEnforcementVersion().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -421,10 +485,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getRulesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -432,11 +505,10 @@ public Builder clear() {
       super.clear();
       if (rulesBuilder_ == null) {
         rules_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        rules_ = null;
         rulesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       enforcementVersion_ = "";
 
       return this;
@@ -558,7 +630,7 @@ public Builder mergeFrom(com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDeta
         enforcementVersion_ = other.enforcementVersion_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -573,51 +645,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule m =
-                    input.readMessage(
-                        com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule.parser(),
-                        extensionRegistry);
-                if (rulesBuilder_ == null) {
-                  ensureRulesIsMutable();
-                  rules_.add(m);
-                } else {
-                  rulesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 34:
-              {
-                enforcementVersion_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3beta.PrincipalAccessBoundaryPolicyDetails) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1219,18 +1258,7 @@ public PrincipalAccessBoundaryPolicyDetails parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PrincipalAccessBoundaryPolicyDetails(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyRule.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyRule.java
index 021d67b267..2824da80e7 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyRule.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPolicyRule.java
@@ -56,6 +56,73 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PrincipalAccessBoundaryPolicyRule(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              description_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                resources_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              resources_.add(s);
+              break;
+            }
+          case 24:
+            {
+              int rawValue = input.readEnum();
+
+              effect_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        resources_ = resources_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PrincipalAccessBoundaryPolicyResourcesProto
         .internal_static_google_iam_v3beta_PrincipalAccessBoundaryPolicyRule_descriptor;
@@ -434,7 +501,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
             .getNumber()) {
       output.writeEnum(3, effect_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -459,7 +526,7 @@ public int getSerializedSize() {
             .getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(3, effect_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -478,7 +545,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getDescription().equals(other.getDescription())) return false;
     if (!getResourcesList().equals(other.getResourcesList())) return false;
     if (effect_ != other.effect_) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -497,7 +564,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + EFFECT_FIELD_NUMBER;
     hash = (53 * hash) + effect_;
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -628,10 +695,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -745,7 +819,7 @@ public Builder mergeFrom(com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule
       if (other.effect_ != 0) {
         setEffectValue(other.getEffectValue());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -760,50 +834,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                description_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureResourcesIsMutable();
-                resources_.add(s);
-                break;
-              } // case 18
-            case 24:
-              {
-                effect_ = input.readEnum();
-
-                break;
-              } // case 24
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3beta.PrincipalAccessBoundaryPolicyRule) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1328,18 +1370,7 @@ public PrincipalAccessBoundaryPolicyRule parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PrincipalAccessBoundaryPolicyRule(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsRequest.java
index 255ce5cff2..c6684ef8c1 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsRequest.java
@@ -56,6 +56,64 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SearchPrincipalAccessBoundaryPolicyBindingsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 24:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3beta_SearchPrincipalAccessBoundaryPolicyBindingsRequest_descriptor;
@@ -236,7 +294,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, pageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -254,7 +312,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, pageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -274,7 +332,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getName().equals(other.getName())) return false;
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -291,7 +349,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageSize();
     hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -425,10 +483,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     // Construct using
     // com.google.iam.v3beta.SearchPrincipalAccessBoundaryPolicyBindingsRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -538,7 +603,7 @@ public Builder mergeFrom(
         pageToken_ = other.pageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -553,49 +618,19 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.SearchPrincipalAccessBoundaryPolicyBindingsRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 24:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 24
-            case 34:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3beta.SearchPrincipalAccessBoundaryPolicyBindingsRequest)
+                e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -968,19 +1003,8 @@ public SearchPrincipalAccessBoundaryPolicyBindingsRequest parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new SearchPrincipalAccessBoundaryPolicyBindingsRequest(
+                  input, extensionRegistry);
             }
           };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsResponse.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsResponse.java
index 35aea7e509..956a2fbb27 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsResponse.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchPrincipalAccessBoundaryPolicyBindingsResponse.java
@@ -56,6 +56,67 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SearchPrincipalAccessBoundaryPolicyBindingsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                policyBindings_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              policyBindings_.add(
+                  input.readMessage(
+                      com.google.iam.v3beta.PolicyBinding.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        policyBindings_ = java.util.Collections.unmodifiableList(policyBindings_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3beta_SearchPrincipalAccessBoundaryPolicyBindingsResponse_descriptor;
@@ -219,7 +280,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -234,7 +295,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -253,7 +314,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getPolicyBindingsList().equals(other.getPolicyBindingsList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -270,7 +331,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -404,10 +465,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
     // Construct using
     // com.google.iam.v3beta.SearchPrincipalAccessBoundaryPolicyBindingsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPolicyBindingsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -415,11 +485,10 @@ public Builder clear() {
       super.clear();
       if (policyBindingsBuilder_ == null) {
         policyBindings_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        policyBindings_ = null;
         policyBindingsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -549,7 +618,7 @@ public Builder mergeFrom(
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -564,50 +633,20 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.SearchPrincipalAccessBoundaryPolicyBindingsResponse parsedMessage =
+          null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.iam.v3beta.PolicyBinding m =
-                    input.readMessage(
-                        com.google.iam.v3beta.PolicyBinding.parser(), extensionRegistry);
-                if (policyBindingsBuilder_ == null) {
-                  ensurePolicyBindingsIsMutable();
-                  policyBindings_.add(m);
-                } else {
-                  policyBindingsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3beta.SearchPrincipalAccessBoundaryPolicyBindingsResponse)
+                e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1137,19 +1176,8 @@ public SearchPrincipalAccessBoundaryPolicyBindingsResponse parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new SearchPrincipalAccessBoundaryPolicyBindingsResponse(
+                  input, extensionRegistry);
             }
           };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsRequest.java
index 4f517a307c..74cd9c63bd 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsRequest.java
@@ -56,6 +56,71 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SearchTargetPolicyBindingsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              target_ = s;
+              break;
+            }
+          case 16:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PolicyBindingsServiceProto
         .internal_static_google_iam_v3beta_SearchTargetPolicyBindingsRequest_descriptor;
@@ -314,7 +379,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 5, parent_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -335,7 +400,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, parent_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -355,7 +420,7 @@ public boolean equals(final java.lang.Object obj) {
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
     if (!getParent().equals(other.getParent())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -374,7 +439,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageToken().hashCode();
     hash = (37 * hash) + PARENT_FIELD_NUMBER;
     hash = (53 * hash) + getParent().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -505,10 +570,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.SearchTargetPolicyBindingsRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -618,7 +690,7 @@ public Builder mergeFrom(com.google.iam.v3beta.SearchTargetPolicyBindingsRequest
         parent_ = other.parent_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -633,55 +705,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.SearchTargetPolicyBindingsRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                target_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 42:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 42
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3beta.SearchTargetPolicyBindingsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1219,18 +1254,7 @@ public SearchTargetPolicyBindingsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new SearchTargetPolicyBindingsRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsResponse.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsResponse.java
index 621e566b4c..ad42b21f5f 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsResponse.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/SearchTargetPolicyBindingsResponse.java
@@ -55,6 +55,67 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SearchTargetPolicyBindingsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                policyBindings_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              policyBindings_.add(
+                  input.readMessage(
+                      com.google.iam.v3beta.PolicyBinding.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        policyBindings_ = java.util.Collections.unmodifiableList(policyBindings_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PolicyBindingsServiceProto
         .internal_static_google_iam_v3beta_SearchTargetPolicyBindingsResponse_descriptor;
@@ -217,7 +278,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -232,7 +293,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -250,7 +311,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getPolicyBindingsList().equals(other.getPolicyBindingsList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -267,7 +328,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -398,10 +459,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.SearchTargetPolicyBindingsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getPolicyBindingsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -409,11 +479,10 @@ public Builder clear() {
       super.clear();
       if (policyBindingsBuilder_ == null) {
         policyBindings_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        policyBindings_ = null;
         policyBindingsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -535,7 +604,7 @@ public Builder mergeFrom(com.google.iam.v3beta.SearchTargetPolicyBindingsRespons
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -550,50 +619,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.SearchTargetPolicyBindingsResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.iam.v3beta.PolicyBinding m =
-                    input.readMessage(
-                        com.google.iam.v3beta.PolicyBinding.parser(), extensionRegistry);
-                if (policyBindingsBuilder_ == null) {
-                  ensurePolicyBindingsIsMutable();
-                  policyBindings_.add(m);
-                } else {
-                  policyBindingsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3beta.SearchTargetPolicyBindingsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1117,18 +1154,7 @@ public SearchTargetPolicyBindingsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new SearchTargetPolicyBindingsResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePolicyBindingRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePolicyBindingRequest.java
index 2ec60bf595..6c72fdaa77 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePolicyBindingRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePolicyBindingRequest.java
@@ -51,6 +51,81 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private UpdatePolicyBindingRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.iam.v3beta.PolicyBinding.Builder subBuilder = null;
+              if (policyBinding_ != null) {
+                subBuilder = policyBinding_.toBuilder();
+              }
+              policyBinding_ =
+                  input.readMessage(
+                      com.google.iam.v3beta.PolicyBinding.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(policyBinding_);
+                policyBinding_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 16:
+            {
+              validateOnly_ = input.readBool();
+              break;
+            }
+          case 26:
+            {
+              com.google.protobuf.FieldMask.Builder subBuilder = null;
+              if (updateMask_ != null) {
+                subBuilder = updateMask_.toBuilder();
+              }
+              updateMask_ =
+                  input.readMessage(com.google.protobuf.FieldMask.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateMask_);
+                updateMask_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PolicyBindingsServiceProto
         .internal_static_google_iam_v3beta_UpdatePolicyBindingRequest_descriptor;
@@ -224,7 +299,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (updateMask_ != null) {
       output.writeMessage(3, getUpdateMask());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -242,7 +317,7 @@ public int getSerializedSize() {
     if (updateMask_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getUpdateMask());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -267,7 +342,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasUpdateMask()) {
       if (!getUpdateMask().equals(other.getUpdateMask())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -288,7 +363,7 @@ public int hashCode() {
       hash = (37 * hash) + UPDATE_MASK_FIELD_NUMBER;
       hash = (53 * hash) + getUpdateMask().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -418,10 +493,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.UpdatePolicyBindingRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -538,7 +620,7 @@ public Builder mergeFrom(com.google.iam.v3beta.UpdatePolicyBindingRequest other)
       if (other.hasUpdateMask()) {
         mergeUpdateMask(other.getUpdateMask());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -553,49 +635,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.UpdatePolicyBindingRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getPolicyBindingFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 16:
-              {
-                validateOnly_ = input.readBool();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.iam.v3beta.UpdatePolicyBindingRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1120,18 +1170,7 @@ public UpdatePolicyBindingRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new UpdatePolicyBindingRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePrincipalAccessBoundaryPolicyRequest.java b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePrincipalAccessBoundaryPolicyRequest.java
index d7cc0806c7..2a9272499d 100644
--- a/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePrincipalAccessBoundaryPolicyRequest.java
+++ b/java-iam/proto-google-iam-v3beta/src/main/java/com/google/iam/v3beta/UpdatePrincipalAccessBoundaryPolicyRequest.java
@@ -53,6 +53,82 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private UpdatePrincipalAccessBoundaryPolicyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.Builder subBuilder = null;
+              if (principalAccessBoundaryPolicy_ != null) {
+                subBuilder = principalAccessBoundaryPolicy_.toBuilder();
+              }
+              principalAccessBoundaryPolicy_ =
+                  input.readMessage(
+                      com.google.iam.v3beta.PrincipalAccessBoundaryPolicy.parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(principalAccessBoundaryPolicy_);
+                principalAccessBoundaryPolicy_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 16:
+            {
+              validateOnly_ = input.readBool();
+              break;
+            }
+          case 26:
+            {
+              com.google.protobuf.FieldMask.Builder subBuilder = null;
+              if (updateMask_ != null) {
+                subBuilder = updateMask_.toBuilder();
+              }
+              updateMask_ =
+                  input.readMessage(com.google.protobuf.FieldMask.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateMask_);
+                updateMask_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.iam.v3beta.PrincipalAccessBoundaryPoliciesServiceProto
         .internal_static_google_iam_v3beta_UpdatePrincipalAccessBoundaryPolicyRequest_descriptor;
@@ -227,7 +303,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (updateMask_ != null) {
       output.writeMessage(3, getUpdateMask());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -247,7 +323,7 @@ public int getSerializedSize() {
     if (updateMask_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getUpdateMask());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -274,7 +350,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasUpdateMask()) {
       if (!getUpdateMask().equals(other.getUpdateMask())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -295,7 +371,7 @@ public int hashCode() {
       hash = (37 * hash) + UPDATE_MASK_FIELD_NUMBER;
       hash = (53 * hash) + getUpdateMask().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -426,10 +502,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.iam.v3beta.UpdatePrincipalAccessBoundaryPolicyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -549,7 +632,7 @@ public Builder mergeFrom(
       if (other.hasUpdateMask()) {
         mergeUpdateMask(other.getUpdateMask());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -564,50 +647,19 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.iam.v3beta.UpdatePrincipalAccessBoundaryPolicyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(
-                    getPrincipalAccessBoundaryPolicyFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 16:
-              {
-                validateOnly_ = input.readBool();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.iam.v3beta.UpdatePrincipalAccessBoundaryPolicyRequest)
+                e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1142,19 +1194,7 @@ public UpdatePrincipalAccessBoundaryPolicyRequest parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new UpdatePrincipalAccessBoundaryPolicyRequest(input, extensionRegistry);
             }
           };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptSequenceRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptSequenceRequest.java
index 56a057335c..7f7e53ed8c 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptSequenceRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptSequenceRequest.java
@@ -45,6 +45,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private AttemptSequenceRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_AttemptSequenceRequest_descriptor;
@@ -120,7 +166,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -132,7 +178,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -149,7 +195,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.AttemptSequenceRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -162,7 +208,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -284,10 +330,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.AttemptSequenceRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -377,7 +430,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.AttemptSequenceRequest othe
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -392,37 +445,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.AttemptSequenceRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.AttemptSequenceRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -549,18 +583,7 @@ public AttemptSequenceRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new AttemptSequenceRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceRequest.java
index 26215b39c0..1bdd243c27 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceRequest.java
@@ -46,6 +46,57 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private AttemptStreamingSequenceRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 16:
+            {
+              lastFailIndex_ = input.readInt32();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_AttemptStreamingSequenceRequest_descriptor;
@@ -145,7 +196,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (lastFailIndex_ != 0) {
       output.writeInt32(2, lastFailIndex_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -160,7 +211,7 @@ public int getSerializedSize() {
     if (lastFailIndex_ != 0) {
       size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, lastFailIndex_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -178,7 +229,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getName().equals(other.getName())) return false;
     if (getLastFailIndex() != other.getLastFailIndex()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -193,7 +244,7 @@ public int hashCode() {
     hash = (53 * hash) + getName().hashCode();
     hash = (37 * hash) + LAST_FAIL_INDEX_FIELD_NUMBER;
     hash = (53 * hash) + getLastFailIndex();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -316,10 +367,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.AttemptStreamingSequenceRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -415,7 +473,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.AttemptStreamingSequenceReq
       if (other.getLastFailIndex() != 0) {
         setLastFailIndex(other.getLastFailIndex());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -430,43 +488,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.AttemptStreamingSequenceRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                lastFailIndex_ = input.readInt32();
-
-                break;
-              } // case 16
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.AttemptStreamingSequenceRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -654,18 +687,7 @@ public AttemptStreamingSequenceRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new AttemptStreamingSequenceRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceResponse.java
index c2718b9176..959c9eb5f7 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceResponse.java
@@ -54,6 +54,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private AttemptStreamingSequenceResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              content_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_AttemptStreamingSequenceResponse_descriptor;
@@ -137,7 +183,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(content_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, content_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -149,7 +195,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(content_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, content_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -166,7 +212,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.AttemptStreamingSequenceResponse) obj;
 
     if (!getContent().equals(other.getContent())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -179,7 +225,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + CONTENT_FIELD_NUMBER;
     hash = (53 * hash) + getContent().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -310,10 +356,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.AttemptStreamingSequenceResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -405,7 +458,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.AttemptStreamingSequenceRes
         content_ = other.content_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -420,37 +473,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.AttemptStreamingSequenceResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                content_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.AttemptStreamingSequenceResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -598,18 +632,7 @@ public AttemptStreamingSequenceResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new AttemptStreamingSequenceResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequest.java
index 0eb603f62b..eac6e1a2c7 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequest.java
@@ -51,6 +51,90 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private BlockRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.protobuf.Duration.Builder subBuilder = null;
+              if (responseDelay_ != null) {
+                subBuilder = responseDelay_.toBuilder();
+              }
+              responseDelay_ =
+                  input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(responseDelay_);
+                responseDelay_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              com.google.rpc.Status.Builder subBuilder = null;
+              if (responseCase_ == 2) {
+                subBuilder = ((com.google.rpc.Status) response_).toBuilder();
+              }
+              response_ = input.readMessage(com.google.rpc.Status.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.rpc.Status) response_);
+                response_ = subBuilder.buildPartial();
+              }
+              responseCase_ = 2;
+              break;
+            }
+          case 26:
+            {
+              com.google.showcase.v1beta1.BlockResponse.Builder subBuilder = null;
+              if (responseCase_ == 3) {
+                subBuilder = ((com.google.showcase.v1beta1.BlockResponse) response_).toBuilder();
+              }
+              response_ =
+                  input.readMessage(
+                      com.google.showcase.v1beta1.BlockResponse.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.showcase.v1beta1.BlockResponse) response_);
+                response_ = subBuilder.buildPartial();
+              }
+              responseCase_ = 3;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_BlockRequest_descriptor;
@@ -299,7 +383,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (responseCase_ == 3) {
       output.writeMessage(3, (com.google.showcase.v1beta1.BlockResponse) response_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -321,7 +405,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               3, (com.google.showcase.v1beta1.BlockResponse) response_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -351,7 +435,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -378,7 +462,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -508,10 +592,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.BlockRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -523,12 +614,6 @@ public Builder clear() {
         responseDelay_ = null;
         responseDelayBuilder_ = null;
       }
-      if (errorBuilder_ != null) {
-        errorBuilder_.clear();
-      }
-      if (successBuilder_ != null) {
-        successBuilder_.clear();
-      }
       responseCase_ = 0;
       response_ = null;
       return this;
@@ -646,7 +731,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.BlockRequest other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -661,49 +746,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.BlockRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getResponseDelayFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getErrorFieldBuilder().getBuilder(), extensionRegistry);
-                responseCase_ = 2;
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(getSuccessFieldBuilder().getBuilder(), extensionRegistry);
-                responseCase_ = 3;
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.BlockRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1384,18 +1437,7 @@ public BlockRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new BlockRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockResponse.java
index c7fbe773b4..61e898ce4a 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockResponse.java
@@ -53,6 +53,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private BlockResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              content_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_BlockResponse_descriptor;
@@ -138,7 +184,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(content_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, content_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -150,7 +196,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(content_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, content_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -167,7 +213,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.BlockResponse) obj;
 
     if (!getContent().equals(other.getContent())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -180,7 +226,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + CONTENT_FIELD_NUMBER;
     hash = (53 * hash) + getContent().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -310,10 +356,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.BlockResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -402,7 +455,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.BlockResponse other) {
         content_ = other.content_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -417,37 +470,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.BlockResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                content_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.BlockResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -599,18 +632,7 @@ public BlockResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new BlockResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Blurb.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Blurb.java
index c4bcb705b8..000967a381 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Blurb.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Blurb.java
@@ -55,6 +55,116 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Blurb(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              user_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              contentCase_ = 3;
+              content_ = s;
+              break;
+            }
+          case 34:
+            {
+              content_ = input.readBytes();
+              contentCase_ = 4;
+              break;
+            }
+          case 42:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (createTime_ != null) {
+                subBuilder = createTime_.toBuilder();
+              }
+              createTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(createTime_);
+                createTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 50:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (updateTime_ != null) {
+                subBuilder = updateTime_.toBuilder();
+              }
+              updateTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateTime_);
+                updateTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 58:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              legacyIdCase_ = 7;
+              legacyId_ = s;
+              break;
+            }
+          case 66:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              legacyIdCase_ = 8;
+              legacyId_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_Blurb_descriptor;
@@ -682,7 +792,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (legacyIdCase_ == 8) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, legacyId_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -717,7 +827,7 @@ public int getSerializedSize() {
     if (legacyIdCase_ == 8) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, legacyId_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -764,7 +874,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -811,7 +921,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -941,10 +1051,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.Blurb.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1123,7 +1240,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Blurb other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1138,82 +1255,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.Blurb parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                user_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                contentCase_ = 3;
-                content_ = s;
-                break;
-              } // case 26
-            case 34:
-              {
-                content_ = input.readBytes();
-                contentCase_ = 4;
-                break;
-              } // case 34
-            case 42:
-              {
-                input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 42
-            case 50:
-              {
-                input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 50
-            case 58:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                legacyIdCase_ = 7;
-                legacyId_ = s;
-                break;
-              } // case 58
-            case 66:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                legacyIdCase_ = 8;
-                legacyId_ = s;
-                break;
-              } // case 66
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.Blurb) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2445,18 +2497,7 @@ public Blurb parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Blurb(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceData.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceData.java
index 080d05bc5c..ad646647b2 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceData.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceData.java
@@ -58,6 +58,194 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ComplianceData(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              fString_ = s;
+              break;
+            }
+          case 16:
+            {
+              fInt32_ = input.readInt32();
+              break;
+            }
+          case 24:
+            {
+              fSint32_ = input.readSInt32();
+              break;
+            }
+          case 37:
+            {
+              fSfixed32_ = input.readSFixed32();
+              break;
+            }
+          case 40:
+            {
+              fUint32_ = input.readUInt32();
+              break;
+            }
+          case 53:
+            {
+              fFixed32_ = input.readFixed32();
+              break;
+            }
+          case 56:
+            {
+              fInt64_ = input.readInt64();
+              break;
+            }
+          case 64:
+            {
+              fSint64_ = input.readSInt64();
+              break;
+            }
+          case 73:
+            {
+              fSfixed64_ = input.readSFixed64();
+              break;
+            }
+          case 80:
+            {
+              fUint64_ = input.readUInt64();
+              break;
+            }
+          case 89:
+            {
+              fFixed64_ = input.readFixed64();
+              break;
+            }
+          case 97:
+            {
+              fDouble_ = input.readDouble();
+              break;
+            }
+          case 109:
+            {
+              fFloat_ = input.readFloat();
+              break;
+            }
+          case 112:
+            {
+              fBool_ = input.readBool();
+              break;
+            }
+          case 122:
+            {
+              fBytes_ = input.readBytes();
+              break;
+            }
+          case 130:
+            {
+              com.google.showcase.v1beta1.ComplianceDataChild.Builder subBuilder = null;
+              if (fChild_ != null) {
+                subBuilder = fChild_.toBuilder();
+              }
+              fChild_ =
+                  input.readMessage(
+                      com.google.showcase.v1beta1.ComplianceDataChild.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(fChild_);
+                fChild_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 138:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              bitField0_ |= 0x00000001;
+              pString_ = s;
+              break;
+            }
+          case 144:
+            {
+              bitField0_ |= 0x00000002;
+              pInt32_ = input.readInt32();
+              break;
+            }
+          case 153:
+            {
+              bitField0_ |= 0x00000004;
+              pDouble_ = input.readDouble();
+              break;
+            }
+          case 160:
+            {
+              bitField0_ |= 0x00000008;
+              pBool_ = input.readBool();
+              break;
+            }
+          case 170:
+            {
+              com.google.showcase.v1beta1.ComplianceDataChild.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000020) != 0)) {
+                subBuilder = pChild_.toBuilder();
+              }
+              pChild_ =
+                  input.readMessage(
+                      com.google.showcase.v1beta1.ComplianceDataChild.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(pChild_);
+                pChild_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000020;
+              break;
+            }
+          case 176:
+            {
+              int rawValue = input.readEnum();
+
+              fKingdom_ = rawValue;
+              break;
+            }
+          case 184:
+            {
+              int rawValue = input.readEnum();
+              bitField0_ |= 0x00000010;
+              pKingdom_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_ComplianceData_descriptor;
@@ -759,7 +947,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (((bitField0_ & 0x00000010) != 0)) {
       output.writeEnum(23, pKingdom_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -839,7 +1027,7 @@ public int getSerializedSize() {
     if (((bitField0_ & 0x00000010) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(23, pKingdom_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -902,7 +1090,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasPChild()) {
       if (!getPChild().equals(other.getPChild())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -979,7 +1167,7 @@ public int hashCode() {
       hash = (37 * hash) + P_CHILD_FIELD_NUMBER;
       hash = (53 * hash) + getPChild().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1382,7 +1570,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ComplianceData other) {
       if (other.hasPChild()) {
         mergePChild(other.getPChild());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1397,169 +1585,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ComplianceData parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                fString_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                fInt32_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 24:
-              {
-                fSint32_ = input.readSInt32();
-
-                break;
-              } // case 24
-            case 37:
-              {
-                fSfixed32_ = input.readSFixed32();
-
-                break;
-              } // case 37
-            case 40:
-              {
-                fUint32_ = input.readUInt32();
-
-                break;
-              } // case 40
-            case 53:
-              {
-                fFixed32_ = input.readFixed32();
-
-                break;
-              } // case 53
-            case 56:
-              {
-                fInt64_ = input.readInt64();
-
-                break;
-              } // case 56
-            case 64:
-              {
-                fSint64_ = input.readSInt64();
-
-                break;
-              } // case 64
-            case 73:
-              {
-                fSfixed64_ = input.readSFixed64();
-
-                break;
-              } // case 73
-            case 80:
-              {
-                fUint64_ = input.readUInt64();
-
-                break;
-              } // case 80
-            case 89:
-              {
-                fFixed64_ = input.readFixed64();
-
-                break;
-              } // case 89
-            case 97:
-              {
-                fDouble_ = input.readDouble();
-
-                break;
-              } // case 97
-            case 109:
-              {
-                fFloat_ = input.readFloat();
-
-                break;
-              } // case 109
-            case 112:
-              {
-                fBool_ = input.readBool();
-
-                break;
-              } // case 112
-            case 122:
-              {
-                fBytes_ = input.readBytes();
-
-                break;
-              } // case 122
-            case 130:
-              {
-                input.readMessage(getFChildFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 130
-            case 138:
-              {
-                pString_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
-                break;
-              } // case 138
-            case 144:
-              {
-                pInt32_ = input.readInt32();
-                bitField0_ |= 0x00000002;
-                break;
-              } // case 144
-            case 153:
-              {
-                pDouble_ = input.readDouble();
-                bitField0_ |= 0x00000004;
-                break;
-              } // case 153
-            case 160:
-              {
-                pBool_ = input.readBool();
-                bitField0_ |= 0x00000008;
-                break;
-              } // case 160
-            case 170:
-              {
-                input.readMessage(getPChildFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000020;
-                break;
-              } // case 170
-            case 176:
-              {
-                fKingdom_ = input.readEnum();
-
-                break;
-              } // case 176
-            case 184:
-              {
-                pKingdom_ = input.readEnum();
-                bitField0_ |= 0x00000010;
-                break;
-              } // case 184
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.ComplianceData) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2831,18 +2867,7 @@ public ComplianceData parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ComplianceData(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChild.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChild.java
index 654e4c2715..8add33da44 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChild.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChild.java
@@ -48,6 +48,141 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ComplianceDataChild(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              fString_ = s;
+              break;
+            }
+          case 21:
+            {
+              fFloat_ = input.readFloat();
+              break;
+            }
+          case 25:
+            {
+              fDouble_ = input.readDouble();
+              break;
+            }
+          case 32:
+            {
+              fBool_ = input.readBool();
+              break;
+            }
+          case 42:
+            {
+              com.google.showcase.v1beta1.ComplianceDataGrandchild.Builder subBuilder = null;
+              if (fChild_ != null) {
+                subBuilder = fChild_.toBuilder();
+              }
+              fChild_ =
+                  input.readMessage(
+                      com.google.showcase.v1beta1.ComplianceDataGrandchild.parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(fChild_);
+                fChild_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 50:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              bitField0_ |= 0x00000001;
+              pString_ = s;
+              break;
+            }
+          case 61:
+            {
+              bitField0_ |= 0x00000002;
+              pFloat_ = input.readFloat();
+              break;
+            }
+          case 65:
+            {
+              bitField0_ |= 0x00000004;
+              pDouble_ = input.readDouble();
+              break;
+            }
+          case 72:
+            {
+              bitField0_ |= 0x00000008;
+              pBool_ = input.readBool();
+              break;
+            }
+          case 82:
+            {
+              com.google.showcase.v1beta1.ComplianceDataGrandchild.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000010) != 0)) {
+                subBuilder = pChild_.toBuilder();
+              }
+              pChild_ =
+                  input.readMessage(
+                      com.google.showcase.v1beta1.ComplianceDataGrandchild.parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(pChild_);
+                pChild_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000010;
+              break;
+            }
+          case 88:
+            {
+              int rawValue = input.readEnum();
+
+              fContinent_ = rawValue;
+              break;
+            }
+          case 96:
+            {
+              int rawValue = input.readEnum();
+
+              pContinent_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_ComplianceDataChild_descriptor;
@@ -426,7 +561,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (pContinent_ != com.google.showcase.v1beta1.Continent.CONTINENT_UNSPECIFIED.getNumber()) {
       output.writeEnum(12, pContinent_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -471,7 +606,7 @@ public int getSerializedSize() {
     if (pContinent_ != com.google.showcase.v1beta1.Continent.CONTINENT_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(12, pContinent_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -521,7 +656,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasPChild()) {
       if (!getPChild().equals(other.getPChild())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -574,7 +709,7 @@ public int hashCode() {
       hash = (37 * hash) + P_CHILD_FIELD_NUMBER;
       hash = (53 * hash) + getPChild().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -900,7 +1035,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ComplianceDataChild other)
       if (other.hasPChild()) {
         mergePChild(other.getPChild());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -915,103 +1050,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ComplianceDataChild parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                fString_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 21:
-              {
-                fFloat_ = input.readFloat();
-
-                break;
-              } // case 21
-            case 25:
-              {
-                fDouble_ = input.readDouble();
-
-                break;
-              } // case 25
-            case 32:
-              {
-                fBool_ = input.readBool();
-
-                break;
-              } // case 32
-            case 42:
-              {
-                input.readMessage(getFChildFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 42
-            case 50:
-              {
-                pString_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
-                break;
-              } // case 50
-            case 61:
-              {
-                pFloat_ = input.readFloat();
-                bitField0_ |= 0x00000002;
-                break;
-              } // case 61
-            case 65:
-              {
-                pDouble_ = input.readDouble();
-                bitField0_ |= 0x00000004;
-                break;
-              } // case 65
-            case 72:
-              {
-                pBool_ = input.readBool();
-                bitField0_ |= 0x00000008;
-                break;
-              } // case 72
-            case 82:
-              {
-                input.readMessage(getPChildFieldBuilder().getBuilder(), extensionRegistry);
-                bitField0_ |= 0x00000010;
-                break;
-              } // case 82
-            case 88:
-              {
-                fContinent_ = input.readEnum();
-
-                break;
-              } // case 88
-            case 96:
-              {
-                pContinent_ = input.readEnum();
-
-                break;
-              } // case 96
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.ComplianceDataChild) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1860,18 +1909,7 @@ public ComplianceDataChild parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ComplianceDataChild(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataGrandchild.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataGrandchild.java
index 24aa964928..4882baa2d7 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataGrandchild.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataGrandchild.java
@@ -45,6 +45,62 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ComplianceDataGrandchild(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              fString_ = s;
+              break;
+            }
+          case 17:
+            {
+              fDouble_ = input.readDouble();
+              break;
+            }
+          case 24:
+            {
+              fBool_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_ComplianceDataGrandchild_descriptor;
@@ -148,7 +204,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (fBool_ != false) {
       output.writeBool(3, fBool_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -166,7 +222,7 @@ public int getSerializedSize() {
     if (fBool_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(3, fBool_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -186,7 +242,7 @@ public boolean equals(final java.lang.Object obj) {
     if (java.lang.Double.doubleToLongBits(getFDouble())
         != java.lang.Double.doubleToLongBits(other.getFDouble())) return false;
     if (getFBool() != other.getFBool()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -206,7 +262,7 @@ public int hashCode() {
                 java.lang.Double.doubleToLongBits(getFDouble()));
     hash = (37 * hash) + F_BOOL_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getFBool());
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -328,10 +384,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ComplianceDataGrandchild.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -433,7 +496,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ComplianceDataGrandchild ot
       if (other.getFBool() != false) {
         setFBool(other.getFBool());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -448,49 +511,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ComplianceDataGrandchild parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                fString_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 17:
-              {
-                fDouble_ = input.readDouble();
-
-                break;
-              } // case 17
-            case 24:
-              {
-                fBool_ = input.readBool();
-
-                break;
-              } // case 24
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.ComplianceDataGrandchild) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -681,18 +713,7 @@ public ComplianceDataGrandchild parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ComplianceDataGrandchild(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGroup.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGroup.java
index 44722994fb..7cd8869afd 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGroup.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGroup.java
@@ -57,6 +57,80 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ComplianceGroup(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                rpcs_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              rpcs_.add(s);
+              break;
+            }
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                requests_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              requests_.add(
+                  input.readMessage(
+                      com.google.showcase.v1beta1.RepeatRequest.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        rpcs_ = rpcs_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        requests_ = java.util.Collections.unmodifiableList(requests_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_ComplianceGroup_descriptor;
@@ -209,7 +283,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < requests_.size(); i++) {
       output.writeMessage(3, requests_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -232,7 +306,7 @@ public int getSerializedSize() {
     for (int i = 0; i < requests_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, requests_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -251,7 +325,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getName().equals(other.getName())) return false;
     if (!getRpcsList().equals(other.getRpcsList())) return false;
     if (!getRequestsList().equals(other.getRequestsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -272,7 +346,7 @@ public int hashCode() {
       hash = (37 * hash) + REQUESTS_FIELD_NUMBER;
       hash = (53 * hash) + getRequestsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -404,10 +478,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ComplianceGroup.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getRequestsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -419,11 +502,10 @@ public Builder clear() {
       bitField0_ = (bitField0_ & ~0x00000001);
       if (requestsBuilder_ == null) {
         requests_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
       } else {
-        requests_ = null;
         requestsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
@@ -557,7 +639,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ComplianceGroup other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -572,57 +654,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ComplianceGroup parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureRpcsIsMutable();
-                rpcs_.add(s);
-                break;
-              } // case 18
-            case 26:
-              {
-                com.google.showcase.v1beta1.RepeatRequest m =
-                    input.readMessage(
-                        com.google.showcase.v1beta1.RepeatRequest.parser(), extensionRegistry);
-                if (requestsBuilder_ == null) {
-                  ensureRequestsIsMutable();
-                  requests_.add(m);
-                } else {
-                  requestsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.ComplianceGroup) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1086,18 +1128,7 @@ public ComplianceGroup parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ComplianceGroup(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceSuite.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceSuite.java
index ba0dc88319..e812510224 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceSuite.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceSuite.java
@@ -55,6 +55,60 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ComplianceSuite(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                group_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              group_.add(
+                  input.readMessage(
+                      com.google.showcase.v1beta1.ComplianceGroup.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        group_ = java.util.Collections.unmodifiableList(group_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_ComplianceSuite_descriptor;
@@ -121,7 +175,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < group_.size(); i++) {
       output.writeMessage(1, group_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -133,7 +187,7 @@ public int getSerializedSize() {
     for (int i = 0; i < group_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, group_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -150,7 +204,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.ComplianceSuite) obj;
 
     if (!getGroupList().equals(other.getGroupList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -165,7 +219,7 @@ public int hashCode() {
       hash = (37 * hash) + GROUP_FIELD_NUMBER;
       hash = (53 * hash) + getGroupList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -297,10 +351,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ComplianceSuite.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getGroupFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -308,11 +371,10 @@ public Builder clear() {
       super.clear();
       if (groupBuilder_ == null) {
         group_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        group_ = null;
         groupBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -426,7 +488,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ComplianceSuite other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -441,44 +503,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ComplianceSuite parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.showcase.v1beta1.ComplianceGroup m =
-                    input.readMessage(
-                        com.google.showcase.v1beta1.ComplianceGroup.parser(), extensionRegistry);
-                if (groupBuilder_ == null) {
-                  ensureGroupIsMutable();
-                  group_.add(m);
-                } else {
-                  groupBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.ComplianceSuite) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -738,18 +773,7 @@ public ComplianceSuite parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ComplianceSuite(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ConnectRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ConnectRequest.java
index 81e5129cb8..8f00f61855 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ConnectRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ConnectRequest.java
@@ -52,6 +52,80 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ConnectRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.showcase.v1beta1.ConnectRequest.ConnectConfig.Builder subBuilder = null;
+              if (requestCase_ == 1) {
+                subBuilder =
+                    ((com.google.showcase.v1beta1.ConnectRequest.ConnectConfig) request_)
+                        .toBuilder();
+              }
+              request_ =
+                  input.readMessage(
+                      com.google.showcase.v1beta1.ConnectRequest.ConnectConfig.parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(
+                    (com.google.showcase.v1beta1.ConnectRequest.ConnectConfig) request_);
+                request_ = subBuilder.buildPartial();
+              }
+              requestCase_ = 1;
+              break;
+            }
+          case 18:
+            {
+              com.google.showcase.v1beta1.Blurb.Builder subBuilder = null;
+              if (requestCase_ == 2) {
+                subBuilder = ((com.google.showcase.v1beta1.Blurb) request_).toBuilder();
+              }
+              request_ =
+                  input.readMessage(com.google.showcase.v1beta1.Blurb.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.showcase.v1beta1.Blurb) request_);
+                request_ = subBuilder.buildPartial();
+              }
+              requestCase_ = 2;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_ConnectRequest_descriptor;
@@ -126,6 +200,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private ConnectConfig(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                parent_ = s;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.showcase.v1beta1.MessagingOuterClass
           .internal_static_google_showcase_v1beta1_ConnectRequest_ConnectConfig_descriptor;
@@ -209,7 +329,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -221,7 +341,7 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -238,7 +358,7 @@ public boolean equals(final java.lang.Object obj) {
           (com.google.showcase.v1beta1.ConnectRequest.ConnectConfig) obj;
 
       if (!getParent().equals(other.getParent())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -251,7 +371,7 @@ public int hashCode() {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + PARENT_FIELD_NUMBER;
       hash = (53 * hash) + getParent().hashCode();
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -376,10 +496,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.showcase.v1beta1.ConnectRequest.ConnectConfig.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -471,7 +598,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ConnectRequest.ConnectConfi
           parent_ = other.parent_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -486,37 +613,18 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.showcase.v1beta1.ConnectRequest.ConnectConfig parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  parent_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.showcase.v1beta1.ConnectRequest.ConnectConfig) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -664,19 +772,7 @@ public ConnectConfig parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new ConnectConfig(input, extensionRegistry);
           }
         };
 
@@ -874,7 +970,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (requestCase_ == 2) {
       output.writeMessage(2, (com.google.showcase.v1beta1.Blurb) request_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -893,7 +989,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               2, (com.google.showcase.v1beta1.Blurb) request_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -920,7 +1016,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -943,7 +1039,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1074,21 +1170,22 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ConnectRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (configBuilder_ != null) {
-        configBuilder_.clear();
-      }
-      if (blurbBuilder_ != null) {
-        blurbBuilder_.clear();
-      }
       requestCase_ = 0;
       request_ = null;
       return this;
@@ -1198,7 +1295,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ConnectRequest other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1213,43 +1310,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ConnectRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getConfigFieldBuilder().getBuilder(), extensionRegistry);
-                requestCase_ = 1;
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getBlurbFieldBuilder().getBuilder(), extensionRegistry);
-                requestCase_ = 2;
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.ConnectRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1744,18 +1815,7 @@ public ConnectRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ConnectRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequest.java
index 159b9735bf..468650424e 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequest.java
@@ -54,6 +54,67 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CreateBlurbRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.showcase.v1beta1.Blurb.Builder subBuilder = null;
+              if (blurb_ != null) {
+                subBuilder = blurb_.toBuilder();
+              }
+              blurb_ =
+                  input.readMessage(com.google.showcase.v1beta1.Blurb.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(blurb_);
+                blurb_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_CreateBlurbRequest_descriptor;
@@ -195,7 +256,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (blurb_ != null) {
       output.writeMessage(2, getBlurb());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -210,7 +271,7 @@ public int getSerializedSize() {
     if (blurb_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getBlurb());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -231,7 +292,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasBlurb()) {
       if (!getBlurb().equals(other.getBlurb())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -248,7 +309,7 @@ public int hashCode() {
       hash = (37 * hash) + BLURB_FIELD_NUMBER;
       hash = (53 * hash) + getBlurb().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -379,10 +440,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.CreateBlurbRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -485,7 +553,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.CreateBlurbRequest other) {
       if (other.hasBlurb()) {
         mergeBlurb(other.getBlurb());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -500,43 +568,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.CreateBlurbRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getBlurbFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.CreateBlurbRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -886,18 +928,7 @@ public CreateBlurbRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new CreateBlurbRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequest.java
index a1c5a9a899..0c9f48e9f2 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequest.java
@@ -52,6 +52,60 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CreateRoomRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.showcase.v1beta1.Room.Builder subBuilder = null;
+              if (room_ != null) {
+                subBuilder = room_.toBuilder();
+              }
+              room_ =
+                  input.readMessage(com.google.showcase.v1beta1.Room.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(room_);
+                room_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_CreateRoomRequest_descriptor;
@@ -133,7 +187,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (room_ != null) {
       output.writeMessage(1, getRoom());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -145,7 +199,7 @@ public int getSerializedSize() {
     if (room_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getRoom());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -165,7 +219,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasRoom()) {
       if (!getRoom().equals(other.getRoom())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -180,7 +234,7 @@ public int hashCode() {
       hash = (37 * hash) + ROOM_FIELD_NUMBER;
       hash = (53 * hash) + getRoom().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -311,10 +365,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.CreateRoomRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -410,7 +471,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.CreateRoomRequest other) {
       if (other.hasRoom()) {
         mergeRoom(other.getRoom());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -425,37 +486,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.CreateRoomRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getRoomFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.CreateRoomRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -679,18 +720,7 @@ public CreateRoomRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new CreateRoomRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequest.java
index 907e2af55c..c43a97e737 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequest.java
@@ -43,6 +43,61 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CreateSequenceRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.showcase.v1beta1.Sequence.Builder subBuilder = null;
+              if (sequence_ != null) {
+                subBuilder = sequence_.toBuilder();
+              }
+              sequence_ =
+                  input.readMessage(
+                      com.google.showcase.v1beta1.Sequence.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(sequence_);
+                sequence_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_CreateSequenceRequest_descriptor;
@@ -106,7 +161,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (sequence_ != null) {
       output.writeMessage(1, getSequence());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -118,7 +173,7 @@ public int getSerializedSize() {
     if (sequence_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getSequence());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -138,7 +193,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasSequence()) {
       if (!getSequence().equals(other.getSequence())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -153,7 +208,7 @@ public int hashCode() {
       hash = (37 * hash) + SEQUENCE_FIELD_NUMBER;
       hash = (53 * hash) + getSequence().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -275,10 +330,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.CreateSequenceRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -375,7 +437,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.CreateSequenceRequest other
       if (other.hasSequence()) {
         mergeSequence(other.getSequence());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -390,37 +452,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.CreateSequenceRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getSequenceFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.CreateSequenceRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -582,18 +625,7 @@ public CreateSequenceRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new CreateSequenceRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequest.java
index 9e26608d91..aee834a67e 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequest.java
@@ -51,6 +51,61 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CreateSessionRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.showcase.v1beta1.Session.Builder subBuilder = null;
+              if (session_ != null) {
+                subBuilder = session_.toBuilder();
+              }
+              session_ =
+                  input.readMessage(
+                      com.google.showcase.v1beta1.Session.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(session_);
+                session_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_CreateSessionRequest_descriptor;
@@ -138,7 +193,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (session_ != null) {
       output.writeMessage(1, getSession());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -150,7 +205,7 @@ public int getSerializedSize() {
     if (session_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getSession());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -170,7 +225,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasSession()) {
       if (!getSession().equals(other.getSession())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -185,7 +240,7 @@ public int hashCode() {
       hash = (37 * hash) + SESSION_FIELD_NUMBER;
       hash = (53 * hash) + getSession().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -315,10 +370,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.CreateSessionRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -415,7 +477,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.CreateSessionRequest other)
       if (other.hasSession()) {
         mergeSession(other.getSession());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -430,37 +492,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.CreateSessionRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getSessionFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.CreateSessionRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -708,18 +750,7 @@ public CreateSessionRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new CreateSessionRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequest.java
index 53f06d87dd..74997f3ed8 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequest.java
@@ -44,6 +44,61 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CreateStreamingSequenceRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.showcase.v1beta1.StreamingSequence.Builder subBuilder = null;
+              if (streamingSequence_ != null) {
+                subBuilder = streamingSequence_.toBuilder();
+              }
+              streamingSequence_ =
+                  input.readMessage(
+                      com.google.showcase.v1beta1.StreamingSequence.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(streamingSequence_);
+                streamingSequence_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_CreateStreamingSequenceRequest_descriptor;
@@ -107,7 +162,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (streamingSequence_ != null) {
       output.writeMessage(1, getStreamingSequence());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -119,7 +174,7 @@ public int getSerializedSize() {
     if (streamingSequence_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getStreamingSequence());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -139,7 +194,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasStreamingSequence()) {
       if (!getStreamingSequence().equals(other.getStreamingSequence())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -154,7 +209,7 @@ public int hashCode() {
       hash = (37 * hash) + STREAMING_SEQUENCE_FIELD_NUMBER;
       hash = (53 * hash) + getStreamingSequence().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -277,10 +332,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.CreateStreamingSequenceRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -377,7 +439,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.CreateStreamingSequenceRequ
       if (other.hasStreamingSequence()) {
         mergeStreamingSequence(other.getStreamingSequence());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -392,38 +454,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.CreateStreamingSequenceRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(
-                    getStreamingSequenceFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.CreateStreamingSequenceRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -586,18 +628,7 @@ public CreateStreamingSequenceRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new CreateStreamingSequenceRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequest.java
index 698b432527..a6cade3e11 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequest.java
@@ -52,6 +52,60 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private CreateUserRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.showcase.v1beta1.User.Builder subBuilder = null;
+              if (user_ != null) {
+                subBuilder = user_.toBuilder();
+              }
+              user_ =
+                  input.readMessage(com.google.showcase.v1beta1.User.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(user_);
+                user_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.IdentityOuterClass
         .internal_static_google_showcase_v1beta1_CreateUserRequest_descriptor;
@@ -133,7 +187,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (user_ != null) {
       output.writeMessage(1, getUser());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -145,7 +199,7 @@ public int getSerializedSize() {
     if (user_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getUser());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -165,7 +219,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasUser()) {
       if (!getUser().equals(other.getUser())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -180,7 +234,7 @@ public int hashCode() {
       hash = (37 * hash) + USER_FIELD_NUMBER;
       hash = (53 * hash) + getUser().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -311,10 +365,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.CreateUserRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -410,7 +471,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.CreateUserRequest other) {
       if (other.hasUser()) {
         mergeUser(other.getUser());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -425,37 +486,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.CreateUserRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getUserFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.CreateUserRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -679,18 +720,7 @@ public CreateUserRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new CreateUserRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteBlurbRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteBlurbRequest.java
index 75405bfa45..8ea6535496 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteBlurbRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteBlurbRequest.java
@@ -54,6 +54,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DeleteBlurbRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_DeleteBlurbRequest_descriptor;
@@ -141,7 +187,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -153,7 +199,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -170,7 +216,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.DeleteBlurbRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -183,7 +229,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -314,10 +360,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.DeleteBlurbRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -406,7 +459,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.DeleteBlurbRequest other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -421,37 +474,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.DeleteBlurbRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.DeleteBlurbRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -608,18 +641,7 @@ public DeleteBlurbRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DeleteBlurbRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteRoomRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteRoomRequest.java
index 05d2750b23..fdc7728a40 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteRoomRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteRoomRequest.java
@@ -54,6 +54,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DeleteRoomRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_DeleteRoomRequest_descriptor;
@@ -141,7 +187,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -153,7 +199,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -170,7 +216,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.DeleteRoomRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -183,7 +229,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -314,10 +360,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.DeleteRoomRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -406,7 +459,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.DeleteRoomRequest other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -421,37 +474,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.DeleteRoomRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.DeleteRoomRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -608,18 +641,7 @@ public DeleteRoomRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DeleteRoomRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteSessionRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteSessionRequest.java
index 5dd1524c3e..28372c3544 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteSessionRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteSessionRequest.java
@@ -53,6 +53,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DeleteSessionRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_DeleteSessionRequest_descriptor;
@@ -136,7 +182,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -148,7 +194,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -165,7 +211,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.DeleteSessionRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -178,7 +224,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -308,10 +354,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.DeleteSessionRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -401,7 +454,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.DeleteSessionRequest other)
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -416,37 +469,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.DeleteSessionRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.DeleteSessionRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -593,18 +626,7 @@ public DeleteSessionRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DeleteSessionRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteTestRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteTestRequest.java
index cac340606f..fc7e9645f7 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteTestRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteTestRequest.java
@@ -53,6 +53,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DeleteTestRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_DeleteTestRequest_descriptor;
@@ -136,7 +182,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -148,7 +194,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -165,7 +211,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.DeleteTestRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -178,7 +224,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -308,10 +354,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.DeleteTestRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -400,7 +453,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.DeleteTestRequest other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -415,37 +468,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.DeleteTestRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.DeleteTestRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -592,18 +625,7 @@ public DeleteTestRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DeleteTestRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteUserRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteUserRequest.java
index 2f0c963e83..a150ee2378 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteUserRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/DeleteUserRequest.java
@@ -54,6 +54,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private DeleteUserRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.IdentityOuterClass
         .internal_static_google_showcase_v1beta1_DeleteUserRequest_descriptor;
@@ -141,7 +187,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -153,7 +199,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -170,7 +216,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.DeleteUserRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -183,7 +229,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -314,10 +360,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.DeleteUserRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -406,7 +459,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.DeleteUserRequest other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -421,37 +474,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.DeleteUserRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.DeleteUserRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -608,18 +641,7 @@ public DeleteUserRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new DeleteUserRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsRequest.java
index 9dec907e1e..54b686e83c 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsRequest.java
@@ -54,6 +54,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private EchoErrorDetailsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              singleDetailText_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                multiDetailText_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              multiDetailText_.add(s);
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        multiDetailText_ = multiDetailText_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_EchoErrorDetailsRequest_descriptor;
@@ -211,7 +271,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < multiDetailText_.size(); i++) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, multiDetailText_.getRaw(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -231,7 +291,7 @@ public int getSerializedSize() {
       size += dataSize;
       size += 1 * getMultiDetailTextList().size();
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -249,7 +309,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getSingleDetailText().equals(other.getSingleDetailText())) return false;
     if (!getMultiDetailTextList().equals(other.getMultiDetailTextList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -266,7 +326,7 @@ public int hashCode() {
       hash = (37 * hash) + MULTI_DETAIL_TEXT_FIELD_NUMBER;
       hash = (53 * hash) + getMultiDetailTextList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -396,10 +456,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.EchoErrorDetailsRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -507,7 +574,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.EchoErrorDetailsRequest oth
         }
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -522,44 +589,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.EchoErrorDetailsRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                singleDetailText_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureMultiDetailTextIsMutable();
-                multiDetailText_.add(s);
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.EchoErrorDetailsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -899,18 +940,7 @@ public EchoErrorDetailsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new EchoErrorDetailsRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsResponse.java
index 157ff3f564..bce7281bf9 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoErrorDetailsResponse.java
@@ -51,6 +51,81 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private EchoErrorDetailsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail.Builder subBuilder =
+                  null;
+              if (singleDetail_ != null) {
+                subBuilder = singleDetail_.toBuilder();
+              }
+              singleDetail_ =
+                  input.readMessage(
+                      com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail.parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(singleDetail_);
+                singleDetail_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails.Builder
+                  subBuilder = null;
+              if (multipleDetails_ != null) {
+                subBuilder = multipleDetails_.toBuilder();
+              }
+              multipleDetails_ =
+                  input.readMessage(
+                      com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails.parser(),
+                      extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(multipleDetails_);
+                multipleDetails_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_EchoErrorDetailsResponse_descriptor;
@@ -114,6 +189,62 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private SingleDetail(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.showcase.v1beta1.ErrorWithSingleDetail.Builder subBuilder = null;
+                if (error_ != null) {
+                  subBuilder = error_.toBuilder();
+                }
+                error_ =
+                    input.readMessage(
+                        com.google.showcase.v1beta1.ErrorWithSingleDetail.parser(),
+                        extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(error_);
+                  error_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.showcase.v1beta1.EchoOuterClass
           .internal_static_google_showcase_v1beta1_EchoErrorDetailsResponse_SingleDetail_descriptor;
@@ -177,7 +308,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (error_ != null) {
         output.writeMessage(1, getError());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -189,7 +320,7 @@ public int getSerializedSize() {
       if (error_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getError());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -209,7 +340,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasError()) {
         if (!getError().equals(other.getError())) return false;
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -224,7 +355,7 @@ public int hashCode() {
         hash = (37 * hash) + ERROR_FIELD_NUMBER;
         hash = (53 * hash) + getError().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -351,10 +482,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
       // Construct using
       // com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -458,7 +596,7 @@ public Builder mergeFrom(
         if (other.hasError()) {
           mergeError(other.getError());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -473,37 +611,19 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  input.readMessage(getErrorFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 10
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.showcase.v1beta1.EchoErrorDetailsResponse.SingleDetail)
+                  e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -669,19 +789,7 @@ public SingleDetail parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new SingleDetail(input, extensionRegistry);
           }
         };
 
@@ -749,6 +857,62 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private MultipleDetails(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.showcase.v1beta1.ErrorWithMultipleDetails.Builder subBuilder = null;
+                if (error_ != null) {
+                  subBuilder = error_.toBuilder();
+                }
+                error_ =
+                    input.readMessage(
+                        com.google.showcase.v1beta1.ErrorWithMultipleDetails.parser(),
+                        extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(error_);
+                  error_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.showcase.v1beta1.EchoOuterClass
           .internal_static_google_showcase_v1beta1_EchoErrorDetailsResponse_MultipleDetails_descriptor;
@@ -812,7 +976,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (error_ != null) {
         output.writeMessage(1, getError());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -824,7 +988,7 @@ public int getSerializedSize() {
       if (error_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getError());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -844,7 +1008,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasError()) {
         if (!getError().equals(other.getError())) return false;
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -859,7 +1023,7 @@ public int hashCode() {
         hash = (37 * hash) + ERROR_FIELD_NUMBER;
         hash = (53 * hash) + getError().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -986,10 +1150,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
 
       // Construct using
       // com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -1094,7 +1265,7 @@ public Builder mergeFrom(
         if (other.hasError()) {
           mergeError(other.getError());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1109,37 +1280,19 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  input.readMessage(getErrorFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 10
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.showcase.v1beta1.EchoErrorDetailsResponse.MultipleDetails)
+                  e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1305,19 +1458,7 @@ public MultipleDetails parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new MultipleDetails(input, extensionRegistry);
           }
         };
 
@@ -1428,7 +1569,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (multipleDetails_ != null) {
       output.writeMessage(2, getMultipleDetails());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1443,7 +1584,7 @@ public int getSerializedSize() {
     if (multipleDetails_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getMultipleDetails());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1467,7 +1608,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasMultipleDetails()) {
       if (!getMultipleDetails().equals(other.getMultipleDetails())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1486,7 +1627,7 @@ public int hashCode() {
       hash = (37 * hash) + MULTIPLE_DETAILS_FIELD_NUMBER;
       hash = (53 * hash) + getMultipleDetails().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1616,10 +1757,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.EchoErrorDetailsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1730,7 +1878,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.EchoErrorDetailsResponse ot
       if (other.hasMultipleDetails()) {
         mergeMultipleDetails(other.getMultipleDetails());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1745,43 +1893,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.EchoErrorDetailsResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getSingleDetailFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getMultipleDetailsFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.EchoErrorDetailsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2131,18 +2254,7 @@ public EchoErrorDetailsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new EchoErrorDetailsResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequest.java
index 42f04d5088..762a037753 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoRequest.java
@@ -60,6 +60,102 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private EchoRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              responseCase_ = 1;
+              response_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.rpc.Status.Builder subBuilder = null;
+              if (responseCase_ == 2) {
+                subBuilder = ((com.google.rpc.Status) response_).toBuilder();
+              }
+              response_ = input.readMessage(com.google.rpc.Status.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.rpc.Status) response_);
+                response_ = subBuilder.buildPartial();
+              }
+              responseCase_ = 2;
+              break;
+            }
+          case 24:
+            {
+              int rawValue = input.readEnum();
+
+              severity_ = rawValue;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              header_ = s;
+              break;
+            }
+          case 42:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              otherHeader_ = s;
+              break;
+            }
+          case 58:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              requestId_ = s;
+              break;
+            }
+          case 66:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              bitField0_ |= 0x00000001;
+              otherRequestId_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_EchoRequest_descriptor;
@@ -544,7 +640,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (((bitField0_ & 0x00000001) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, otherRequestId_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -576,7 +672,7 @@ public int getSerializedSize() {
     if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, otherRequestId_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -610,7 +706,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -645,7 +741,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -778,18 +874,22 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.EchoRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (errorBuilder_ != null) {
-        errorBuilder_.clear();
-      }
       severity_ = 0;
 
       header_ = "";
@@ -938,7 +1038,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.EchoRequest other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -953,74 +1053,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.EchoRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                responseCase_ = 1;
-                response_ = s;
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getErrorFieldBuilder().getBuilder(), extensionRegistry);
-                responseCase_ = 2;
-                break;
-              } // case 18
-            case 24:
-              {
-                severity_ = input.readEnum();
-
-                break;
-              } // case 24
-            case 34:
-              {
-                header_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            case 42:
-              {
-                otherHeader_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 42
-            case 58:
-              {
-                requestId_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 58
-            case 66:
-              {
-                otherRequestId_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
-                break;
-              } // case 66
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.EchoRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1976,18 +2019,7 @@ public EchoRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new EchoRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoResponse.java
index 324171da9c..78616eba8e 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoResponse.java
@@ -56,6 +56,73 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private EchoResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              content_ = s;
+              break;
+            }
+          case 16:
+            {
+              int rawValue = input.readEnum();
+
+              severity_ = rawValue;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              requestId_ = s;
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              otherRequestId_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_EchoResponse_descriptor;
@@ -288,7 +355,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(otherRequestId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, otherRequestId_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -309,7 +376,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(otherRequestId_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, otherRequestId_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -328,7 +395,7 @@ public boolean equals(final java.lang.Object obj) {
     if (severity_ != other.severity_) return false;
     if (!getRequestId().equals(other.getRequestId())) return false;
     if (!getOtherRequestId().equals(other.getOtherRequestId())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -347,7 +414,7 @@ public int hashCode() {
     hash = (53 * hash) + getRequestId().hashCode();
     hash = (37 * hash) + OTHER_REQUEST_ID_FIELD_NUMBER;
     hash = (53 * hash) + getOtherRequestId().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -477,10 +544,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.EchoResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -589,7 +663,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.EchoResponse other) {
         otherRequestId_ = other.otherRequestId_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -604,55 +678,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.EchoResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                content_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                severity_ = input.readEnum();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                requestId_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                otherRequestId_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.EchoResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1117,18 +1153,7 @@ public EchoResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new EchoResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumRequest.java
index 0e23b997c5..063ccca508 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumRequest.java
@@ -43,6 +43,50 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private EnumRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              unknownEnum_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_EnumRequest_descriptor;
@@ -94,7 +138,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (unknownEnum_ != false) {
       output.writeBool(1, unknownEnum_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -106,7 +150,7 @@ public int getSerializedSize() {
     if (unknownEnum_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(1, unknownEnum_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -122,7 +166,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.showcase.v1beta1.EnumRequest other = (com.google.showcase.v1beta1.EnumRequest) obj;
 
     if (getUnknownEnum() != other.getUnknownEnum()) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -135,7 +179,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + UNKNOWN_ENUM_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getUnknownEnum());
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -257,10 +301,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.EnumRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -348,7 +399,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.EnumRequest other) {
       if (other.getUnknownEnum() != false) {
         setUnknownEnum(other.getUnknownEnum());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -363,37 +414,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.EnumRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                unknownEnum_ = input.readBool();
-
-                break;
-              } // case 8
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.EnumRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -484,18 +515,7 @@ public EnumRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new EnumRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumResponse.java
index 9d91956c93..07f3f02cde 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EnumResponse.java
@@ -45,6 +45,68 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private EnumResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.showcase.v1beta1.EnumRequest.Builder subBuilder = null;
+              if (request_ != null) {
+                subBuilder = request_.toBuilder();
+              }
+              request_ =
+                  input.readMessage(
+                      com.google.showcase.v1beta1.EnumRequest.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(request_);
+                request_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 16:
+            {
+              int rawValue = input.readEnum();
+
+              continent_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_EnumResponse_descriptor;
@@ -169,7 +231,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (continent_ != com.google.showcase.v1beta1.Continent.CONTINENT_UNSPECIFIED.getNumber()) {
       output.writeEnum(2, continent_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -184,7 +246,7 @@ public int getSerializedSize() {
     if (continent_ != com.google.showcase.v1beta1.Continent.CONTINENT_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, continent_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -204,7 +266,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getRequest().equals(other.getRequest())) return false;
     }
     if (continent_ != other.continent_) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -221,7 +283,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + CONTINENT_FIELD_NUMBER;
     hash = (53 * hash) + continent_;
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -343,10 +405,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.EnumResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -448,7 +517,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.EnumResponse other) {
       if (other.continent_ != 0) {
         setContinentValue(other.getContinentValue());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -463,43 +532,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.EnumResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getRequestFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 16:
-              {
-                continent_ = input.readEnum();
-
-                break;
-              } // case 16
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.EnumResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -825,18 +868,7 @@ public EnumResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new EnumResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithMultipleDetails.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithMultipleDetails.java
index 1014957620..6cbd143ea7 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithMultipleDetails.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithMultipleDetails.java
@@ -45,6 +45,58 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ErrorWithMultipleDetails(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                details_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              details_.add(input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        details_ = java.util.Collections.unmodifiableList(details_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_ErrorWithMultipleDetails_descriptor;
@@ -110,7 +162,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < details_.size(); i++) {
       output.writeMessage(1, details_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -122,7 +174,7 @@ public int getSerializedSize() {
     for (int i = 0; i < details_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, details_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -139,7 +191,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.ErrorWithMultipleDetails) obj;
 
     if (!getDetailsList().equals(other.getDetailsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -154,7 +206,7 @@ public int hashCode() {
       hash = (37 * hash) + DETAILS_FIELD_NUMBER;
       hash = (53 * hash) + getDetailsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -276,10 +328,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ErrorWithMultipleDetails.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getDetailsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -287,11 +348,10 @@ public Builder clear() {
       super.clear();
       if (detailsBuilder_ == null) {
         details_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        details_ = null;
         detailsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -406,7 +466,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ErrorWithMultipleDetails ot
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -421,43 +481,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ErrorWithMultipleDetails parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.protobuf.Any m =
-                    input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry);
-                if (detailsBuilder_ == null) {
-                  ensureDetailsIsMutable();
-                  details_.add(m);
-                } else {
-                  detailsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.ErrorWithMultipleDetails) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -710,18 +745,7 @@ public ErrorWithMultipleDetails parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ErrorWithMultipleDetails(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithSingleDetail.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithSingleDetail.java
index 54cef8c537..351b0407dc 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithSingleDetail.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ErrorWithSingleDetail.java
@@ -43,6 +43,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ErrorWithSingleDetail(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.protobuf.Any.Builder subBuilder = null;
+              if (details_ != null) {
+                subBuilder = details_.toBuilder();
+              }
+              details_ = input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(details_);
+                details_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_ErrorWithSingleDetail_descriptor;
@@ -104,7 +157,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (details_ != null) {
       output.writeMessage(1, getDetails());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -116,7 +169,7 @@ public int getSerializedSize() {
     if (details_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getDetails());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -136,7 +189,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasDetails()) {
       if (!getDetails().equals(other.getDetails())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -151,7 +204,7 @@ public int hashCode() {
       hash = (37 * hash) + DETAILS_FIELD_NUMBER;
       hash = (53 * hash) + getDetails().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -273,10 +326,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ErrorWithSingleDetail.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -373,7 +433,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ErrorWithSingleDetail other
       if (other.hasDetails()) {
         mergeDetails(other.getDetails());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -388,37 +448,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ErrorWithSingleDetail parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getDetailsFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.ErrorWithSingleDetail) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -572,18 +613,7 @@ public ErrorWithSingleDetail parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ErrorWithSingleDetail(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ExpandRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ExpandRequest.java
index ee2f5406d2..b390ae638a 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ExpandRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ExpandRequest.java
@@ -53,6 +53,81 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ExpandRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              content_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.rpc.Status.Builder subBuilder = null;
+              if (error_ != null) {
+                subBuilder = error_.toBuilder();
+              }
+              error_ = input.readMessage(com.google.rpc.Status.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(error_);
+                error_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 26:
+            {
+              com.google.protobuf.Duration.Builder subBuilder = null;
+              if (streamWaitTime_ != null) {
+                subBuilder = streamWaitTime_.toBuilder();
+              }
+              streamWaitTime_ =
+                  input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(streamWaitTime_);
+                streamWaitTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_ExpandRequest_descriptor;
@@ -242,7 +317,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (streamWaitTime_ != null) {
       output.writeMessage(3, getStreamWaitTime());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -260,7 +335,7 @@ public int getSerializedSize() {
     if (streamWaitTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getStreamWaitTime());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -285,7 +360,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasStreamWaitTime()) {
       if (!getStreamWaitTime().equals(other.getStreamWaitTime())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -306,7 +381,7 @@ public int hashCode() {
       hash = (37 * hash) + STREAM_WAIT_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getStreamWaitTime().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -436,10 +511,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ExpandRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -556,7 +638,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ExpandRequest other) {
       if (other.hasStreamWaitTime()) {
         mergeStreamWaitTime(other.getStreamWaitTime());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -571,49 +653,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ExpandRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                content_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getErrorFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(getStreamWaitTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.ExpandRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1136,18 +1186,7 @@ public ExpandRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ExpandRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsRequest.java
index ae977ada41..21fcc8ec64 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsRequest.java
@@ -53,6 +53,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private FailEchoWithDetailsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              message_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_FailEchoWithDetailsRequest_descriptor;
@@ -138,7 +184,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(message_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, message_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -150,7 +196,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(message_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, message_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -167,7 +213,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.FailEchoWithDetailsRequest) obj;
 
     if (!getMessage().equals(other.getMessage())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -180,7 +226,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + MESSAGE_FIELD_NUMBER;
     hash = (53 * hash) + getMessage().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -311,10 +357,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.FailEchoWithDetailsRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -404,7 +457,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.FailEchoWithDetailsRequest
         message_ = other.message_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -419,37 +472,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.FailEchoWithDetailsRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                message_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.FailEchoWithDetailsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -601,18 +635,7 @@ public FailEchoWithDetailsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new FailEchoWithDetailsRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsResponse.java
index 8441e6e946..95486c63e4 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/FailEchoWithDetailsResponse.java
@@ -52,6 +52,45 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private FailEchoWithDetailsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_FailEchoWithDetailsResponse_descriptor;
@@ -81,7 +120,7 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -90,7 +129,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -106,7 +145,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.showcase.v1beta1.FailEchoWithDetailsResponse other =
         (com.google.showcase.v1beta1.FailEchoWithDetailsResponse) obj;
 
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -117,7 +156,7 @@ public int hashCode() {
     }
     int hash = 41;
     hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -249,10 +288,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.FailEchoWithDetailsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -335,7 +381,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
     public Builder mergeFrom(com.google.showcase.v1beta1.FailEchoWithDetailsResponse other) {
       if (other == com.google.showcase.v1beta1.FailEchoWithDetailsResponse.getDefaultInstance())
         return this;
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -350,31 +396,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.FailEchoWithDetailsResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.FailEchoWithDetailsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -410,18 +443,7 @@ public FailEchoWithDetailsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new FailEchoWithDetailsResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetBlurbRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetBlurbRequest.java
index 3d56738fe7..82e6106608 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetBlurbRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetBlurbRequest.java
@@ -54,6 +54,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private GetBlurbRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_GetBlurbRequest_descriptor;
@@ -141,7 +187,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -153,7 +199,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -170,7 +216,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.GetBlurbRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -183,7 +229,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -314,10 +360,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.GetBlurbRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -406,7 +459,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.GetBlurbRequest other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -421,37 +474,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.GetBlurbRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.GetBlurbRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -608,18 +641,7 @@ public GetBlurbRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new GetBlurbRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetRoomRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetRoomRequest.java
index 2d308af15a..2e5c7f0576 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetRoomRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetRoomRequest.java
@@ -54,6 +54,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private GetRoomRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_GetRoomRequest_descriptor;
@@ -141,7 +187,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -153,7 +199,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -170,7 +216,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.GetRoomRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -183,7 +229,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -314,10 +360,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.GetRoomRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -406,7 +459,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.GetRoomRequest other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -421,37 +474,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.GetRoomRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.GetRoomRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -608,18 +641,7 @@ public GetRoomRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new GetRoomRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSequenceReportRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSequenceReportRequest.java
index f0d68e011f..8dbf20eb47 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSequenceReportRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSequenceReportRequest.java
@@ -45,6 +45,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private GetSequenceReportRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_GetSequenceReportRequest_descriptor;
@@ -120,7 +166,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -132,7 +178,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -149,7 +195,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.GetSequenceReportRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -162,7 +208,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -284,10 +330,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.GetSequenceReportRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -377,7 +430,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.GetSequenceReportRequest ot
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -392,37 +445,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.GetSequenceReportRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.GetSequenceReportRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -549,18 +583,7 @@ public GetSequenceReportRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new GetSequenceReportRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSessionRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSessionRequest.java
index faa10b4174..1a8602adad 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSessionRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetSessionRequest.java
@@ -53,6 +53,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private GetSessionRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_GetSessionRequest_descriptor;
@@ -136,7 +182,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -148,7 +194,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -165,7 +211,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.GetSessionRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -178,7 +224,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -308,10 +354,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.GetSessionRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -400,7 +453,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.GetSessionRequest other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -415,37 +468,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.GetSessionRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.GetSessionRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -592,18 +625,7 @@ public GetSessionRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new GetSessionRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetStreamingSequenceReportRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetStreamingSequenceReportRequest.java
index ec275946ae..78c299eddc 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetStreamingSequenceReportRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetStreamingSequenceReportRequest.java
@@ -46,6 +46,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private GetStreamingSequenceReportRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_GetStreamingSequenceReportRequest_descriptor;
@@ -121,7 +167,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -133,7 +179,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -150,7 +196,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.GetStreamingSequenceReportRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -163,7 +209,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -286,10 +332,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.GetStreamingSequenceReportRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -381,7 +434,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.GetStreamingSequenceReportR
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -396,37 +449,19 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.GetStreamingSequenceReportRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.GetStreamingSequenceReportRequest)
+                e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -554,18 +589,7 @@ public GetStreamingSequenceReportRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new GetStreamingSequenceReportRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetUserRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetUserRequest.java
index 6a1246e434..0ffccfa9ce 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetUserRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/GetUserRequest.java
@@ -54,6 +54,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private GetUserRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.IdentityOuterClass
         .internal_static_google_showcase_v1beta1_GetUserRequest_descriptor;
@@ -141,7 +187,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -153,7 +199,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -170,7 +216,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.GetUserRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -183,7 +229,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -314,10 +360,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.GetUserRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -406,7 +459,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.GetUserRequest other) {
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -421,37 +474,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.GetUserRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.GetUserRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -608,18 +641,7 @@ public GetUserRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new GetUserRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Issue.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Issue.java
index 53bad27e82..1e4f2a52db 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Issue.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Issue.java
@@ -55,6 +55,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Issue(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              int rawValue = input.readEnum();
+
+              type_ = rawValue;
+              break;
+            }
+          case 16:
+            {
+              int rawValue = input.readEnum();
+
+              severity_ = rawValue;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              description_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_Issue_descriptor;
@@ -531,7 +591,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, description_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -549,7 +609,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, description_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -567,7 +627,7 @@ public boolean equals(final java.lang.Object obj) {
     if (type_ != other.type_) return false;
     if (severity_ != other.severity_) return false;
     if (!getDescription().equals(other.getDescription())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -584,7 +644,7 @@ public int hashCode() {
     hash = (53 * hash) + severity_;
     hash = (37 * hash) + DESCRIPTION_FIELD_NUMBER;
     hash = (53 * hash) + getDescription().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -713,10 +773,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.Issue.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -816,7 +883,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Issue other) {
         description_ = other.description_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -831,49 +898,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.Issue parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                type_ = input.readEnum();
-
-                break;
-              } // case 8
-            case 16:
-              {
-                severity_ = input.readEnum();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                description_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.Issue) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1212,18 +1247,7 @@ public Issue parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Issue(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsRequest.java
index 813d4600e6..431e4fdbbe 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsRequest.java
@@ -55,6 +55,64 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListBlurbsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          case 16:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_ListBlurbsRequest_descriptor;
@@ -224,7 +282,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -242,7 +300,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -261,7 +319,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getParent().equals(other.getParent())) return false;
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -278,7 +336,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageSize();
     hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -409,10 +467,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ListBlurbsRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -514,7 +579,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListBlurbsRequest other) {
         pageToken_ = other.pageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -529,49 +594,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ListBlurbsRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.ListBlurbsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -910,18 +943,7 @@ public ListBlurbsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListBlurbsRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsResponse.java
index 513ecba347..6efce8118e 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListBlurbsResponse.java
@@ -55,6 +55,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListBlurbsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                blurbs_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              blurbs_.add(
+                  input.readMessage(com.google.showcase.v1beta1.Blurb.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        blurbs_ = java.util.Collections.unmodifiableList(blurbs_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_ListBlurbsResponse_descriptor;
@@ -221,7 +281,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -236,7 +296,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -254,7 +314,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getBlurbsList().equals(other.getBlurbsList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -271,7 +331,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -402,10 +462,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ListBlurbsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getBlurbsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -413,11 +482,10 @@ public Builder clear() {
       super.clear();
       if (blurbsBuilder_ == null) {
         blurbs_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        blurbs_ = null;
         blurbsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -538,7 +606,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListBlurbsResponse other) {
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -553,50 +621,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ListBlurbsResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.showcase.v1beta1.Blurb m =
-                    input.readMessage(
-                        com.google.showcase.v1beta1.Blurb.parser(), extensionRegistry);
-                if (blurbsBuilder_ == null) {
-                  ensureBlurbsIsMutable();
-                  blurbs_.add(m);
-                } else {
-                  blurbsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.ListBlurbsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1123,18 +1158,7 @@ public ListBlurbsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListBlurbsResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsRequest.java
index affe6581ce..308d153f79 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsRequest.java
@@ -54,6 +54,57 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListRoomsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_ListRoomsRequest_descriptor;
@@ -164,7 +215,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, pageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -179,7 +230,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, pageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -197,7 +248,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -212,7 +263,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageSize();
     hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -343,10 +394,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ListRoomsRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -441,7 +499,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListRoomsRequest other) {
         pageToken_ = other.pageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -456,43 +514,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ListRoomsRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 8
-            case 18:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.ListRoomsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -707,18 +739,7 @@ public ListRoomsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListRoomsRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsResponse.java
index 2045b234eb..ad0c941576 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListRoomsResponse.java
@@ -55,6 +55,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListRoomsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                rooms_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              rooms_.add(
+                  input.readMessage(com.google.showcase.v1beta1.Room.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        rooms_ = java.util.Collections.unmodifiableList(rooms_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_ListRoomsResponse_descriptor;
@@ -221,7 +281,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -236,7 +296,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -254,7 +314,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getRoomsList().equals(other.getRoomsList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -271,7 +331,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -402,10 +462,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ListRoomsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getRoomsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -413,11 +482,10 @@ public Builder clear() {
       super.clear();
       if (roomsBuilder_ == null) {
         rooms_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        rooms_ = null;
         roomsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -538,7 +606,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListRoomsResponse other) {
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -553,49 +621,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ListRoomsResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.showcase.v1beta1.Room m =
-                    input.readMessage(com.google.showcase.v1beta1.Room.parser(), extensionRegistry);
-                if (roomsBuilder_ == null) {
-                  ensureRoomsIsMutable();
-                  rooms_.add(m);
-                } else {
-                  roomsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.ListRoomsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1122,18 +1158,7 @@ public ListRoomsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListRoomsResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsRequest.java
index 1c4ba80011..28c0395297 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsRequest.java
@@ -53,6 +53,57 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListSessionsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_ListSessionsRequest_descriptor;
@@ -158,7 +209,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, pageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -173,7 +224,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, pageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -191,7 +242,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -206,7 +257,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageSize();
     hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -336,10 +387,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ListSessionsRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -435,7 +493,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListSessionsRequest other)
         pageToken_ = other.pageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -450,43 +508,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ListSessionsRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 8
-            case 18:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.ListSessionsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -688,18 +720,7 @@ public ListSessionsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListSessionsRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsResponse.java
index 4064678752..dfd32eb721 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListSessionsResponse.java
@@ -54,6 +54,67 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListSessionsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                sessions_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              sessions_.add(
+                  input.readMessage(
+                      com.google.showcase.v1beta1.Session.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        sessions_ = java.util.Collections.unmodifiableList(sessions_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_ListSessionsResponse_descriptor;
@@ -216,7 +277,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -231,7 +292,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -249,7 +310,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getSessionsList().equals(other.getSessionsList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -266,7 +327,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -396,10 +457,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ListSessionsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getSessionsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -407,11 +477,10 @@ public Builder clear() {
       super.clear();
       if (sessionsBuilder_ == null) {
         sessions_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        sessions_ = null;
         sessionsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -533,7 +602,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListSessionsResponse other)
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -548,50 +617,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ListSessionsResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.showcase.v1beta1.Session m =
-                    input.readMessage(
-                        com.google.showcase.v1beta1.Session.parser(), extensionRegistry);
-                if (sessionsBuilder_ == null) {
-                  ensureSessionsIsMutable();
-                  sessions_.add(m);
-                } else {
-                  sessionsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.ListSessionsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1110,18 +1146,7 @@ public ListSessionsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListSessionsResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsRequest.java
index 3ab48d394a..93b02387a1 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsRequest.java
@@ -54,6 +54,64 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListTestsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          case 16:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_ListTestsRequest_descriptor;
@@ -213,7 +271,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -231,7 +289,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -250,7 +308,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getParent().equals(other.getParent())) return false;
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -267,7 +325,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageSize();
     hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -397,10 +455,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ListTestsRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -502,7 +567,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListTestsRequest other) {
         pageToken_ = other.pageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -517,49 +582,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ListTestsRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.ListTestsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -872,18 +905,7 @@ public ListTestsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListTestsRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsResponse.java
index 7b374009c0..57c616d2fc 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListTestsResponse.java
@@ -54,6 +54,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListTestsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                tests_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              tests_.add(
+                  input.readMessage(com.google.showcase.v1beta1.Test.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        tests_ = java.util.Collections.unmodifiableList(tests_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_ListTestsResponse_descriptor;
@@ -216,7 +276,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -231,7 +291,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -249,7 +309,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getTestsList().equals(other.getTestsList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -266,7 +326,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -396,10 +456,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ListTestsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getTestsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -407,11 +476,10 @@ public Builder clear() {
       super.clear();
       if (testsBuilder_ == null) {
         tests_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        tests_ = null;
         testsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -532,7 +600,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListTestsResponse other) {
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -547,49 +615,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ListTestsResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.showcase.v1beta1.Test m =
-                    input.readMessage(com.google.showcase.v1beta1.Test.parser(), extensionRegistry);
-                if (testsBuilder_ == null) {
-                  ensureTestsIsMutable();
-                  tests_.add(m);
-                } else {
-                  testsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.ListTestsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1106,18 +1142,7 @@ public ListTestsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListTestsResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersRequest.java
index bec71e4ef0..c38a00dc07 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersRequest.java
@@ -54,6 +54,57 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListUsersRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.IdentityOuterClass
         .internal_static_google_showcase_v1beta1_ListUsersRequest_descriptor;
@@ -164,7 +215,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, pageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -179,7 +230,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, pageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -197,7 +248,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -212,7 +263,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageSize();
     hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -343,10 +394,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ListUsersRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -441,7 +499,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListUsersRequest other) {
         pageToken_ = other.pageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -456,43 +514,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ListUsersRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 8
-            case 18:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.ListUsersRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -707,18 +739,7 @@ public ListUsersRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListUsersRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersResponse.java
index bc02f8fe46..b1dc9df720 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ListUsersResponse.java
@@ -55,6 +55,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ListUsersResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                users_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              users_.add(
+                  input.readMessage(com.google.showcase.v1beta1.User.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        users_ = java.util.Collections.unmodifiableList(users_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.IdentityOuterClass
         .internal_static_google_showcase_v1beta1_ListUsersResponse_descriptor;
@@ -221,7 +281,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -236,7 +296,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -254,7 +314,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getUsersList().equals(other.getUsersList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -271,7 +331,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -402,10 +462,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ListUsersResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getUsersFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -413,11 +482,10 @@ public Builder clear() {
       super.clear();
       if (usersBuilder_ == null) {
         users_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        users_ = null;
         usersBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -538,7 +606,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ListUsersResponse other) {
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -553,49 +621,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ListUsersResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.showcase.v1beta1.User m =
-                    input.readMessage(com.google.showcase.v1beta1.User.parser(), extensionRegistry);
-                if (usersBuilder_ == null) {
-                  ensureUsersIsMutable();
-                  users_.add(m);
-                } else {
-                  usersBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.ListUsersResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1122,18 +1158,7 @@ public ListUsersResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ListUsersResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyMappedResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyMappedResponse.java
index a6461fa4b9..982a20cb30 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyMappedResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyMappedResponse.java
@@ -46,6 +46,70 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PagedExpandLegacyMappedResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                alphabetized_ =
+                    com.google.protobuf.MapField.newMapField(
+                        AlphabetizedDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry<
+                      java.lang.String, com.google.showcase.v1beta1.PagedExpandResponseList>
+                  alphabetized__ =
+                      input.readMessage(
+                          AlphabetizedDefaultEntryHolder.defaultEntry.getParserForType(),
+                          extensionRegistry);
+              alphabetized_.getMutableMap().put(alphabetized__.getKey(), alphabetized__.getValue());
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_PagedExpandLegacyMappedResponse_descriptor;
@@ -272,7 +336,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -296,7 +360,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -314,7 +378,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!internalGetAlphabetized().equals(other.internalGetAlphabetized())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -331,7 +395,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -474,10 +538,17 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
     }
 
     // Construct using com.google.showcase.v1beta1.PagedExpandLegacyMappedResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -572,7 +643,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.PagedExpandLegacyMappedResp
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -587,50 +658,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.PagedExpandLegacyMappedResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.protobuf.MapEntry<
-                        java.lang.String, com.google.showcase.v1beta1.PagedExpandResponseList>
-                    alphabetized__ =
-                        input.readMessage(
-                            AlphabetizedDefaultEntryHolder.defaultEntry.getParserForType(),
-                            extensionRegistry);
-                internalGetMutableAlphabetized()
-                    .getMutableMap()
-                    .put(alphabetized__.getKey(), alphabetized__.getValue());
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.PagedExpandLegacyMappedResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -983,18 +1022,7 @@ public PagedExpandLegacyMappedResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PagedExpandLegacyMappedResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyRequest.java
index 83418afa86..67b02877b7 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandLegacyRequest.java
@@ -56,6 +56,64 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PagedExpandLegacyRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              content_ = s;
+              break;
+            }
+          case 16:
+            {
+              maxResults_ = input.readInt32();
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_PagedExpandLegacyRequest_descriptor;
@@ -217,7 +275,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -235,7 +293,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -254,7 +312,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getContent().equals(other.getContent())) return false;
     if (getMaxResults() != other.getMaxResults()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -271,7 +329,7 @@ public int hashCode() {
     hash = (53 * hash) + getMaxResults();
     hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -403,10 +461,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.PagedExpandLegacyRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -509,7 +574,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.PagedExpandLegacyRequest ot
         pageToken_ = other.pageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -524,49 +589,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.PagedExpandLegacyRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                content_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                maxResults_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.PagedExpandLegacyRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -885,18 +919,7 @@ public PagedExpandLegacyRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PagedExpandLegacyRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandRequest.java
index 89c5eff26f..e1f0478ab1 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandRequest.java
@@ -54,6 +54,64 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PagedExpandRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              content_ = s;
+              break;
+            }
+          case 16:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_PagedExpandRequest_descriptor;
@@ -213,7 +271,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -231,7 +289,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -250,7 +308,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getContent().equals(other.getContent())) return false;
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -267,7 +325,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageSize();
     hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -397,10 +455,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.PagedExpandRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -502,7 +567,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.PagedExpandRequest other) {
         pageToken_ = other.pageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -517,49 +582,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.PagedExpandRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                content_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.PagedExpandRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -872,18 +905,7 @@ public PagedExpandRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PagedExpandRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponse.java
index 486f624164..83103b1e30 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponse.java
@@ -54,6 +54,67 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PagedExpandResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                responses_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              responses_.add(
+                  input.readMessage(
+                      com.google.showcase.v1beta1.EchoResponse.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        responses_ = java.util.Collections.unmodifiableList(responses_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_PagedExpandResponse_descriptor;
@@ -214,7 +275,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -229,7 +290,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -247,7 +308,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getResponsesList().equals(other.getResponsesList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -264,7 +325,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -394,10 +455,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.PagedExpandResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getResponsesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -405,11 +475,10 @@ public Builder clear() {
       super.clear();
       if (responsesBuilder_ == null) {
         responses_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        responses_ = null;
         responsesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -531,7 +600,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.PagedExpandResponse other)
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -546,50 +615,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.PagedExpandResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.showcase.v1beta1.EchoResponse m =
-                    input.readMessage(
-                        com.google.showcase.v1beta1.EchoResponse.parser(), extensionRegistry);
-                if (responsesBuilder_ == null) {
-                  ensureResponsesIsMutable();
-                  responses_.add(m);
-                } else {
-                  responsesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.PagedExpandResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1104,18 +1140,7 @@ public PagedExpandResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PagedExpandResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponseList.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponseList.java
index bc7e814088..4d2cbaa0ed 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponseList.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PagedExpandResponseList.java
@@ -53,6 +53,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PagedExpandResponseList(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                words_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              words_.add(s);
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        words_ = words_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_PagedExpandResponseList_descriptor;
@@ -126,7 +179,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < words_.size(); i++) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, words_.getRaw(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -143,7 +196,7 @@ public int getSerializedSize() {
       size += dataSize;
       size += 1 * getWordsList().size();
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -160,7 +213,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.PagedExpandResponseList) obj;
 
     if (!getWordsList().equals(other.getWordsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -175,7 +228,7 @@ public int hashCode() {
       hash = (37 * hash) + WORDS_FIELD_NUMBER;
       hash = (53 * hash) + getWordsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -305,10 +358,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.PagedExpandResponseList.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -409,7 +469,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.PagedExpandResponseList oth
         }
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -424,38 +484,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.PagedExpandResponseList parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureWordsIsMutable();
-                words_.add(s);
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.PagedExpandResponseList) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -616,18 +656,7 @@ public PagedExpandResponseList parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PagedExpandResponseList(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PoetryError.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PoetryError.java
index 684b6a6032..b2e280ccf1 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PoetryError.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/PoetryError.java
@@ -55,6 +55,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private PoetryError(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              poem_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_PoetryError_descriptor;
@@ -126,7 +172,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(poem_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, poem_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -138,7 +184,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(poem_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, poem_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -154,7 +200,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.showcase.v1beta1.PoetryError other = (com.google.showcase.v1beta1.PoetryError) obj;
 
     if (!getPoem().equals(other.getPoem())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -167,7 +213,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + POEM_FIELD_NUMBER;
     hash = (53 * hash) + getPoem().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -299,10 +345,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.PoetryError.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -391,7 +444,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.PoetryError other) {
         poem_ = other.poem_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -406,37 +459,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.PoetryError parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                poem_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.PoetryError) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -553,18 +586,7 @@ public PoetryError parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new PoetryError(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatRequest.java
index d40a196379..4135ea6b9f 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatRequest.java
@@ -46,6 +46,114 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private RepeatRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.showcase.v1beta1.ComplianceData.Builder subBuilder = null;
+              if (info_ != null) {
+                subBuilder = info_.toBuilder();
+              }
+              info_ =
+                  input.readMessage(
+                      com.google.showcase.v1beta1.ComplianceData.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(info_);
+                info_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 24:
+            {
+              serverVerify_ = input.readBool();
+              break;
+            }
+          case 32:
+            {
+              fInt32_ = input.readInt32();
+              break;
+            }
+          case 40:
+            {
+              fInt64_ = input.readInt64();
+              break;
+            }
+          case 49:
+            {
+              fDouble_ = input.readDouble();
+              break;
+            }
+          case 56:
+            {
+              bitField0_ |= 0x00000002;
+              pInt32_ = input.readInt32();
+              break;
+            }
+          case 64:
+            {
+              bitField0_ |= 0x00000004;
+              pInt64_ = input.readInt64();
+              break;
+            }
+          case 73:
+            {
+              bitField0_ |= 0x00000008;
+              pDouble_ = input.readDouble();
+              break;
+            }
+          case 82:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              bitField0_ |= 0x00000001;
+              intendedBindingUri_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_RepeatRequest_descriptor;
@@ -376,7 +484,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (((bitField0_ & 0x00000001) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 10, intendedBindingUri_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -415,7 +523,7 @@ public int getSerializedSize() {
     if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, intendedBindingUri_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -458,7 +566,7 @@ public boolean equals(final java.lang.Object obj) {
       if (java.lang.Double.doubleToLongBits(getPDouble())
           != java.lang.Double.doubleToLongBits(other.getPDouble())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -505,7 +613,7 @@ public int hashCode() {
               + com.google.protobuf.Internal.hashLong(
                   java.lang.Double.doubleToLongBits(getPDouble()));
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -627,10 +735,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.RepeatRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -798,7 +913,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.RepeatRequest other) {
       if (other.hasPDouble()) {
         setPDouble(other.getPDouble());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -813,91 +928,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.RepeatRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getInfoFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            case 24:
-              {
-                serverVerify_ = input.readBool();
-
-                break;
-              } // case 24
-            case 32:
-              {
-                fInt32_ = input.readInt32();
-
-                break;
-              } // case 32
-            case 40:
-              {
-                fInt64_ = input.readInt64();
-
-                break;
-              } // case 40
-            case 49:
-              {
-                fDouble_ = input.readDouble();
-
-                break;
-              } // case 49
-            case 56:
-              {
-                pInt32_ = input.readInt32();
-                bitField0_ |= 0x00000002;
-                break;
-              } // case 56
-            case 64:
-              {
-                pInt64_ = input.readInt64();
-                bitField0_ |= 0x00000004;
-                break;
-              } // case 64
-            case 73:
-              {
-                pDouble_ = input.readDouble();
-                bitField0_ |= 0x00000008;
-                break;
-              } // case 73
-            case 82:
-              {
-                intendedBindingUri_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000001;
-                break;
-              } // case 82
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.RepeatRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1599,18 +1640,7 @@ public RepeatRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new RepeatRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatResponse.java
index e5f3f6a1ea..eeb18d60ec 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RepeatResponse.java
@@ -45,6 +45,68 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private RepeatResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.showcase.v1beta1.RepeatRequest.Builder subBuilder = null;
+              if (request_ != null) {
+                subBuilder = request_.toBuilder();
+              }
+              request_ =
+                  input.readMessage(
+                      com.google.showcase.v1beta1.RepeatRequest.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(request_);
+                request_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              bindingUri_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.ComplianceOuterClass
         .internal_static_google_showcase_v1beta1_RepeatResponse_descriptor;
@@ -162,7 +224,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bindingUri_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, bindingUri_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -177,7 +239,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bindingUri_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, bindingUri_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -198,7 +260,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getRequest().equals(other.getRequest())) return false;
     }
     if (!getBindingUri().equals(other.getBindingUri())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -215,7 +277,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + BINDING_URI_FIELD_NUMBER;
     hash = (53 * hash) + getBindingUri().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -337,10 +399,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.RepeatResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -443,7 +512,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.RepeatResponse other) {
         bindingUri_ = other.bindingUri_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -458,43 +527,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.RepeatResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getRequestFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                bindingUri_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.RepeatResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -767,18 +810,7 @@ public RepeatResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new RepeatResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionRequest.java
index c895127439..0001110e5a 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionRequest.java
@@ -53,6 +53,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ReportSessionRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_ReportSessionRequest_descriptor;
@@ -136,7 +182,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -148,7 +194,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -165,7 +211,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.ReportSessionRequest) obj;
 
     if (!getName().equals(other.getName())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -178,7 +224,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + NAME_FIELD_NUMBER;
     hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -308,10 +354,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ReportSessionRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -401,7 +454,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ReportSessionRequest other)
         name_ = other.name_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -416,37 +469,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ReportSessionRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.ReportSessionRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -593,18 +626,7 @@ public ReportSessionRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ReportSessionRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionResponse.java
index d411518ed0..b5285ddf67 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ReportSessionResponse.java
@@ -54,6 +54,67 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private ReportSessionResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              int rawValue = input.readEnum();
+
+              result_ = rawValue;
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                testRuns_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              testRuns_.add(
+                  input.readMessage(
+                      com.google.showcase.v1beta1.TestRun.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        testRuns_ = java.util.Collections.unmodifiableList(testRuns_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_ReportSessionResponse_descriptor;
@@ -373,7 +434,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < testRuns_.size(); i++) {
       output.writeMessage(2, testRuns_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -390,7 +451,7 @@ public int getSerializedSize() {
     for (int i = 0; i < testRuns_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, testRuns_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -408,7 +469,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (result_ != other.result_) return false;
     if (!getTestRunsList().equals(other.getTestRunsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -425,7 +486,7 @@ public int hashCode() {
       hash = (37 * hash) + TEST_RUNS_FIELD_NUMBER;
       hash = (53 * hash) + getTestRunsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -555,10 +616,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.ReportSessionResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getTestRunsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -568,11 +638,10 @@ public Builder clear() {
 
       if (testRunsBuilder_ == null) {
         testRuns_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        testRuns_ = null;
         testRunsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -691,7 +760,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.ReportSessionResponse other
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -706,50 +775,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.ReportSessionResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8:
-              {
-                result_ = input.readEnum();
-
-                break;
-              } // case 8
-            case 18:
-              {
-                com.google.showcase.v1beta1.TestRun m =
-                    input.readMessage(
-                        com.google.showcase.v1beta1.TestRun.parser(), extensionRegistry);
-                if (testRunsBuilder_ == null) {
-                  ensureTestRunsIsMutable();
-                  testRuns_.add(m);
-                } else {
-                  testRunsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.ReportSessionResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1250,18 +1287,7 @@ public ReportSessionResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new ReportSessionResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RestError.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RestError.java
index f99185ef0f..4571408339 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RestError.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RestError.java
@@ -52,6 +52,61 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private RestError(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.showcase.v1beta1.RestError.Status.Builder subBuilder = null;
+              if (error_ != null) {
+                subBuilder = error_.toBuilder();
+              }
+              error_ =
+                  input.readMessage(
+                      com.google.showcase.v1beta1.RestError.Status.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(error_);
+                error_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.RestErrorOuterClass
         .internal_static_google_showcase_v1beta1_RestError_descriptor;
@@ -222,6 +277,78 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Status(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                code_ = input.readInt32();
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                message_ = s;
+                break;
+              }
+            case 32:
+              {
+                int rawValue = input.readEnum();
+
+                status_ = rawValue;
+                break;
+              }
+            case 42:
+              {
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  details_ = new java.util.ArrayList();
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                details_.add(
+                    input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry));
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          details_ = java.util.Collections.unmodifiableList(details_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.showcase.v1beta1.RestErrorOuterClass
           .internal_static_google_showcase_v1beta1_RestError_Status_descriptor;
@@ -443,7 +570,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       for (int i = 0; i < details_.size(); i++) {
         output.writeMessage(5, details_.get(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -464,7 +591,7 @@ public int getSerializedSize() {
       for (int i = 0; i < details_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, details_.get(i));
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -484,7 +611,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getMessage().equals(other.getMessage())) return false;
       if (status_ != other.status_) return false;
       if (!getDetailsList().equals(other.getDetailsList())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -505,7 +632,7 @@ public int hashCode() {
         hash = (37 * hash) + DETAILS_FIELD_NUMBER;
         hash = (53 * hash) + getDetailsList().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -629,10 +756,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.showcase.v1beta1.RestError.Status.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+          getDetailsFieldBuilder();
+        }
       }
 
       @java.lang.Override
@@ -646,11 +782,10 @@ public Builder clear() {
 
         if (detailsBuilder_ == null) {
           details_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
-          details_ = null;
           detailsBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -779,7 +914,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.RestError.Status other) {
             }
           }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -794,61 +929,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.showcase.v1beta1.RestError.Status parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 8:
-                {
-                  code_ = input.readInt32();
-
-                  break;
-                } // case 8
-              case 18:
-                {
-                  message_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 18
-              case 32:
-                {
-                  status_ = input.readEnum();
-
-                  break;
-                } // case 32
-              case 42:
-                {
-                  com.google.protobuf.Any m =
-                      input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry);
-                  if (detailsBuilder_ == null) {
-                    ensureDetailsIsMutable();
-                    details_.add(m);
-                  } else {
-                    detailsBuilder_.addMessage(m);
-                  }
-                  break;
-                } // case 42
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.showcase.v1beta1.RestError.Status) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1507,19 +1598,7 @@ public Status parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Status(input, extensionRegistry);
           }
         };
 
@@ -1586,7 +1665,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (error_ != null) {
       output.writeMessage(1, getError());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1598,7 +1677,7 @@ public int getSerializedSize() {
     if (error_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getError());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1617,7 +1696,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasError()) {
       if (!getError().equals(other.getError())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1632,7 +1711,7 @@ public int hashCode() {
       hash = (37 * hash) + ERROR_FIELD_NUMBER;
       hash = (53 * hash) + getError().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1762,10 +1841,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.RestError.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -1861,7 +1947,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.RestError other) {
       if (other.hasError()) {
         mergeError(other.getError());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1876,37 +1962,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.RestError parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getErrorFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.RestError) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2068,18 +2134,7 @@ public RestError parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new RestError(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Room.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Room.java
index 161cd8b028..e01afc2b5d 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Room.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Room.java
@@ -55,6 +55,96 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Room(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              displayName_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              description_ = s;
+              break;
+            }
+          case 34:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (createTime_ != null) {
+                subBuilder = createTime_.toBuilder();
+              }
+              createTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(createTime_);
+                createTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 42:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (updateTime_ != null) {
+                subBuilder = updateTime_.toBuilder();
+              }
+              updateTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateTime_);
+                updateTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_Room_descriptor;
@@ -355,7 +445,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (updateTime_ != null) {
       output.writeMessage(5, getUpdateTime());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -379,7 +469,7 @@ public int getSerializedSize() {
     if (updateTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getUpdateTime());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -405,7 +495,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasUpdateTime()) {
       if (!getUpdateTime().equals(other.getUpdateTime())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -430,7 +520,7 @@ public int hashCode() {
       hash = (37 * hash) + UPDATE_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getUpdateTime().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -559,10 +649,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.Room.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -692,7 +789,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Room other) {
       if (other.hasUpdateTime()) {
         mergeUpdateTime(other.getUpdateTime());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -707,61 +804,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.Room parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                displayName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                description_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 34
-            case 42:
-              {
-                input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 42
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.Room) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1550,18 +1603,7 @@ public Room parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Room(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsMetadata.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsMetadata.java
index 2db8e869cb..b564fe4b9e 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsMetadata.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsMetadata.java
@@ -52,6 +52,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SearchBlurbsMetadata(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.rpc.RetryInfo.Builder subBuilder = null;
+              if (retryInfo_ != null) {
+                subBuilder = retryInfo_.toBuilder();
+              }
+              retryInfo_ = input.readMessage(com.google.rpc.RetryInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(retryInfo_);
+                retryInfo_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_SearchBlurbsMetadata_descriptor;
@@ -133,7 +186,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (retryInfo_ != null) {
       output.writeMessage(1, getRetryInfo());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -145,7 +198,7 @@ public int getSerializedSize() {
     if (retryInfo_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getRetryInfo());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -165,7 +218,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasRetryInfo()) {
       if (!getRetryInfo().equals(other.getRetryInfo())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -180,7 +233,7 @@ public int hashCode() {
       hash = (37 * hash) + RETRY_INFO_FIELD_NUMBER;
       hash = (53 * hash) + getRetryInfo().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -311,10 +364,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.SearchBlurbsMetadata.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -411,7 +471,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.SearchBlurbsMetadata other)
       if (other.hasRetryInfo()) {
         mergeRetryInfo(other.getRetryInfo());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -426,37 +486,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.SearchBlurbsMetadata parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getRetryInfoFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.SearchBlurbsMetadata) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -680,18 +720,7 @@ public SearchBlurbsMetadata parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new SearchBlurbsMetadata(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsRequest.java
index 6284cad382..84459a3872 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsRequest.java
@@ -56,6 +56,71 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SearchBlurbsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              query_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              parent_ = s;
+              break;
+            }
+          case 24:
+            {
+              pageSize_ = input.readInt32();
+              break;
+            }
+          case 34:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_SearchBlurbsRequest_descriptor;
@@ -281,7 +346,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, pageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -302,7 +367,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, pageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -322,7 +387,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getParent().equals(other.getParent())) return false;
     if (getPageSize() != other.getPageSize()) return false;
     if (!getPageToken().equals(other.getPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -341,7 +406,7 @@ public int hashCode() {
     hash = (53 * hash) + getPageSize();
     hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -472,10 +537,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.SearchBlurbsRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -585,7 +657,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.SearchBlurbsRequest other)
         pageToken_ = other.pageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -600,55 +672,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.SearchBlurbsRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                query_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                parent_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 24:
-              {
-                pageSize_ = input.readInt32();
-
-                break;
-              } // case 24
-            case 34:
-              {
-                pageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.SearchBlurbsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1103,18 +1137,7 @@ public SearchBlurbsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new SearchBlurbsRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsResponse.java
index 29da80e282..1150887389 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SearchBlurbsResponse.java
@@ -55,6 +55,66 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SearchBlurbsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                blurbs_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              blurbs_.add(
+                  input.readMessage(com.google.showcase.v1beta1.Blurb.parser(), extensionRegistry));
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextPageToken_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        blurbs_ = java.util.Collections.unmodifiableList(blurbs_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_SearchBlurbsResponse_descriptor;
@@ -221,7 +281,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -236,7 +296,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -254,7 +314,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getBlurbsList().equals(other.getBlurbsList())) return false;
     if (!getNextPageToken().equals(other.getNextPageToken())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -271,7 +331,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
     hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -402,10 +462,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.SearchBlurbsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getBlurbsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -413,11 +482,10 @@ public Builder clear() {
       super.clear();
       if (blurbsBuilder_ == null) {
         blurbs_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        blurbs_ = null;
         blurbsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       nextPageToken_ = "";
 
       return this;
@@ -539,7 +607,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.SearchBlurbsResponse other)
         nextPageToken_ = other.nextPageToken_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -554,50 +622,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.SearchBlurbsResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                com.google.showcase.v1beta1.Blurb m =
-                    input.readMessage(
-                        com.google.showcase.v1beta1.Blurb.parser(), extensionRegistry);
-                if (blurbsBuilder_ == null) {
-                  ensureBlurbsIsMutable();
-                  blurbs_.add(m);
-                } else {
-                  blurbsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 10
-            case 18:
-              {
-                nextPageToken_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.SearchBlurbsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1124,18 +1159,7 @@ public SearchBlurbsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new SearchBlurbsResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SendBlurbsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SendBlurbsResponse.java
index b16f955ac1..3735c00f79 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SendBlurbsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SendBlurbsResponse.java
@@ -54,6 +54,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SendBlurbsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                names_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              names_.add(s);
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        names_ = names_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_SendBlurbsResponse_descriptor;
@@ -151,7 +204,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < names_.size(); i++) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, names_.getRaw(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -168,7 +221,7 @@ public int getSerializedSize() {
       size += dataSize;
       size += 1 * getNamesList().size();
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -185,7 +238,7 @@ public boolean equals(final java.lang.Object obj) {
         (com.google.showcase.v1beta1.SendBlurbsResponse) obj;
 
     if (!getNamesList().equals(other.getNamesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -200,7 +253,7 @@ public int hashCode() {
       hash = (37 * hash) + NAMES_FIELD_NUMBER;
       hash = (53 * hash) + getNamesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -331,10 +384,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.SendBlurbsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -434,7 +494,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.SendBlurbsResponse other) {
         }
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -449,38 +509,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.SendBlurbsResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                ensureNamesIsMutable();
-                names_.add(s);
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.SendBlurbsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -695,18 +734,7 @@ public SendBlurbsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new SendBlurbsResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Sequence.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Sequence.java
index 6abf68277c..edc2abf0f5 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Sequence.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Sequence.java
@@ -46,6 +46,68 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Sequence(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                responses_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              responses_.add(
+                  input.readMessage(
+                      com.google.showcase.v1beta1.Sequence.Response.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        responses_ = java.util.Collections.unmodifiableList(responses_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_Sequence_descriptor;
@@ -174,6 +236,74 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Response(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.rpc.Status.Builder subBuilder = null;
+                if (status_ != null) {
+                  subBuilder = status_.toBuilder();
+                }
+                status_ = input.readMessage(com.google.rpc.Status.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(status_);
+                  status_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 18:
+              {
+                com.google.protobuf.Duration.Builder subBuilder = null;
+                if (delay_ != null) {
+                  subBuilder = delay_.toBuilder();
+                }
+                delay_ =
+                    input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(delay_);
+                  delay_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.showcase.v1beta1.SequenceOuterClass
           .internal_static_google_showcase_v1beta1_Sequence_Response_descriptor;
@@ -307,7 +437,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (delay_ != null) {
         output.writeMessage(2, getDelay());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -322,7 +452,7 @@ public int getSerializedSize() {
       if (delay_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getDelay());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -346,7 +476,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasDelay()) {
         if (!getDelay().equals(other.getDelay())) return false;
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -365,7 +495,7 @@ public int hashCode() {
         hash = (37 * hash) + DELAY_FIELD_NUMBER;
         hash = (53 * hash) + getDelay().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -497,10 +627,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.showcase.v1beta1.Sequence.Response.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -613,7 +750,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Sequence.Response other) {
         if (other.hasDelay()) {
           mergeDelay(other.getDelay());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -628,43 +765,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.showcase.v1beta1.Sequence.Response parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  input.readMessage(getStatusFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  input.readMessage(getDelayFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 18
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.showcase.v1beta1.Sequence.Response) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1071,19 +1182,7 @@ public Response parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Response(input, extensionRegistry);
           }
         };
 
@@ -1240,7 +1339,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < responses_.size(); i++) {
       output.writeMessage(2, responses_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1255,7 +1354,7 @@ public int getSerializedSize() {
     for (int i = 0; i < responses_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, responses_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1272,7 +1371,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getName().equals(other.getName())) return false;
     if (!getResponsesList().equals(other.getResponsesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1289,7 +1388,7 @@ public int hashCode() {
       hash = (37 * hash) + RESPONSES_FIELD_NUMBER;
       hash = (53 * hash) + getResponsesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1410,10 +1509,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.Sequence.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getResponsesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -1423,11 +1531,10 @@ public Builder clear() {
 
       if (responsesBuilder_ == null) {
         responses_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        responses_ = null;
         responsesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -1545,7 +1652,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Sequence other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1560,50 +1667,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.Sequence parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.showcase.v1beta1.Sequence.Response m =
-                    input.readMessage(
-                        com.google.showcase.v1beta1.Sequence.Response.parser(), extensionRegistry);
-                if (responsesBuilder_ == null) {
-                  ensureResponsesIsMutable();
-                  responses_.add(m);
-                } else {
-                  responsesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.Sequence) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2108,18 +2182,7 @@ public Sequence parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Sequence(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceReport.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceReport.java
index 2020abb2d8..98fe646d91 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceReport.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceReport.java
@@ -46,6 +46,69 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private SequenceReport(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                attempts_ =
+                    new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              attempts_.add(
+                  input.readMessage(
+                      com.google.showcase.v1beta1.SequenceReport.Attempt.parser(),
+                      extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        attempts_ = java.util.Collections.unmodifiableList(attempts_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_SequenceReport_descriptor;
@@ -267,6 +330,109 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Attempt(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                attemptNumber_ = input.readInt32();
+                break;
+              }
+            case 18:
+              {
+                com.google.protobuf.Timestamp.Builder subBuilder = null;
+                if (attemptDeadline_ != null) {
+                  subBuilder = attemptDeadline_.toBuilder();
+                }
+                attemptDeadline_ =
+                    input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(attemptDeadline_);
+                  attemptDeadline_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 26:
+              {
+                com.google.protobuf.Timestamp.Builder subBuilder = null;
+                if (responseTime_ != null) {
+                  subBuilder = responseTime_.toBuilder();
+                }
+                responseTime_ =
+                    input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(responseTime_);
+                  responseTime_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 34:
+              {
+                com.google.protobuf.Duration.Builder subBuilder = null;
+                if (attemptDelay_ != null) {
+                  subBuilder = attemptDelay_.toBuilder();
+                }
+                attemptDelay_ =
+                    input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(attemptDelay_);
+                  attemptDelay_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 42:
+              {
+                com.google.rpc.Status.Builder subBuilder = null;
+                if (status_ != null) {
+                  subBuilder = status_.toBuilder();
+                }
+                status_ = input.readMessage(com.google.rpc.Status.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(status_);
+                  status_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.showcase.v1beta1.SequenceOuterClass
           .internal_static_google_showcase_v1beta1_SequenceReport_Attempt_descriptor;
@@ -538,7 +704,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (status_ != null) {
         output.writeMessage(5, getStatus());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -562,7 +728,7 @@ public int getSerializedSize() {
       if (status_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getStatus());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -595,7 +761,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasStatus()) {
         if (!getStatus().equals(other.getStatus())) return false;
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -624,7 +790,7 @@ public int hashCode() {
         hash = (37 * hash) + STATUS_FIELD_NUMBER;
         hash = (53 * hash) + getStatus().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -756,10 +922,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.showcase.v1beta1.SequenceReport.Attempt.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -906,7 +1079,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.SequenceReport.Attempt othe
         if (other.hasStatus()) {
           mergeStatus(other.getStatus());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -921,62 +1094,18 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.showcase.v1beta1.SequenceReport.Attempt parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 8:
-                {
-                  attemptNumber_ = input.readInt32();
-
-                  break;
-                } // case 8
-              case 18:
-                {
-                  input.readMessage(
-                      getAttemptDeadlineFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 18
-              case 26:
-                {
-                  input.readMessage(getResponseTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 26
-              case 34:
-                {
-                  input.readMessage(getAttemptDelayFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 34
-              case 42:
-                {
-                  input.readMessage(getStatusFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 42
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.showcase.v1beta1.SequenceReport.Attempt) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1850,19 +1979,7 @@ public Attempt parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Attempt(input, extensionRegistry);
           }
         };
 
@@ -2015,7 +2132,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < attempts_.size(); i++) {
       output.writeMessage(2, attempts_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -2030,7 +2147,7 @@ public int getSerializedSize() {
     for (int i = 0; i < attempts_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, attempts_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -2048,7 +2165,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getName().equals(other.getName())) return false;
     if (!getAttemptsList().equals(other.getAttemptsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -2065,7 +2182,7 @@ public int hashCode() {
       hash = (37 * hash) + ATTEMPTS_FIELD_NUMBER;
       hash = (53 * hash) + getAttemptsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -2187,10 +2304,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.SequenceReport.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getAttemptsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -2200,11 +2326,10 @@ public Builder clear() {
 
       if (attemptsBuilder_ == null) {
         attempts_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        attempts_ = null;
         attemptsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -2323,7 +2448,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.SequenceReport other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2338,51 +2463,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.SequenceReport parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.showcase.v1beta1.SequenceReport.Attempt m =
-                    input.readMessage(
-                        com.google.showcase.v1beta1.SequenceReport.Attempt.parser(),
-                        extensionRegistry);
-                if (attemptsBuilder_ == null) {
-                  ensureAttemptsIsMutable();
-                  attempts_.add(m);
-                } else {
-                  attemptsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.SequenceReport) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2875,18 +2966,7 @@ public SequenceReport parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new SequenceReport(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Session.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Session.java
index a017e8a9f6..3e91b808df 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Session.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Session.java
@@ -57,6 +57,59 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Session(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 16:
+            {
+              int rawValue = input.readEnum();
+
+              version_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_Session_descriptor;
@@ -344,7 +397,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (version_ != com.google.showcase.v1beta1.Session.Version.VERSION_UNSPECIFIED.getNumber()) {
       output.writeEnum(2, version_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -359,7 +412,7 @@ public int getSerializedSize() {
     if (version_ != com.google.showcase.v1beta1.Session.Version.VERSION_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, version_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -376,7 +429,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getName().equals(other.getName())) return false;
     if (version_ != other.version_) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -391,7 +444,7 @@ public int hashCode() {
     hash = (53 * hash) + getName().hashCode();
     hash = (37 * hash) + VERSION_FIELD_NUMBER;
     hash = (53 * hash) + version_;
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -523,10 +576,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.Session.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -620,7 +680,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Session other) {
       if (other.version_ != 0) {
         setVersionValue(other.getVersionValue());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -635,43 +695,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.Session parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                version_ = input.readEnum();
-
-                break;
-              } // case 16
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.Session) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -919,18 +953,7 @@ public Session parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Session(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsRequest.java
index 2f7f2e2f17..8d5621bdc7 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsRequest.java
@@ -54,6 +54,67 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private StreamBlurbsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (expireTime_ != null) {
+                subBuilder = expireTime_.toBuilder();
+              }
+              expireTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(expireTime_);
+                expireTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_StreamBlurbsRequest_descriptor;
@@ -196,7 +257,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (expireTime_ != null) {
       output.writeMessage(2, getExpireTime());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -211,7 +272,7 @@ public int getSerializedSize() {
     if (expireTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getExpireTime());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -232,7 +293,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasExpireTime()) {
       if (!getExpireTime().equals(other.getExpireTime())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -249,7 +310,7 @@ public int hashCode() {
       hash = (37 * hash) + EXPIRE_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getExpireTime().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -380,10 +441,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.StreamBlurbsRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -487,7 +555,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.StreamBlurbsRequest other)
       if (other.hasExpireTime()) {
         mergeExpireTime(other.getExpireTime());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -502,43 +570,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.StreamBlurbsRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getExpireTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.StreamBlurbsRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -896,18 +938,7 @@ public StreamBlurbsRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new StreamBlurbsRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsResponse.java
index e09a06f05a..8f7b1931ab 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamBlurbsResponse.java
@@ -54,6 +54,67 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private StreamBlurbsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.showcase.v1beta1.Blurb.Builder subBuilder = null;
+              if (blurb_ != null) {
+                subBuilder = blurb_.toBuilder();
+              }
+              blurb_ =
+                  input.readMessage(com.google.showcase.v1beta1.Blurb.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(blurb_);
+                blurb_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 16:
+            {
+              int rawValue = input.readEnum();
+
+              action_ = rawValue;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_StreamBlurbsResponse_descriptor;
@@ -345,7 +406,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         != com.google.showcase.v1beta1.StreamBlurbsResponse.Action.ACTION_UNSPECIFIED.getNumber()) {
       output.writeEnum(2, action_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -361,7 +422,7 @@ public int getSerializedSize() {
         != com.google.showcase.v1beta1.StreamBlurbsResponse.Action.ACTION_UNSPECIFIED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, action_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -382,7 +443,7 @@ public boolean equals(final java.lang.Object obj) {
       if (!getBlurb().equals(other.getBlurb())) return false;
     }
     if (action_ != other.action_) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -399,7 +460,7 @@ public int hashCode() {
     }
     hash = (37 * hash) + ACTION_FIELD_NUMBER;
     hash = (53 * hash) + action_;
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -530,10 +591,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.StreamBlurbsResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -636,7 +704,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.StreamBlurbsResponse other)
       if (other.action_ != 0) {
         setActionValue(other.getActionValue());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -651,43 +719,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.StreamBlurbsResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getBlurbFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 16:
-              {
-                action_ = input.readEnum();
-
-                break;
-              } // case 16
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.StreamBlurbsResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1009,18 +1051,7 @@ public StreamBlurbsResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new StreamBlurbsResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequence.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequence.java
index 81e5baa680..bc9352c6eb 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequence.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequence.java
@@ -47,6 +47,77 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private StreamingSequence(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              content_ = s;
+              break;
+            }
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                responses_ =
+                    new java.util.ArrayList<
+                        com.google.showcase.v1beta1.StreamingSequence.Response>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              responses_.add(
+                  input.readMessage(
+                      com.google.showcase.v1beta1.StreamingSequence.Response.parser(),
+                      extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        responses_ = java.util.Collections.unmodifiableList(responses_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_StreamingSequence_descriptor;
@@ -188,6 +259,79 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Response(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                com.google.rpc.Status.Builder subBuilder = null;
+                if (status_ != null) {
+                  subBuilder = status_.toBuilder();
+                }
+                status_ = input.readMessage(com.google.rpc.Status.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(status_);
+                  status_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 18:
+              {
+                com.google.protobuf.Duration.Builder subBuilder = null;
+                if (delay_ != null) {
+                  subBuilder = delay_.toBuilder();
+                }
+                delay_ =
+                    input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(delay_);
+                  delay_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 24:
+              {
+                responseIndex_ = input.readInt32();
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.showcase.v1beta1.SequenceOuterClass
           .internal_static_google_showcase_v1beta1_StreamingSequence_Response_descriptor;
@@ -343,7 +487,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (responseIndex_ != 0) {
         output.writeInt32(3, responseIndex_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -361,7 +505,7 @@ public int getSerializedSize() {
       if (responseIndex_ != 0) {
         size += com.google.protobuf.CodedOutputStream.computeInt32Size(3, responseIndex_);
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -386,7 +530,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getDelay().equals(other.getDelay())) return false;
       }
       if (getResponseIndex() != other.getResponseIndex()) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -407,7 +551,7 @@ public int hashCode() {
       }
       hash = (37 * hash) + RESPONSE_INDEX_FIELD_NUMBER;
       hash = (53 * hash) + getResponseIndex();
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -540,10 +684,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.showcase.v1beta1.StreamingSequence.Response.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -662,7 +813,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.StreamingSequence.Response
         if (other.getResponseIndex() != 0) {
           setResponseIndex(other.getResponseIndex());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -677,49 +828,18 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.showcase.v1beta1.StreamingSequence.Response parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  input.readMessage(getStatusFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  input.readMessage(getDelayFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 18
-              case 24:
-                {
-                  responseIndex_ = input.readInt32();
-
-                  break;
-                } // case 24
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.showcase.v1beta1.StreamingSequence.Response) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1181,19 +1301,7 @@ public Response parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Response(input, extensionRegistry);
           }
         };
 
@@ -1405,7 +1513,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < responses_.size(); i++) {
       output.writeMessage(3, responses_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -1423,7 +1531,7 @@ public int getSerializedSize() {
     for (int i = 0; i < responses_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, responses_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -1442,7 +1550,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getName().equals(other.getName())) return false;
     if (!getContent().equals(other.getContent())) return false;
     if (!getResponsesList().equals(other.getResponsesList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -1461,7 +1569,7 @@ public int hashCode() {
       hash = (37 * hash) + RESPONSES_FIELD_NUMBER;
       hash = (53 * hash) + getResponsesList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -1583,10 +1691,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.StreamingSequence.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getResponsesFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -1598,11 +1715,10 @@ public Builder clear() {
 
       if (responsesBuilder_ == null) {
         responses_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        responses_ = null;
         responsesBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -1726,7 +1842,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.StreamingSequence other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1741,57 +1857,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.StreamingSequence parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                content_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                com.google.showcase.v1beta1.StreamingSequence.Response m =
-                    input.readMessage(
-                        com.google.showcase.v1beta1.StreamingSequence.Response.parser(),
-                        extensionRegistry);
-                if (responsesBuilder_ == null) {
-                  ensureResponsesIsMutable();
-                  responses_.add(m);
-                } else {
-                  responsesBuilder_.addMessage(m);
-                }
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.StreamingSequence) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2416,18 +2492,7 @@ public StreamingSequence parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new StreamingSequence(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReport.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReport.java
index 6774a5cfc5..4e4a388dea 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReport.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReport.java
@@ -46,6 +46,70 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private StreamingSequenceReport(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                attempts_ =
+                    new java.util.ArrayList<
+                        com.google.showcase.v1beta1.StreamingSequenceReport.Attempt>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              attempts_.add(
+                  input.readMessage(
+                      com.google.showcase.v1beta1.StreamingSequenceReport.Attempt.parser(),
+                      extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        attempts_ = java.util.Collections.unmodifiableList(attempts_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.SequenceOuterClass
         .internal_static_google_showcase_v1beta1_StreamingSequenceReport_descriptor;
@@ -267,6 +331,109 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Attempt(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                attemptNumber_ = input.readInt32();
+                break;
+              }
+            case 18:
+              {
+                com.google.protobuf.Timestamp.Builder subBuilder = null;
+                if (attemptDeadline_ != null) {
+                  subBuilder = attemptDeadline_.toBuilder();
+                }
+                attemptDeadline_ =
+                    input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(attemptDeadline_);
+                  attemptDeadline_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 26:
+              {
+                com.google.protobuf.Timestamp.Builder subBuilder = null;
+                if (responseTime_ != null) {
+                  subBuilder = responseTime_.toBuilder();
+                }
+                responseTime_ =
+                    input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(responseTime_);
+                  responseTime_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 34:
+              {
+                com.google.protobuf.Duration.Builder subBuilder = null;
+                if (attemptDelay_ != null) {
+                  subBuilder = attemptDelay_.toBuilder();
+                }
+                attemptDelay_ =
+                    input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(attemptDelay_);
+                  attemptDelay_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 42:
+              {
+                com.google.rpc.Status.Builder subBuilder = null;
+                if (status_ != null) {
+                  subBuilder = status_.toBuilder();
+                }
+                status_ = input.readMessage(com.google.rpc.Status.parser(), extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(status_);
+                  status_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.showcase.v1beta1.SequenceOuterClass
           .internal_static_google_showcase_v1beta1_StreamingSequenceReport_Attempt_descriptor;
@@ -538,7 +705,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (status_ != null) {
         output.writeMessage(5, getStatus());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -562,7 +729,7 @@ public int getSerializedSize() {
       if (status_ != null) {
         size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getStatus());
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -595,7 +762,7 @@ public boolean equals(final java.lang.Object obj) {
       if (hasStatus()) {
         if (!getStatus().equals(other.getStatus())) return false;
       }
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -624,7 +791,7 @@ public int hashCode() {
         hash = (37 * hash) + STATUS_FIELD_NUMBER;
         hash = (53 * hash) + getStatus().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -757,10 +924,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.showcase.v1beta1.StreamingSequenceReport.Attempt.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
@@ -909,7 +1083,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.StreamingSequenceReport.Att
         if (other.hasStatus()) {
           mergeStatus(other.getStatus());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -924,62 +1098,19 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.showcase.v1beta1.StreamingSequenceReport.Attempt parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 8:
-                {
-                  attemptNumber_ = input.readInt32();
-
-                  break;
-                } // case 8
-              case 18:
-                {
-                  input.readMessage(
-                      getAttemptDeadlineFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 18
-              case 26:
-                {
-                  input.readMessage(getResponseTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 26
-              case 34:
-                {
-                  input.readMessage(getAttemptDelayFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 34
-              case 42:
-                {
-                  input.readMessage(getStatusFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 42
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (com.google.showcase.v1beta1.StreamingSequenceReport.Attempt)
+                  e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -1854,19 +1985,7 @@ public Attempt parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Attempt(input, extensionRegistry);
           }
         };
 
@@ -2021,7 +2140,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < attempts_.size(); i++) {
       output.writeMessage(2, attempts_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -2036,7 +2155,7 @@ public int getSerializedSize() {
     for (int i = 0; i < attempts_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, attempts_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -2054,7 +2173,7 @@ public boolean equals(final java.lang.Object obj) {
 
     if (!getName().equals(other.getName())) return false;
     if (!getAttemptsList().equals(other.getAttemptsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -2071,7 +2190,7 @@ public int hashCode() {
       hash = (37 * hash) + ATTEMPTS_FIELD_NUMBER;
       hash = (53 * hash) + getAttemptsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -2193,10 +2312,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.StreamingSequenceReport.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getAttemptsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -2206,11 +2334,10 @@ public Builder clear() {
 
       if (attemptsBuilder_ == null) {
         attempts_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        attempts_ = null;
         attemptsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -2330,7 +2457,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.StreamingSequenceReport oth
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2345,51 +2472,18 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.StreamingSequenceReport parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                com.google.showcase.v1beta1.StreamingSequenceReport.Attempt m =
-                    input.readMessage(
-                        com.google.showcase.v1beta1.StreamingSequenceReport.Attempt.parser(),
-                        extensionRegistry);
-                if (attemptsBuilder_ == null) {
-                  ensureAttemptsIsMutable();
-                  attempts_.add(m);
-                } else {
-                  attemptsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.showcase.v1beta1.StreamingSequenceReport) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2891,18 +2985,7 @@ public StreamingSequenceReport parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new StreamingSequenceReport(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Test.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Test.java
index e56eae4a41..0df6475834 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Test.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Test.java
@@ -48,6 +48,81 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private Test(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 16:
+            {
+              int rawValue = input.readEnum();
+
+              expectationLevel_ = rawValue;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              description_ = s;
+              break;
+            }
+          case 34:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                blueprints_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              blueprints_.add(
+                  input.readMessage(
+                      com.google.showcase.v1beta1.Test.Blueprint.parser(), extensionRegistry));
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        blueprints_ = java.util.Collections.unmodifiableList(blueprints_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_Test_descriptor;
@@ -446,6 +521,94 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
+    private Blueprint(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                name_ = s;
+                break;
+              }
+            case 18:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                description_ = s;
+                break;
+              }
+            case 26:
+              {
+                com.google.showcase.v1beta1.Test.Blueprint.Invocation.Builder subBuilder = null;
+                if (request_ != null) {
+                  subBuilder = request_.toBuilder();
+                }
+                request_ =
+                    input.readMessage(
+                        com.google.showcase.v1beta1.Test.Blueprint.Invocation.parser(),
+                        extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(request_);
+                  request_ = subBuilder.buildPartial();
+                }
+
+                break;
+              }
+            case 34:
+              {
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  additionalRequests_ =
+                      new java.util.ArrayList<
+                          com.google.showcase.v1beta1.Test.Blueprint.Invocation>();
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                additionalRequests_.add(
+                    input.readMessage(
+                        com.google.showcase.v1beta1.Test.Blueprint.Invocation.parser(),
+                        extensionRegistry));
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          additionalRequests_ = java.util.Collections.unmodifiableList(additionalRequests_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return com.google.showcase.v1beta1.TestingOuterClass
           .internal_static_google_showcase_v1beta1_Test_Blueprint_descriptor;
@@ -542,6 +705,58 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
         return this.unknownFields;
       }
 
+      private Invocation(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        this();
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+            com.google.protobuf.UnknownFieldSet.newBuilder();
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10:
+                {
+                  java.lang.String s = input.readStringRequireUtf8();
+
+                  method_ = s;
+                  break;
+                }
+              case 18:
+                {
+                  serializedRequest_ = input.readBytes();
+                  break;
+                }
+              default:
+                {
+                  if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                    done = true;
+                  }
+                  break;
+                }
+            }
+          }
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(this);
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(this);
+        } finally {
+          this.unknownFields = unknownFields.build();
+          makeExtensionsImmutable();
+        }
+      }
+
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return com.google.showcase.v1beta1.TestingOuterClass
             .internal_static_google_showcase_v1beta1_Test_Blueprint_Invocation_descriptor;
@@ -647,7 +862,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         if (!serializedRequest_.isEmpty()) {
           output.writeBytes(2, serializedRequest_);
         }
-        getUnknownFields().writeTo(output);
+        unknownFields.writeTo(output);
       }
 
       @java.lang.Override
@@ -662,7 +877,7 @@ public int getSerializedSize() {
         if (!serializedRequest_.isEmpty()) {
           size += com.google.protobuf.CodedOutputStream.computeBytesSize(2, serializedRequest_);
         }
-        size += getUnknownFields().getSerializedSize();
+        size += unknownFields.getSerializedSize();
         memoizedSize = size;
         return size;
       }
@@ -680,7 +895,7 @@ public boolean equals(final java.lang.Object obj) {
 
         if (!getMethod().equals(other.getMethod())) return false;
         if (!getSerializedRequest().equals(other.getSerializedRequest())) return false;
-        if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+        if (!unknownFields.equals(other.unknownFields)) return false;
         return true;
       }
 
@@ -695,7 +910,7 @@ public int hashCode() {
         hash = (53 * hash) + getMethod().hashCode();
         hash = (37 * hash) + SERIALIZED_REQUEST_FIELD_NUMBER;
         hash = (53 * hash) + getSerializedRequest().hashCode();
-        hash = (29 * hash) + getUnknownFields().hashCode();
+        hash = (29 * hash) + unknownFields.hashCode();
         memoizedHashCode = hash;
         return hash;
       }
@@ -828,10 +1043,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         }
 
         // Construct using com.google.showcase.v1beta1.Test.Blueprint.Invocation.newBuilder()
-        private Builder() {}
+        private Builder() {
+          maybeForceBuilderInitialization();
+        }
 
         private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
+          maybeForceBuilderInitialization();
+        }
+
+        private void maybeForceBuilderInitialization() {
+          if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
         }
 
         @java.lang.Override
@@ -929,7 +1151,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Test.Blueprint.Invocation o
           if (other.getSerializedRequest() != com.google.protobuf.ByteString.EMPTY) {
             setSerializedRequest(other.getSerializedRequest());
           }
-          this.mergeUnknownFields(other.getUnknownFields());
+          this.mergeUnknownFields(other.unknownFields);
           onChanged();
           return this;
         }
@@ -944,43 +1166,18 @@ public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
+          com.google.showcase.v1beta1.Test.Blueprint.Invocation parsedMessage = null;
           try {
-            boolean done = false;
-            while (!done) {
-              int tag = input.readTag();
-              switch (tag) {
-                case 0:
-                  done = true;
-                  break;
-                case 10:
-                  {
-                    method_ = input.readStringRequireUtf8();
-
-                    break;
-                  } // case 10
-                case 18:
-                  {
-                    serializedRequest_ = input.readBytes();
-
-                    break;
-                  } // case 18
-                default:
-                  {
-                    if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                      done = true; // was an endgroup tag
-                    }
-                    break;
-                  } // default:
-              } // switch (tag)
-            } // while (!done)
+            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            parsedMessage =
+                (com.google.showcase.v1beta1.Test.Blueprint.Invocation) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
-            onChanged();
-          } // finally
+            if (parsedMessage != null) {
+              mergeFrom(parsedMessage);
+            }
+          }
           return this;
         }
 
@@ -1187,19 +1384,7 @@ public Invocation parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              Builder builder = newBuilder();
-              try {
-                builder.mergeFrom(input, extensionRegistry);
-              } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                throw e.setUnfinishedMessage(builder.buildPartial());
-              } catch (com.google.protobuf.UninitializedMessageException e) {
-                throw e.asInvalidProtocolBufferException()
-                    .setUnfinishedMessage(builder.buildPartial());
-              } catch (java.io.IOException e) {
-                throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                    .setUnfinishedMessage(builder.buildPartial());
-              }
-              return builder.buildPartial();
+              return new Invocation(input, extensionRegistry);
             }
           };
 
@@ -1479,7 +1664,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       for (int i = 0; i < additionalRequests_.size(); i++) {
         output.writeMessage(4, additionalRequests_.get(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
     @java.lang.Override
@@ -1501,7 +1686,7 @@ public int getSerializedSize() {
         size +=
             com.google.protobuf.CodedOutputStream.computeMessageSize(4, additionalRequests_.get(i));
       }
-      size += getUnknownFields().getSerializedSize();
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1524,7 +1709,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getRequest().equals(other.getRequest())) return false;
       }
       if (!getAdditionalRequestsList().equals(other.getAdditionalRequestsList())) return false;
-      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -1547,7 +1732,7 @@ public int hashCode() {
         hash = (37 * hash) + ADDITIONAL_REQUESTS_FIELD_NUMBER;
         hash = (53 * hash) + getAdditionalRequestsList().hashCode();
       }
-      hash = (29 * hash) + getUnknownFields().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1682,10 +1867,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       }
 
       // Construct using com.google.showcase.v1beta1.Test.Blueprint.newBuilder()
-      private Builder() {}
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
 
       private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+          getAdditionalRequestsFieldBuilder();
+        }
       }
 
       @java.lang.Override
@@ -1703,11 +1897,10 @@ public Builder clear() {
         }
         if (additionalRequestsBuilder_ == null) {
           additionalRequests_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
-          additionalRequests_ = null;
           additionalRequestsBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -1841,7 +2034,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Test.Blueprint other) {
             }
           }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1856,63 +2049,17 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        com.google.showcase.v1beta1.Test.Blueprint parsedMessage = null;
         try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10:
-                {
-                  name_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 10
-              case 18:
-                {
-                  description_ = input.readStringRequireUtf8();
-
-                  break;
-                } // case 18
-              case 26:
-                {
-                  input.readMessage(getRequestFieldBuilder().getBuilder(), extensionRegistry);
-
-                  break;
-                } // case 26
-              case 34:
-                {
-                  com.google.showcase.v1beta1.Test.Blueprint.Invocation m =
-                      input.readMessage(
-                          com.google.showcase.v1beta1.Test.Blueprint.Invocation.parser(),
-                          extensionRegistry);
-                  if (additionalRequestsBuilder_ == null) {
-                    ensureAdditionalRequestsIsMutable();
-                    additionalRequests_.add(m);
-                  } else {
-                    additionalRequestsBuilder_.addMessage(m);
-                  }
-                  break;
-                } // case 34
-              default:
-                {
-                  if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                    done = true; // was an endgroup tag
-                  }
-                  break;
-                } // default:
-            } // switch (tag)
-          } // while (!done)
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.showcase.v1beta1.Test.Blueprint) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          onChanged();
-        } // finally
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
 
@@ -2772,19 +2919,7 @@ public Blueprint parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (com.google.protobuf.UninitializedMessageException e) {
-              throw e.asInvalidProtocolBufferException()
-                  .setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
+            return new Blueprint(input, extensionRegistry);
           }
         };
 
@@ -3064,7 +3199,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < blueprints_.size(); i++) {
       output.writeMessage(4, blueprints_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -3087,7 +3222,7 @@ public int getSerializedSize() {
     for (int i = 0; i < blueprints_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, blueprints_.get(i));
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -3106,7 +3241,7 @@ public boolean equals(final java.lang.Object obj) {
     if (expectationLevel_ != other.expectationLevel_) return false;
     if (!getDescription().equals(other.getDescription())) return false;
     if (!getBlueprintsList().equals(other.getBlueprintsList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -3127,7 +3262,7 @@ public int hashCode() {
       hash = (37 * hash) + BLUEPRINTS_FIELD_NUMBER;
       hash = (53 * hash) + getBlueprintsList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -3248,10 +3383,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.Test.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        getBlueprintsFieldBuilder();
+      }
     }
 
     @java.lang.Override
@@ -3265,11 +3409,10 @@ public Builder clear() {
 
       if (blueprintsBuilder_ == null) {
         blueprints_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
       } else {
-        blueprints_ = null;
         blueprintsBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
@@ -3396,7 +3539,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.Test other) {
           }
         }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -3411,62 +3554,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.Test parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 16:
-              {
-                expectationLevel_ = input.readEnum();
-
-                break;
-              } // case 16
-            case 26:
-              {
-                description_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                com.google.showcase.v1beta1.Test.Blueprint m =
-                    input.readMessage(
-                        com.google.showcase.v1beta1.Test.Blueprint.parser(), extensionRegistry);
-                if (blueprintsBuilder_ == null) {
-                  ensureBlueprintsIsMutable();
-                  blueprints_.add(m);
-                } else {
-                  blueprintsBuilder_.addMessage(m);
-                }
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.Test) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -4256,18 +4354,7 @@ public Test parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new Test(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestRun.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestRun.java
index 57e5e2116c..e130234a14 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestRun.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestRun.java
@@ -53,6 +53,67 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private TestRun(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              test_ = s;
+              break;
+            }
+          case 18:
+            {
+              com.google.showcase.v1beta1.Issue.Builder subBuilder = null;
+              if (issue_ != null) {
+                subBuilder = issue_.toBuilder();
+              }
+              issue_ =
+                  input.readMessage(com.google.showcase.v1beta1.Issue.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(issue_);
+                issue_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_TestRun_descriptor;
@@ -192,7 +253,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (issue_ != null) {
       output.writeMessage(2, getIssue());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -207,7 +268,7 @@ public int getSerializedSize() {
     if (issue_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getIssue());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -227,7 +288,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasIssue()) {
       if (!getIssue().equals(other.getIssue())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -244,7 +305,7 @@ public int hashCode() {
       hash = (37 * hash) + ISSUE_FIELD_NUMBER;
       hash = (53 * hash) + getIssue().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -373,10 +434,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.TestRun.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -478,7 +546,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.TestRun other) {
       if (other.hasIssue()) {
         mergeIssue(other.getIssue());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -493,43 +561,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.TestRun parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                test_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getIssueFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.TestRun) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -874,18 +916,7 @@ public TestRun parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new TestRun(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateBlurbRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateBlurbRequest.java
index 35c2c6ac2b..51af718756 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateBlurbRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateBlurbRequest.java
@@ -52,6 +52,75 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private UpdateBlurbRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.showcase.v1beta1.Blurb.Builder subBuilder = null;
+              if (blurb_ != null) {
+                subBuilder = blurb_.toBuilder();
+              }
+              blurb_ =
+                  input.readMessage(com.google.showcase.v1beta1.Blurb.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(blurb_);
+                blurb_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              com.google.protobuf.FieldMask.Builder subBuilder = null;
+              if (updateMask_ != null) {
+                subBuilder = updateMask_.toBuilder();
+              }
+              updateMask_ =
+                  input.readMessage(com.google.protobuf.FieldMask.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateMask_);
+                updateMask_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_UpdateBlurbRequest_descriptor;
@@ -188,7 +257,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (updateMask_ != null) {
       output.writeMessage(2, getUpdateMask());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -203,7 +272,7 @@ public int getSerializedSize() {
     if (updateMask_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getUpdateMask());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -227,7 +296,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasUpdateMask()) {
       if (!getUpdateMask().equals(other.getUpdateMask())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -246,7 +315,7 @@ public int hashCode() {
       hash = (37 * hash) + UPDATE_MASK_FIELD_NUMBER;
       hash = (53 * hash) + getUpdateMask().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -377,10 +446,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.UpdateBlurbRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -490,7 +566,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.UpdateBlurbRequest other) {
       if (other.hasUpdateMask()) {
         mergeUpdateMask(other.getUpdateMask());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -505,43 +581,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.UpdateBlurbRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getBlurbFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.UpdateBlurbRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -966,18 +1016,7 @@ public UpdateBlurbRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new UpdateBlurbRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateRoomRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateRoomRequest.java
index 94f673334e..0490400d1a 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateRoomRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateRoomRequest.java
@@ -52,6 +52,75 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private UpdateRoomRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.showcase.v1beta1.Room.Builder subBuilder = null;
+              if (room_ != null) {
+                subBuilder = room_.toBuilder();
+              }
+              room_ =
+                  input.readMessage(com.google.showcase.v1beta1.Room.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(room_);
+                room_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              com.google.protobuf.FieldMask.Builder subBuilder = null;
+              if (updateMask_ != null) {
+                subBuilder = updateMask_.toBuilder();
+              }
+              updateMask_ =
+                  input.readMessage(com.google.protobuf.FieldMask.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateMask_);
+                updateMask_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.MessagingOuterClass
         .internal_static_google_showcase_v1beta1_UpdateRoomRequest_descriptor;
@@ -188,7 +257,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (updateMask_ != null) {
       output.writeMessage(2, getUpdateMask());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -203,7 +272,7 @@ public int getSerializedSize() {
     if (updateMask_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getUpdateMask());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -227,7 +296,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasUpdateMask()) {
       if (!getUpdateMask().equals(other.getUpdateMask())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -246,7 +315,7 @@ public int hashCode() {
       hash = (37 * hash) + UPDATE_MASK_FIELD_NUMBER;
       hash = (53 * hash) + getUpdateMask().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -377,10 +446,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.UpdateRoomRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -490,7 +566,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.UpdateRoomRequest other) {
       if (other.hasUpdateMask()) {
         mergeUpdateMask(other.getUpdateMask());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -505,43 +581,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.UpdateRoomRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getRoomFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.UpdateRoomRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -966,18 +1016,7 @@ public UpdateRoomRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new UpdateRoomRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateUserRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateUserRequest.java
index 89e53ee8df..05cd45fc20 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateUserRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UpdateUserRequest.java
@@ -52,6 +52,75 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private UpdateUserRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.showcase.v1beta1.User.Builder subBuilder = null;
+              if (user_ != null) {
+                subBuilder = user_.toBuilder();
+              }
+              user_ =
+                  input.readMessage(com.google.showcase.v1beta1.User.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(user_);
+                user_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 18:
+            {
+              com.google.protobuf.FieldMask.Builder subBuilder = null;
+              if (updateMask_ != null) {
+                subBuilder = updateMask_.toBuilder();
+              }
+              updateMask_ =
+                  input.readMessage(com.google.protobuf.FieldMask.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateMask_);
+                updateMask_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.IdentityOuterClass
         .internal_static_google_showcase_v1beta1_UpdateUserRequest_descriptor;
@@ -188,7 +257,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (updateMask_ != null) {
       output.writeMessage(2, getUpdateMask());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -203,7 +272,7 @@ public int getSerializedSize() {
     if (updateMask_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getUpdateMask());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -227,7 +296,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasUpdateMask()) {
       if (!getUpdateMask().equals(other.getUpdateMask())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -246,7 +315,7 @@ public int hashCode() {
       hash = (37 * hash) + UPDATE_MASK_FIELD_NUMBER;
       hash = (53 * hash) + getUpdateMask().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -377,10 +446,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.UpdateUserRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -490,7 +566,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.UpdateUserRequest other) {
       if (other.hasUpdateMask()) {
         mergeUpdateMask(other.getUpdateMask());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -505,43 +581,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.UpdateUserRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getUserFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 18
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.UpdateUserRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -966,18 +1016,7 @@ public UpdateUserRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new UpdateUserRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/User.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/User.java
index 69009c9484..4f7a5cbde7 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/User.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/User.java
@@ -56,6 +56,122 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private User(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              displayName_ = s;
+              break;
+            }
+          case 26:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              email_ = s;
+              break;
+            }
+          case 34:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (createTime_ != null) {
+                subBuilder = createTime_.toBuilder();
+              }
+              createTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(createTime_);
+                createTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 42:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (updateTime_ != null) {
+                subBuilder = updateTime_.toBuilder();
+              }
+              updateTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(updateTime_);
+                updateTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          case 48:
+            {
+              bitField0_ |= 0x00000001;
+              age_ = input.readInt32();
+              break;
+            }
+          case 57:
+            {
+              bitField0_ |= 0x00000002;
+              heightFeet_ = input.readDouble();
+              break;
+            }
+          case 66:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+              bitField0_ |= 0x00000004;
+              nickname_ = s;
+              break;
+            }
+          case 72:
+            {
+              bitField0_ |= 0x00000008;
+              enableNotifications_ = input.readBool();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.IdentityOuterClass
         .internal_static_google_showcase_v1beta1_User_descriptor;
@@ -551,7 +667,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (((bitField0_ & 0x00000008) != 0)) {
       output.writeBool(9, enableNotifications_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -587,7 +703,7 @@ public int getSerializedSize() {
     if (((bitField0_ & 0x00000008) != 0)) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(9, enableNotifications_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -630,7 +746,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasEnableNotifications()) {
       if (getEnableNotifications() != other.getEnableNotifications()) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -674,7 +790,7 @@ public int hashCode() {
       hash = (37 * hash) + ENABLE_NOTIFICATIONS_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getEnableNotifications());
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -803,10 +919,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.User.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -977,7 +1100,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.User other) {
       if (other.hasEnableNotifications()) {
         setEnableNotifications(other.getEnableNotifications());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -992,85 +1115,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.User parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                displayName_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                email_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 26
-            case 34:
-              {
-                input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 34
-            case 42:
-              {
-                input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 42
-            case 48:
-              {
-                age_ = input.readInt32();
-                bitField0_ |= 0x00000001;
-                break;
-              } // case 48
-            case 57:
-              {
-                heightFeet_ = input.readDouble();
-                bitField0_ |= 0x00000002;
-                break;
-              } // case 57
-            case 66:
-              {
-                nickname_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000004;
-                break;
-              } // case 66
-            case 72:
-              {
-                enableNotifications_ = input.readBool();
-                bitField0_ |= 0x00000008;
-                break;
-              } // case 72
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.User) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -2220,18 +2275,7 @@ public User parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new User(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestRequest.java
index a1939159e4..141314a96b 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestRequest.java
@@ -47,6 +47,70 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private VerifyTestRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              name_ = s;
+              break;
+            }
+          case 18:
+            {
+              answer_ = input.readBytes();
+              break;
+            }
+          case 26:
+            {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                answers_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              answers_.add(input.readBytes());
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        answers_ = java.util.Collections.unmodifiableList(answers_); // C
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_VerifyTestRequest_descriptor;
@@ -205,7 +269,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < answers_.size(); i++) {
       output.writeBytes(3, answers_.get(i));
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -228,7 +292,7 @@ public int getSerializedSize() {
       size += dataSize;
       size += 1 * getAnswersList().size();
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -247,7 +311,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getName().equals(other.getName())) return false;
     if (!getAnswer().equals(other.getAnswer())) return false;
     if (!getAnswersList().equals(other.getAnswersList())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -266,7 +330,7 @@ public int hashCode() {
       hash = (37 * hash) + ANSWERS_FIELD_NUMBER;
       hash = (53 * hash) + getAnswersList().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -388,10 +452,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.VerifyTestRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -504,7 +575,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.VerifyTestRequest other) {
         }
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -519,50 +590,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.VerifyTestRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                name_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            case 18:
-              {
-                answer_ = input.readBytes();
-
-                break;
-              } // case 18
-            case 26:
-              {
-                com.google.protobuf.ByteString v = input.readBytes();
-                ensureAnswersIsMutable();
-                answers_.add(v);
-                break;
-              } // case 26
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.VerifyTestRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -910,18 +948,7 @@ public VerifyTestRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new VerifyTestRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestResponse.java
index 69d2a8681d..38cabe8b19 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/VerifyTestResponse.java
@@ -43,6 +43,60 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private VerifyTestResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.showcase.v1beta1.Issue.Builder subBuilder = null;
+              if (issue_ != null) {
+                subBuilder = issue_.toBuilder();
+              }
+              issue_ =
+                  input.readMessage(com.google.showcase.v1beta1.Issue.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(issue_);
+                issue_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.TestingOuterClass
         .internal_static_google_showcase_v1beta1_VerifyTestResponse_descriptor;
@@ -124,7 +178,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (issue_ != null) {
       output.writeMessage(1, getIssue());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -136,7 +190,7 @@ public int getSerializedSize() {
     if (issue_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getIssue());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -156,7 +210,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasIssue()) {
       if (!getIssue().equals(other.getIssue())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -171,7 +225,7 @@ public int hashCode() {
       hash = (37 * hash) + ISSUE_FIELD_NUMBER;
       hash = (53 * hash) + getIssue().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -293,10 +347,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.VerifyTestResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -392,7 +453,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.VerifyTestResponse other) {
       if (other.hasIssue()) {
         mergeIssue(other.getIssue());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -407,37 +468,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.VerifyTestResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getIssueFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.VerifyTestResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -661,18 +702,7 @@ public VerifyTestResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new VerifyTestResponse(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitMetadata.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitMetadata.java
index d201043452..f319d17f49 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitMetadata.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitMetadata.java
@@ -51,6 +51,60 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private WaitMetadata(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (endTime_ != null) {
+                subBuilder = endTime_.toBuilder();
+              }
+              endTime_ =
+                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(endTime_);
+                endTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_WaitMetadata_descriptor;
@@ -132,7 +186,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (endTime_ != null) {
       output.writeMessage(1, getEndTime());
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -144,7 +198,7 @@ public int getSerializedSize() {
     if (endTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getEndTime());
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -163,7 +217,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasEndTime()) {
       if (!getEndTime().equals(other.getEndTime())) return false;
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -178,7 +232,7 @@ public int hashCode() {
       hash = (37 * hash) + END_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getEndTime().hashCode();
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -308,10 +362,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.WaitMetadata.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -407,7 +468,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.WaitMetadata other) {
       if (other.hasEndTime()) {
         mergeEndTime(other.getEndTime());
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -422,37 +483,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.WaitMetadata parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry);
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.WaitMetadata) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -676,18 +717,7 @@ public WaitMetadata parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new WaitMetadata(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitRequest.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitRequest.java
index 4e8466a056..ee5df9cb45 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitRequest.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitRequest.java
@@ -51,6 +51,103 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private WaitRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (endCase_ == 1) {
+                subBuilder = ((com.google.protobuf.Timestamp) end_).toBuilder();
+              }
+              end_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.protobuf.Timestamp) end_);
+                end_ = subBuilder.buildPartial();
+              }
+              endCase_ = 1;
+              break;
+            }
+          case 18:
+            {
+              com.google.rpc.Status.Builder subBuilder = null;
+              if (responseCase_ == 2) {
+                subBuilder = ((com.google.rpc.Status) response_).toBuilder();
+              }
+              response_ = input.readMessage(com.google.rpc.Status.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.rpc.Status) response_);
+                response_ = subBuilder.buildPartial();
+              }
+              responseCase_ = 2;
+              break;
+            }
+          case 26:
+            {
+              com.google.showcase.v1beta1.WaitResponse.Builder subBuilder = null;
+              if (responseCase_ == 3) {
+                subBuilder = ((com.google.showcase.v1beta1.WaitResponse) response_).toBuilder();
+              }
+              response_ =
+                  input.readMessage(
+                      com.google.showcase.v1beta1.WaitResponse.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.showcase.v1beta1.WaitResponse) response_);
+                response_ = subBuilder.buildPartial();
+              }
+              responseCase_ = 3;
+              break;
+            }
+          case 34:
+            {
+              com.google.protobuf.Duration.Builder subBuilder = null;
+              if (endCase_ == 4) {
+                subBuilder = ((com.google.protobuf.Duration) end_).toBuilder();
+              }
+              end_ = input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.protobuf.Duration) end_);
+                end_ = subBuilder.buildPartial();
+              }
+              endCase_ = 4;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_WaitRequest_descriptor;
@@ -407,7 +504,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (endCase_ == 4) {
       output.writeMessage(4, (com.google.protobuf.Duration) end_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -436,7 +533,7 @@ public int getSerializedSize() {
           com.google.protobuf.CodedOutputStream.computeMessageSize(
               4, (com.google.protobuf.Duration) end_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -473,7 +570,7 @@ public boolean equals(final java.lang.Object obj) {
       case 0:
       default:
     }
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -508,7 +605,7 @@ public int hashCode() {
       case 0:
       default:
     }
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -638,27 +735,22 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.WaitRequest.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
     public Builder clear() {
       super.clear();
-      if (endTimeBuilder_ != null) {
-        endTimeBuilder_.clear();
-      }
-      if (ttlBuilder_ != null) {
-        ttlBuilder_.clear();
-      }
-      if (errorBuilder_ != null) {
-        errorBuilder_.clear();
-      }
-      if (successBuilder_ != null) {
-        successBuilder_.clear();
-      }
       endCase_ = 0;
       end_ = null;
       responseCase_ = 0;
@@ -801,7 +893,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.WaitRequest other) {
             break;
           }
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -816,55 +908,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.WaitRequest parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry);
-                endCase_ = 1;
-                break;
-              } // case 10
-            case 18:
-              {
-                input.readMessage(getErrorFieldBuilder().getBuilder(), extensionRegistry);
-                responseCase_ = 2;
-                break;
-              } // case 18
-            case 26:
-              {
-                input.readMessage(getSuccessFieldBuilder().getBuilder(), extensionRegistry);
-                responseCase_ = 3;
-                break;
-              } // case 26
-            case 34:
-              {
-                input.readMessage(getTtlFieldBuilder().getBuilder(), extensionRegistry);
-                endCase_ = 4;
-                break;
-              } // case 34
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.WaitRequest) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -1793,18 +1847,7 @@ public WaitRequest parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new WaitRequest(input, extensionRegistry);
         }
       };
 
diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitResponse.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitResponse.java
index c45d3e1c0f..a644f0d3af 100644
--- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitResponse.java
+++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/WaitResponse.java
@@ -53,6 +53,52 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
     return this.unknownFields;
   }
 
+  private WaitResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10:
+            {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              content_ = s;
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.showcase.v1beta1.EchoOuterClass
         .internal_static_google_showcase_v1beta1_WaitResponse_descriptor;
@@ -136,7 +182,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(content_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, content_);
     }
-    getUnknownFields().writeTo(output);
+    unknownFields.writeTo(output);
   }
 
   @java.lang.Override
@@ -148,7 +194,7 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(content_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, content_);
     }
-    size += getUnknownFields().getSerializedSize();
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
@@ -164,7 +210,7 @@ public boolean equals(final java.lang.Object obj) {
     com.google.showcase.v1beta1.WaitResponse other = (com.google.showcase.v1beta1.WaitResponse) obj;
 
     if (!getContent().equals(other.getContent())) return false;
-    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
 
@@ -177,7 +223,7 @@ public int hashCode() {
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + CONTENT_FIELD_NUMBER;
     hash = (53 * hash) + getContent().hashCode();
-    hash = (29 * hash) + getUnknownFields().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
@@ -307,10 +353,17 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     }
 
     // Construct using com.google.showcase.v1beta1.WaitResponse.newBuilder()
-    private Builder() {}
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
 
     private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
     }
 
     @java.lang.Override
@@ -399,7 +452,7 @@ public Builder mergeFrom(com.google.showcase.v1beta1.WaitResponse other) {
         content_ = other.content_;
         onChanged();
       }
-      this.mergeUnknownFields(other.getUnknownFields());
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -414,37 +467,17 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
+      com.google.showcase.v1beta1.WaitResponse parsedMessage = null;
       try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10:
-              {
-                content_ = input.readStringRequireUtf8();
-
-                break;
-              } // case 10
-            default:
-              {
-                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                  done = true; // was an endgroup tag
-                }
-                break;
-              } // default:
-          } // switch (tag)
-        } // while (!done)
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.showcase.v1beta1.WaitResponse) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
-        onChanged();
-      } // finally
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
       return this;
     }
 
@@ -591,18 +624,7 @@ public WaitResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          Builder builder = newBuilder();
-          try {
-            builder.mergeFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw e.setUnfinishedMessage(builder.buildPartial());
-          } catch (com.google.protobuf.UninitializedMessageException e) {
-            throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-          } catch (java.io.IOException e) {
-            throw new com.google.protobuf.InvalidProtocolBufferException(e)
-                .setUnfinishedMessage(builder.buildPartial());
-          }
-          return builder.buildPartial();
+          return new WaitResponse(input, extensionRegistry);
         }
       };
 

From 8eef5a42f241a1b7fb86e4d1d469b7033ba835bc Mon Sep 17 00:00:00 2001
From: blakeli 
Date: Thu, 4 Dec 2025 15:40:20 -0500
Subject: [PATCH 8/9] chore: Use 3.19.0

---
 .cloudbuild/library_generation/library_generation.Dockerfile    | 2 +-
 .../library_generation/library_generation_airlock.Dockerfile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cloudbuild/library_generation/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile
index 93ef100236..c654356b1a 100644
--- a/.cloudbuild/library_generation/library_generation.Dockerfile
+++ b/.cloudbuild/library_generation/library_generation.Dockerfile
@@ -37,7 +37,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_
 FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad316909c39813dee3ee9395204940500792b740 as final
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
-ARG PROTOC_VERSION=21.0
+ARG PROTOC_VERSION=3.19.0
 ARG GRPC_VERSION=1.76.1
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
diff --git a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
index 93711ec7ed..0e0eae37cb 100644
--- a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
+++ b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
@@ -38,7 +38,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_
 FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc139a0a640942491ec481ad8dda10f2c5b753f5c969393b12480155fe15a63 as final
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
-ARG PROTOC_VERSION=21.0
+ARG PROTOC_VERSION=3.19.0
 ARG GRPC_VERSION=1.76.1
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"

From a57c3a215dacd2d913690c2b4aec56c781baf91b Mon Sep 17 00:00:00 2001
From: blakeli 
Date: Tue, 9 Dec 2025 15:12:19 -0500
Subject: [PATCH 9/9] chore: use 21.0

---
 .cloudbuild/library_generation/library_generation.Dockerfile    | 2 +-
 .../library_generation/library_generation_airlock.Dockerfile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cloudbuild/library_generation/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile
index 3e7c363990..aca2ead1f2 100644
--- a/.cloudbuild/library_generation/library_generation.Dockerfile
+++ b/.cloudbuild/library_generation/library_generation.Dockerfile
@@ -37,7 +37,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_
 FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad316909c39813dee3ee9395204940500792b740 as final
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
-ARG PROTOC_VERSION=3.19.0
+ARG PROTOC_VERSION=21.0
 ARG GRPC_VERSION=1.76.2
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
diff --git a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
index 666560e098..456c8d1422 100644
--- a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
+++ b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
@@ -38,7 +38,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_
 FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc139a0a640942491ec481ad8dda10f2c5b753f5c969393b12480155fe15a63 as final
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
-ARG PROTOC_VERSION=3.19.0
+ARG PROTOC_VERSION=21.0
 ARG GRPC_VERSION=1.76.2
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"